Changeset 9510 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-01-17T20:09:12+01:00 (8 years ago)

Author:

bastiK

Message:

applied #12391 - saving renamed layer replaces name (patch by kolesar + cosmetic changes)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• RenameLayerAction.java (modified) (2 diffs)
• SaveActionBase.java (modified) (1 diff)

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

@@ -86 +86 @@
                 if (Main.platform.rename(file, newFile)) {
                     layer.setAssociatedFile(newFile);
-                    nameText = newFile.getName();
+                    if (!layer.isRenamed()) {
+                        nameText = newFile.getName();
+                    }
                 } else {
                     JOptionPane.showMessageDialog(
@@ -98 +100 @@
             }
         }
-        layer.setName(nameText);
+        layer.rename(nameText);
         Main.parent.repaint();
     }

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

@@ -93 +93 @@
                 return false;
             }
-            layer.setName(file.getName());
+            if (!layer.isRenamed()) {
+                layer.setName(file.getName());
+            }
             layer.setAssociatedFile(file);
             if (layer instanceof OsmDataLayer) {