Changeset 9721 in josm for trunk

Timestamp:

2016-02-03T15:03:32+01:00 (8 years ago)

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveActionBase.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)

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

@@ -198 +198 @@
             // No filefilter accepts current filename, add default extension
             String fn = file.getPath();
-            if (extension != null) {
+            if (extension != null && ff.accept(new File(fn + '.' + extension))) {
                 fn += '.' + extension;
             } else if (ff instanceof ExtensionFileFilter) {

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

@@ -76 +76 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -128 +129 @@
     public static final IntegerProperty PROPERTY_RECENT_RELATIONS_NUMBER = new IntegerProperty("properties.last-closed-relations-size",
             DEFAULT_RECENT_RELATIONS_NUMBER);
+    public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm");
+
 
     /** List of recent relations */
@@ -1007 +1010 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        String extension = Main.pref.get("save.extension.osm", "osm");
+        String extension = PROPERTY_SAVE_EXTENSION.get();
         File file = getAssociatedFile();
         if (file == null && isRenamed()) {