Changeset 1821 in josm for trunk/src/org
- Timestamp:
- 2009-07-21T20:11:17+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions/mapmode
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r1814 r1821 53 53 @Override public void enterMode() { 54 54 super.enterMode(); 55 if (!isEnabled()) 56 return; 55 57 Main.map.mapView.addMouseListener(this); 56 58 } … … 135 137 return l instanceof OsmDataLayer; 136 138 } 139 140 @Override 141 protected void updateEnabledState() { 142 setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.isActiveLayerDrawable()); 143 } 137 144 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r1814 r1821 204 204 205 205 @Override public void enterMode() { 206 if (!isEnabled()) 207 return; 206 208 super.enterMode(); 207 209 currCursor = Cursors.crosshair; … … 929 931 * Handle special case: Highlighted node == selected node => finish drawing 930 932 */ 931 if (n != null && getCurrentDataSet() .getSelectedNodes().contains(n)) {933 if (n != null && getCurrentDataSet() != null && getCurrentDataSet().getSelectedNodes().contains(n)) { 932 934 if (wayIsFinished) { 933 935 rv = tr("Select node under cursor."); … … 940 942 * Handle special case: Self-Overlapping or closing way 941 943 */ 942 if (getCurrentDataSet() .getSelectedWays().size() > 0 && !wayIsFinished && !alt) {944 if (getCurrentDataSet() != null && getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) { 943 945 Way w = (Way) getCurrentDataSet().getSelectedWays().iterator().next(); 944 946 for (Node m : w.nodes) { … … 955 957 return l instanceof OsmDataLayer; 956 958 } 959 960 @Override 961 protected void updateEnabledState() { 962 setEnabled(getEditLayer() != null); 963 } 957 964 }
Note:
See TracChangeset
for help on using the changeset viewer.