Changeset 9629 in josm for trunk/src/org

Timestamp:

2016-01-25T13:02:39+01:00 (9 years ago)

Author:

bastiK

Message:

applied #12442 - fix: save session as caused NPE when there were no layers (patch by kolesar)

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (modified) (4 diffs)

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

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
@@ -49 +51 @@
  * @since 4685
  */
-public class SessionSaveAsAction extends DiskAccessAction {
+public class SessionSaveAsAction extends DiskAccessAction implements MapFrameListener {
 
     private transient List<Layer> layers;
@@ -71 +73 @@
                 null, toolbar, "save_as-session", installAdapters);
         putValue("help", ht("/Action/SessionSaveAs"));
+        Main.addMapFrameListener(this);
     }
 
@@ -284 +287 @@
         setEnabled(Main.isDisplayingMapView());
     }
+
+    @Override
+    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+        updateEnabledState();
+    };
 }