Changeset 9152 in josm for trunk/src

Timestamp:

2015-12-25T21:13:14+01:00 (9 years ago)

Author:

simon04

Message:

fix #12183 - "Registered toolbar action save_as-session overwritten"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SessionSaveAsAction.java (modified) (1 diff)
• gui/io/SaveLayersDialog.java (modified) (1 diff)

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

@@ -59 +59 @@
      */
     public SessionSaveAsAction() {
-        super(tr("Save Session As..."), "session", tr("Save the current session to a new file."), null, true, "save_as-session", true);
+        this(true, true);
+    }
+
+    /**
+     * Constructs a new {@code SessionSaveAsAction}.
+     * @param toolbar Register this action for the toolbar preferences?
+     * @param installAdapters False, if you don't want to install layer changed and selection changed adapters
+     */
+    protected SessionSaveAsAction(boolean toolbar, boolean installAdapters) {
+        super(tr("Save Session As..."), "session", tr("Save the current session to a new file."), null, toolbar, "save_as-session", installAdapters);
         putValue("help", ht("/Action/SessionSaveAs"));
     }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -370 +370 @@
 
     class SaveSessionAction extends SessionSaveAsAction {
+
+        public SaveSessionAction() {
+            super(false, false);
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {