- Timestamp:
- 2016-04-10T03:35:29+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r9795 r10131 8 8 import java.awt.event.ActionEvent; 9 9 import java.awt.event.KeyEvent; 10 import java.awt.geom.Area; 10 11 import java.util.ArrayList; 11 12 import java.util.Arrays; … … 302 303 } else { 303 304 lastZoomArea = -1; 304 v.visit(new Bounds(Main.main.getCurrentDataSet().getDataSourceArea().getBounds2D())); 305 Area sourceArea = Main.main.getCurrentDataSet().getDataSourceArea(); 306 if (sourceArea != null) { 307 v.visit(new Bounds(sourceArea.getBounds2D())); 308 } 305 309 } 306 310 lastZoomTime = System.currentTimeMillis(); -
trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
r10101 r10131 106 106 107 107 private void enableActions(boolean enabled) { 108 for (Object key : actionMap.allKeys()) { 109 Action action = actionMap.get(key); 110 if (action != null) { 111 action.setEnabled(enabled); 108 Object[] allKeys = actionMap.allKeys(); 109 if (allKeys != null) { 110 for (Object key : allKeys) { 111 Action action = actionMap.get(key); 112 if (action != null) { 113 action.setEnabled(enabled); 114 } 112 115 } 113 116 } -
trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
r10074 r10131 213 213 } 214 214 } 215 final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel); 216 Main.main.undoRedo.add(result.getCommand()); 217 getCurrentDataSet().setSelected(result.getNewSelection()); 215 if (wayToKeep != null) { 216 final SplitWayResult result = doSplitWay(getEditLayer(), selectedWay, wayToKeep, newWays, sel); 217 Main.main.undoRedo.add(result.getCommand()); 218 getCurrentDataSet().setSelected(result.getNewSelection()); 219 } 218 220 } 219 221 } … … 536 538 final Way wayToKeep = splitStrategy.determineWayToKeep(newWays); 537 539 538 return doSplitWay(layer, way, wayToKeep, newWays, newSelection);540 return wayToKeep != null ? doSplitWay(layer, way, wayToKeep, newWays, newSelection) : null; 539 541 } 540 542 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
r10129 r10131 7 7 import java.awt.MouseInfo; 8 8 import java.awt.Point; 9 import java.awt.PointerInfo; 9 10 import java.awt.event.ActionEvent; 10 11 import java.io.Serializable; … … 94 95 pm.add(copyMenuComponent(c)); 95 96 } 96 Point p = MouseInfo.getPointerInfo().getLocation(); 97 pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY()); 97 PointerInfo pointerInfo = MouseInfo.getPointerInfo(); 98 if (pointerInfo != null) { 99 Point p = pointerInfo.getLocation(); 100 pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY()); 101 } 98 102 } 99 103 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
r10116 r10131 291 291 292 292 // Process optional argument 'select' 293 if (args .containsKey("select")) {293 if (args != null && args.containsKey("select")) { 294 294 toSelect.clear(); 295 295 for (String item : args.get("select").split(",")) {
Note:
See TracChangeset
for help on using the changeset viewer.