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 98187f26e466d50c9eb51fddd7e8bd04aedd99e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 14:59:07 2014 +0100 fixes #3569: Add a default directory option in JaxxFileChooser --- .../org/nuiton/jaxx/runtime/JaxxFileChooser.java | 47 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 3 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 39f23b9..94f4c6c 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 @@ -114,6 +114,8 @@ public class JaxxFileChooser { ToLoadFile setUseAcceptAllFileFilter(boolean useAcceptAllFileFilter); + ToLoadFile setStartDirectory(File startDirectory); + File choose(); } @@ -126,6 +128,8 @@ public class JaxxFileChooser { ToLoadDirectory setParent(Component parent); + ToLoadDirectory setStartDirectory(File startDirectory); + File choose(); } @@ -152,6 +156,8 @@ public class JaxxFileChooser { ToSave setFilename(String filename); + ToSave setStartDirectory(File startDirectory); + File choose(); } @@ -168,6 +174,8 @@ public class JaxxFileChooser { protected String title; + protected File startDirectory; + protected String approvalText; protected Component parent; @@ -203,6 +211,12 @@ public class JaxxFileChooser { } @Override + public FileChooserBuilderImpl setStartDirectory(File startDirectory) { + this.startDirectory = startDirectory; + return this; + } + + @Override public FileChooserBuilderImpl setParent(Component parent) { this.parent = parent; return this; @@ -311,7 +325,15 @@ public class JaxxFileChooser { try { - JFileChooser chooser = new JFileChooser(currentDirectory); + File directory; + + if (startDirectory == null) { + directory = currentDirectory; + } else { + directory = startDirectory; + } + + JFileChooser chooser = new JFileChooser(directory); chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); if (CollectionUtils.isNotEmpty(fileFilters)) { @@ -359,7 +381,17 @@ public class JaxxFileChooser { protected File chooseToLoadDirectory() { try { - JFileChooser chooser = new JFileChooser(currentDirectory); + + File directory; + + if (startDirectory == null) { + directory = getCurrentDirectory(); + } else { + directory = startDirectory; + } + + JFileChooser chooser = new JFileChooser(directory); + chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setDialogTitle(title); @@ -383,7 +415,16 @@ public class JaxxFileChooser { } protected File chooseToSave() { - File selectedFile = new File(getCurrentDirectory(), filename); + + File directory; + + if (startDirectory == null) { + directory = getCurrentDirectory(); + } else { + directory = startDirectory; + } + + File selectedFile = new File(directory, filename); JFileChooser chooser = new JFileChooser(selectedFile); chooser.setDialogType(JFileChooser.SAVE_DIALOG); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.