Changeset 1821 in josm for trunk/src/org

Timestamp:

2009-07-21T20:11:17+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3024: NPE on start on press of "N" key

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DeleteAction.java (modified) (2 diffs)
• DrawAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -53 +53 @@
     @Override public void enterMode() {
         super.enterMode();
+        if (!isEnabled())
+            return;
         Main.map.mapView.addMouseListener(this);
     }
@@ -135 +137 @@
         return l instanceof OsmDataLayer;
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.isActiveLayerDrawable());
+    }
 }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -204 +204 @@
 
     @Override public void enterMode() {
+        if (!isEnabled())
+            return;
         super.enterMode();
         currCursor = Cursors.crosshair;
@@ -929 +931 @@
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-        if (n != null && getCurrentDataSet().getSelectedNodes().contains(n)) {
+        if (n != null && getCurrentDataSet() != null && getCurrentDataSet().getSelectedNodes().contains(n)) {
             if (wayIsFinished) {
                 rv = tr("Select node under cursor.");
@@ -940 +942 @@
          * Handle special case: Self-Overlapping or closing way
          */
-        if (getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
+        if (getCurrentDataSet() != null && getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
             Way w = (Way) getCurrentDataSet().getSelectedWays().iterator().next();
             for (Node m : w.nodes) {
@@ -955 +957 @@
         return l instanceof OsmDataLayer;
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(getEditLayer() != null);
+    }
 }