Author: tchemit Date: 2013-08-22 21:54:43 +0200 (Thu, 22 Aug 2013) New Revision: 2711 Url: http://nuiton.org/projects/jaxx/repository/revisions/2711 Log: fixes #2832: Do not use FileUtil defaultDirectory methods in FileChooserUtil class fixes #2831: [FileChooserUtil] Add a method to check if current directory is still the default one Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java 2013-08-20 06:15:46 UTC (rev 2710) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java 2013-08-22 19:54:43 UTC (rev 2711) @@ -46,8 +46,10 @@ /** Logger. */ private static final Log log = LogFactory.getLog(FileChooserUtil.class); - protected static File currentDirectory = new File("."); + public static final File DEFAULT_CURRENT_DIRECTORY_FILE = new File("."); + protected static File currentDirectory = DEFAULT_CURRENT_DIRECTORY_FILE; + public static void setCurrentDirectory(File dir) { currentDirectory = dir; } @@ -56,6 +58,10 @@ return currentDirectory; } + public static boolean isCurrentDirectoryDefault() { + return currentDirectory.equals(DEFAULT_CURRENT_DIRECTORY_FILE); + } + protected FileChooserUtil() { // no instance please } @@ -185,7 +191,7 @@ * @param approvalText le label du boutton d'acceptation * @param parent le component parent du dialog * @param filters les filtres a ajouter - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé + * @return le fichier accepté, ou null si rien n'est choisi ou l'utilisateur a annulé */ public static File getFile(String title, String approvalText, @@ -269,7 +275,7 @@ String approvalText, Component parent, javax.swing.filechooser.FileFilter... filters) { - File selectedFile = new File(FileUtil.getCurrentDirectory(), filename); + File selectedFile = new File(getCurrentDirectory(), filename); JFileChooser chooser = new JFileChooser(selectedFile); chooser.setDialogType(JFileChooser.SAVE_DIALOG); @@ -292,7 +298,7 @@ if (returnVal == JFileChooser.APPROVE_OPTION) { result = chooser.getSelectedFile(); if (result != null) { - FileUtil.setCurrentDirectory(result); + setCurrentDirectory(result); result = result.getAbsoluteFile(); } }