Author: chatellier Date: 2011-01-31 13:24:51 +0000 (Mon, 31 Jan 2011) New Revision: 617 Log: Select file chooser with defaut current directory Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -52,11 +52,13 @@ * Retourne une unique instance du file chooser pour conserver * le répertoire de sélection d'un appel sur l'autre. * + * @param currentDirectory current directory * @return file chooser */ - protected JFileChooser getFileChooserInstance() { + protected JFileChooser getFileChooserInstance(File currentDirectory) { if (fileChooserInstance == null) { fileChooserInstance = new JFileChooser(); + fileChooserInstance.setCurrentDirectory(currentDirectory); } return fileChooserInstance; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -97,7 +97,8 @@ * @param textComponent text component to fill */ public void selectInputFile(ProjectCreationView projectView, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = projectView.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(projectView); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -254,7 +254,8 @@ * @param textComponent text component to set selected file */ public void selectExportDirectory(ExportUploadDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -65,6 +65,7 @@ import com.bbn.openmap.gui.Tool; import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.CoserConfig; import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.RSufiResult; @@ -1143,7 +1144,8 @@ * @param textComponent text component to set selected directory */ public void selectOutputDirectory(SelectionRsufiView view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1183,7 +1185,8 @@ * @param textComponent text component to set selected file */ public void selectResultFile(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1200,7 +1203,8 @@ * @param textComponent text component to set selected directory */ public void selectMapsDirectory(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1217,7 +1221,8 @@ * @param listComponent list component to set selected file */ public void selectResultFileOrDirectory(SelectionAddResultDialog view, JList listComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); int result = selectFileChooser.showOpenDialog(view);