branch develop updated (ab1cff7 -> fe353da)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from ab1cff7 fixes #3570: Can save a file giving a starting directory new 8b0c378 fixes #3573: Add a keepCurrentDirectory option in JaxxFileChooser new b1dffc2 refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) new fe353da refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fe353da1f0aeeed47459965b5078dacc12a25f2f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:12:15 2014 +0100 refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) commit b1dffc2f160decb752cdcfef55b3db1cbd2092ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:11:49 2014 +0100 refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) commit 8b0c3784c3ed0a28dd94873a20c1ba5c185307b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:11:14 2014 +0100 fixes #3573: Add a keepCurrentDirectory option in JaxxFileChooser Summary of changes: .../swing/action/AbstractApplicationAction.java | 22 +++++++++++------ .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 28 ++++++++++++++++++---- 2 files changed, 39 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 8b0c3784c3ed0a28dd94873a20c1ba5c185307b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:11:14 2014 +0100 fixes #3573: Add a keepCurrentDirectory option in JaxxFileChooser --- .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java index 94f4c6c..46bb69b 100644 --- a/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JaxxFileChooser.java @@ -116,6 +116,8 @@ public class JaxxFileChooser { ToLoadFile setStartDirectory(File startDirectory); + ToLoadFile setKeepCurrentDirectory(boolean keepCurrentDirectory); + File choose(); } @@ -130,6 +132,8 @@ public class JaxxFileChooser { ToLoadDirectory setStartDirectory(File startDirectory); + ToLoadDirectory setKeepCurrentDirectory(boolean keepCurrentDirectory); + File choose(); } @@ -158,6 +162,8 @@ public class JaxxFileChooser { ToSave setStartDirectory(File startDirectory); + ToSave setKeepCurrentDirectory(boolean keepCurrentDirectory); + File choose(); } @@ -192,6 +198,8 @@ public class JaxxFileChooser { protected boolean useAcceptAllFileFilter; + protected boolean keepCurrentDirectory = true; + protected String filename; FileChooserBuilderImpl(ChooseMode chooseMode) { @@ -302,6 +310,12 @@ public class JaxxFileChooser { } @Override + public FileChooserBuilderImpl setKeepCurrentDirectory(boolean keepCurrentDirectory) { + this.keepCurrentDirectory = keepCurrentDirectory; + return this; + } + + @Override public File choose() { File result = null; @@ -328,7 +342,7 @@ public class JaxxFileChooser { File directory; if (startDirectory == null) { - directory = currentDirectory; + directory = getCurrentDirectory(); } else { directory = startDirectory; } @@ -362,7 +376,9 @@ public class JaxxFileChooser { if (returnVal == JFileChooser.APPROVE_OPTION) { File theFile = chooser.getSelectedFile(); if (theFile != null) { - currentDirectory = theFile; + if (keepCurrentDirectory) { + setCurrentDirectory(theFile); + } return theFile.getAbsoluteFile(); } } @@ -399,7 +415,9 @@ public class JaxxFileChooser { if (returnVal == JFileChooser.APPROVE_OPTION) { File theFile = chooser.getSelectedFile(); if (theFile != null) { - currentDirectory = theFile; + if (keepCurrentDirectory) { + setCurrentDirectory(theFile); + } if (theFile.isDirectory()) { return theFile; } @@ -445,7 +463,9 @@ public class JaxxFileChooser { if (returnVal == JFileChooser.APPROVE_OPTION) { result = chooser.getSelectedFile(); if (result != null) { - setCurrentDirectory(result); + if (keepCurrentDirectory) { + setCurrentDirectory(result); + } result = result.getAbsoluteFile(); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit b1dffc2f160decb752cdcfef55b3db1cbd2092ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:11:49 2014 +0100 refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) --- .../application/swing/action/AbstractApplicationAction.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java index 11d25e5..0a47045 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java @@ -269,16 +269,18 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten * Sauver un fichier via un sélecteur graphique de fichiers, en précisant * le répertoire où sauvegarder le fichier. * - * @param startDirectory le répertoire à utiliser pour choisir le fichier - * @param title le titre du dialogue de sélection - * @param buttonLabel le label du boutton d'acceptation - * @param filters les filtres + descriptions sur le sélecteur de - * fichiers + * @param startDirectory le répertoire à utiliser pour choisir le fichier + * @param keepCurrentDirectory un drapeau pour dire si on veut ou pas conserver le répertoire choisit comme nouveau répertoire par défaut + * @param title le titre du dialogue de sélection + * @param buttonLabel le label du boutton d'acceptation + * @param filters les filtres + descriptions sur le sélecteur de + * fichiers * @return le fichier choisi ou {@code null} si pas de fichier choisi ou * pas voulu écrasé un fichier existant. * @since 2.17 */ protected File saveFileWithStartDirectory(File startDirectory, + boolean keepCurrentDirectory, String filename, String extension, String title, @@ -290,6 +292,7 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten File file = JaxxFileChooser.forSaving() .setStartDirectory(startDirectory) + .setKeepCurrentDirectory(keepCurrentDirectory) .setTitle(title) .setParent((Component) getUI()) .setApprovalText(buttonLabel) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit fe353da1f0aeeed47459965b5078dacc12a25f2f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:12:15 2014 +0100 refs #3569: Add a default directory option in JaxxFileChooser (add option to keep or not current directory) --- .../jaxx/application/swing/action/AbstractApplicationAction.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java index 0a47045..a2fe71c 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java @@ -317,8 +317,13 @@ public abstract class AbstractApplicationAction<M extends AbstractBean, UI exten if (confirm) { - // on conserve le répertoire (pour une prochaine utilisation) - JaxxFileChooser.setCurrentDirectory(file.getParentFile()); + if (keepCurrentDirectory) { + + // on conserve le répertoire (pour une prochaine utilisation) + JaxxFileChooser.setCurrentDirectory(file.getParentFile()); + + } + } else { // l'utilisateur n'a pas confirmé l'écrasement -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm