Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 9669) +++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 9670) @@ -156,5 +156,11 @@ } - private static File checkFileAndConfirmOverWrite(AbstractFileChooser fc, String extension) { + /** + * Checks if selected filename has the given extension. If not, adds the extension and asks for overwrite if filename exists. + * + * @param fc FileChooser where file was already selected + * @return the {@code File} or {@code null} if the user cancelled the dialog. + */ + public static File checkFileAndConfirmOverWrite(AbstractFileChooser fc, String extension) { if (fc == null) return null; File file = fc.getSelectedFile(); Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 9669) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 9670) @@ -45,5 +45,4 @@ import org.openstreetmap.josm.actions.ExpertToggleAction; import org.openstreetmap.josm.actions.RenameLayerAction; -import org.openstreetmap.josm.actions.SaveActionBase; import org.openstreetmap.josm.actions.ToggleUploadDiscouragedLayerAction; import org.openstreetmap.josm.data.APIDataSet; @@ -92,5 +91,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.widgets.FileChooserManager; import org.openstreetmap.josm.gui.widgets.JosmTextArea; +import org.openstreetmap.josm.io.OsmImporter; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.FilteredCollection; @@ -1002,5 +1003,15 @@ public File createAndOpenSaveFileChooser() { String extension = Main.pref.get("save.extension.osm", "osm"); - return SaveActionBase.createAndOpenSaveFileChooser(tr("Save OSM file"), extension); + File file = getAssociatedFile(); + if (file == null && isRenamed()) { + String filename = Main.pref.get("lastDirectory") + '/' + getName(); + if (!OsmImporter.FILE_FILTER.acceptName(filename)) filename = filename + '.' + extension; + file = new File(filename); + } + return new FileChooserManager() + .title(tr("Save OSM file")) + .extension(extension) + .file(file) + .getFileForSave(); } Index: trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (revision 9669) +++ trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (revision 9670) @@ -38,5 +38,22 @@ private final String curDir; + private boolean multiple = false; + private String title = null; + private Collection filters; + private FileFilter defaultFilter; + private int selectionMode = JFileChooser.FILES_ONLY; + private String extension = null; + private boolean allTypes = false; + private File file = null; + private AbstractFileChooser fc; + + /** + * Creates a new {@code FileChooserManager} with default values. + * @see #createFileChooser + */ + public FileChooserManager() { + this(false, null, null); + } /** @@ -102,5 +119,5 @@ */ public final FileChooserManager createFileChooser() { - return doCreateFileChooser(false, null, null, null, null, JFileChooser.FILES_ONLY, false); + return doCreateFileChooser(); } @@ -119,6 +136,12 @@ */ public final FileChooserManager createFileChooser(boolean multiple, String title, FileFilter filter, int selectionMode) { - doCreateFileChooser(multiple, title, Collections.singleton(filter), filter, null, selectionMode, false); - getFileChooser().setAcceptAllFileFilterUsed(false); + multiple(multiple); + title(title); + filters(Collections.singleton(filter)); + defaultFilter(filter); + selectionMode(selectionMode); + + doCreateFileChooser(); + fc.setAcceptAllFileFilterUsed(false); return this; } @@ -140,5 +163,10 @@ public final FileChooserManager createFileChooser(boolean multiple, String title, Collection filters, FileFilter defaultFilter, int selectionMode) { - return doCreateFileChooser(multiple, title, filters, defaultFilter, null, selectionMode, false); + multiple(multiple); + title(title); + filters(filters); + defaultFilter(defaultFilter); + selectionMode(selectionMode); + return doCreateFileChooser(); } @@ -159,9 +187,101 @@ */ public final FileChooserManager createFileChooser(boolean multiple, String title, String extension, boolean allTypes, int selectionMode) { - return doCreateFileChooser(multiple, title, null, null, extension, selectionMode, allTypes); - } - - private FileChooserManager doCreateFileChooser(boolean multiple, String title, Collection filters, - FileFilter defaultFilter, String extension, int selectionMode, boolean allTypes) { + multiple(multiple); + title(title); + extension(extension); + allTypes(allTypes); + selectionMode(selectionMode); + return doCreateFileChooser(); + } + + /** + * Builder method to set {@code multiple} property. + * @param value If true, makes the dialog allow multiple file selections + * @return this + */ + public FileChooserManager multiple(boolean value) { + multiple = value; + return this; + } + + /** + * Builder method to set {@code title} property. + * @param value The string that goes in the dialog window's title bar + * @return this + */ + public FileChooserManager title(String value) { + title = value; + return this; + } + + /** + * Builder method to set {@code filters} property. + * @param value The file filters that will be proposed by the dialog + * @return this + */ + public FileChooserManager filters(Collection value) { + filters = value; + return this; + } + + /** + * Builder method to set {@code defaultFilter} property. + * @param value The file filter that will be selected by default + * @return this + */ + public FileChooserManager defaultFilter(FileFilter value) { + defaultFilter = value; + return this; + } + + /** + * Builder method to set {@code selectionMode} property. + * @param value The selection mode that allows the user to:
+ * @return this + */ + public FileChooserManager selectionMode(int value) { + selectionMode = value; + return this; + } + + /** + * Builder method to set {@code extension} property. + * @param value The file extension that will be selected as the default file filter + * @return this + */ + public FileChooserManager extension(String value) { + extension = value; + return this; + } + + /** + * Builder method to set {@code allTypes} property. + * @param value If true, all the files types known by JOSM will be proposed in the "file type" combobox. + * If false, only the file filters that include {@code extension} will be proposed + * @return this + */ + public FileChooserManager allTypes(boolean value) { + allTypes = value; + return this; + } + + /** + * Builder method to set {@code file} property. + * @param value {@link File} object with default filename + * @return this + */ + public FileChooserManager file(File value) { + file = value; + return this; + } + + /** + * Builds {@code FileChooserManager} object using properties set by builder methods or default values. + * @return this + */ + public FileChooserManager doCreateFileChooser() { File file = new File(curDir); // Use native dialog is preference is set, unless an unsupported selection mode is specifically wanted @@ -179,4 +299,5 @@ fc.setMultiSelectionEnabled(multiple); fc.setAcceptAllFileFilterUsed(false); + fc.setSelectedFile(this.file); if (filters != null) { @@ -196,5 +317,5 @@ /** - * Opens the {@code AbstractFileChooser} that has been created. Nothing happens if it has not been created yet. + * Opens the {@code AbstractFileChooser} that has been created. * @return the {@code AbstractFileChooser} if the user effectively choses a file or directory. {@code null} if the user cancelled the dialog. */ @@ -205,5 +326,4 @@ /** * Opens the {@code AbstractFileChooser} that has been created and waits for the user to choose a file/directory, or cancel the dialog.
- * Nothing happens if the dialog has not been created yet.
* When the user choses a file or directory, the {@code lastDirProperty} is updated to the chosen directory path. * @@ -212,26 +332,35 @@ */ public AbstractFileChooser openFileChooser(Component parent) { - if (fc != null) { - if (parent == null) { - parent = Main.parent; - } - - int answer = open ? fc.showOpenDialog(parent) : fc.showSaveDialog(parent); - if (answer != JFileChooser.APPROVE_OPTION) { + if (fc == null) doCreateFileChooser(); + + if (parent == null) { + parent = Main.parent; + } + + int answer = open ? fc.showOpenDialog(parent) : fc.showSaveDialog(parent); + if (answer != JFileChooser.APPROVE_OPTION) { + return null; + } + + if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) { + Main.pref.put(lastDirProperty, fc.getCurrentDirectory().getAbsolutePath()); + } + + if (!open) { + File file = fc.getSelectedFile(); + if (!SaveActionBase.confirmOverwrite(file)) { return null; } - - if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) { - Main.pref.put(lastDirProperty, fc.getCurrentDirectory().getAbsolutePath()); - } - - if (!open) { - File file = fc.getSelectedFile(); - if (!SaveActionBase.confirmOverwrite(file)) { - return null; - } - } } return fc; } + + /** + * Opens the file chooser dialog, then checks if filename has the given extension. If not, adds the extension and asks for overwrite if filename exists. + * + * @return the {@code File} or {@code null} if the user cancelled the dialog. + */ + public File getFileForSave() { + return SaveActionBase.checkFileAndConfirmOverWrite(openFileChooser(), extension); + } }