Changeset 9461 in josm for trunk/src/org

Timestamp:

2016-01-15T13:04:22+01:00 (9 years ago)

Author:

bastiK

Message:

applied #12369 - default extension for saving files read from preferences (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/GpxExportAction.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)
• io/GpxExporter.java (modified) (1 diff)
• io/GpxImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

@@ -83 +83 @@
                     layer.getClass().getName()));
 
-        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), GpxImporter.FILE_FILTER);
+        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), GpxImporter.getFileFilter());
         if (file == null)
             return;

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -363 +363 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.FILE_FILTER);
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.getFileFilter());
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -965 +965 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save OSM file"), "osm");
+        String extension = Main.pref.get("save.extension.osm", "osm");
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save OSM file"), extension);
     }
 

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -63 +63 @@
      */
     public GpxExporter() {
-        super(GpxImporter.FILE_FILTER);
+        super(GpxImporter.getFileFilter());
     }
 

trunk/src/org/openstreetmap/josm/io/GpxImporter.java

@@ -24 +24 @@
  */
 public class GpxImporter extends FileImporter {
-
-    /**
-     * The GPX file filter (*.gpx and *.gpx.gz files).
-     */
-    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-            "gpx", "gpx", tr("GPX Files"), true);
 
     /**
@@ -71 +65 @@
      */
     public GpxImporter() {
-        super(FILE_FILTER);
+        super(getFileFilter());
+    }
+
+    /**
+     * Returns a GPX file filter (*.gpx and *.gpx.gz files).
+     */
+    public static ExtensionFileFilter getFileFilter() {
+        return ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "gpx", Main.pref.get("save.extension.gpx", "gpx"), tr("GPX Files"), true);
     }