Changeset 5048 in josm

Timestamp:

Mar 7, 2012 2:57:42 PM (15 months ago)

Author:

akks

Message:

fix #7429 - Shortcut redefinition in Save As feature

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveAsAction.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/layer/Layer.java (modified) (1 diff)

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

@@ -17 +17 @@
  */
 public class SaveAsAction extends SaveActionBase {
-
+    private static SaveAsAction instance = new SaveAsAction();
+    
     /**
      * Construct the action with "Save" as label.
@@ -28 +29 @@
         putValue("help", ht("/Action/SaveAs"));
     }
+    
+    public static SaveAsAction getInstance() {
+        return instance;
+    }
 
     @Override protected File getFile(Layer layer) {

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -121 +121 @@
     public final OpenLocationAction openLocation = new OpenLocationAction();
     public final JosmAction save = SaveAction.getInstance();
-    public final JosmAction saveAs = new SaveAsAction();
+    public final JosmAction saveAs = SaveAsAction.getInstance();
     public JosmAction sessionLoad;
     public JosmAction sessionSaveAs;

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

@@ -381 +381 @@
 
         public void actionPerformed(ActionEvent e) {
-            new SaveAsAction().doSave(layer);
+            SaveAsAction.getInstance().doSave(layer);
         }
     }