Changeset 1866 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2009-07-28T20:01:00+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3116: NullPointerException when creating a relation without the data layer selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -101 +101 @@
         //
         JPanel buttonPanel = new JPanel(new GridLayout(1,3));
-        buttonPanel.add(new SideButton(marktr("New"), "addrelation", "Selection", tr("Create a new relation"), new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                // call relation editor with null argument to create new relation
-                RelationEditor.getEditor(Main.map.mapView.getEditLayer(),null, null).setVisible(true);
-            }
-        }), GBC.std());
+
+        // the new action
+        //
+        NewAction newAction = new NewAction();
+        Layer.listeners.add(newAction);
+        buttonPanel.add(new SideButton(newAction), GBC.std());
 
         // the edit action
@@ -313 +313 @@
         }
     }
+
+    /**
+     * The edit action
+     *
+     */
+    class NewAction extends AbstractAction implements LayerChangeListener{
+        public NewAction() {
+            putValue(SHORT_DESCRIPTION,tr("Create a new relation"));
+            putValue(NAME, tr("New"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "addrelation"));
+            setEnabled(false);
+        }
+
+        public void run() {
+            RelationEditor.getEditor(Main.map.mapView.getEditLayer(),null, null).setVisible(true);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            run();
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+        }
+
+        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+            updateEnabledState();
+        }
+
+        public void layerAdded(Layer newLayer) {
+            updateEnabledState();
+        }
+
+        public void layerRemoved(Layer oldLayer) {
+            updateEnabledState();
+        }
+    }
 }