Changeset 6992 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2014-04-22T01:06:55+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
r6643 r6992 19 19 20 20 import org.openstreetmap.josm.Main; 21 import org.openstreetmap.josm.data.ViewportData; 21 22 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 22 import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData;23 23 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 24 24 import org.openstreetmap.josm.gui.layer.Layer; -
trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
r6792 r6992 25 25 import org.openstreetmap.josm.Main; 26 26 import org.openstreetmap.josm.data.Bounds; 27 import org.openstreetmap.josm.data.SystemOfMeasurement; 27 28 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 28 29 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; … … 36 37 import org.openstreetmap.josm.gui.MapView; 37 38 import org.openstreetmap.josm.gui.NavigatableComponent; 38 import org.openstreetmap.josm.gui.NavigatableComponent.SystemOfMeasurement;39 39 import org.openstreetmap.josm.gui.layer.Layer; 40 40 import org.openstreetmap.josm.gui.layer.MapViewPaintable; … … 429 429 double snapDistance; 430 430 SystemOfMeasurement som = NavigatableComponent.getSystemOfMeasurement(); 431 if (som.equals( NavigatableComponent.CHINESE_SOM)) {432 snapDistance = snapDistanceChinese * NavigatableComponent.CHINESE_SOM.aValue;433 } else if (som.equals( NavigatableComponent.IMPERIAL_SOM)) {434 snapDistance = snapDistanceImperial * NavigatableComponent.IMPERIAL_SOM.aValue;435 } else if (som.equals( NavigatableComponent.NAUTICAL_MILE_SOM)) {436 snapDistance = snapDistanceNautical * NavigatableComponent.NAUTICAL_MILE_SOM.aValue;431 if (som.equals(SystemOfMeasurement.CHINESE)) { 432 snapDistance = snapDistanceChinese * SystemOfMeasurement.CHINESE.aValue; 433 } else if (som.equals(SystemOfMeasurement.IMPERIAL)) { 434 snapDistance = snapDistanceImperial * SystemOfMeasurement.IMPERIAL.aValue; 435 } else if (som.equals(SystemOfMeasurement.NAUTICAL_MILE)) { 436 snapDistance = snapDistanceNautical * SystemOfMeasurement.NAUTICAL_MILE.aValue; 437 437 } else { 438 438 snapDistance = snapDistanceMetric; // Metric system by default -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r6957 r6992 48 48 import org.openstreetmap.josm.gui.MapFrame; 49 49 import org.openstreetmap.josm.gui.MapView; 50 import org.openstreetmap.josm.gui.NavigatableComponent;51 50 import org.openstreetmap.josm.gui.SelectionManager; 52 51 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded; … … 248 247 */ 249 248 private boolean giveUserFeedback(MouseEvent e, int modifiers) { 250 Collection<OsmPrimitive> c = MapView.asColl(249 Collection<OsmPrimitive> c = asColl( 251 250 mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true)); 252 251 … … 431 430 // if nothing was selected, select primitive under cursor for scaling or rotating 432 431 if (getCurrentDataSet().getSelected().isEmpty()) { 433 getCurrentDataSet().setSelected( MapView.asColl(nearestPrimitive));432 getCurrentDataSet().setSelected(asColl(nearestPrimitive)); 434 433 } 435 434 … … 446 445 } 447 446 OsmPrimitive toSelect = cycleManager.cycleSetup(nearestPrimitive, e.getPoint()); 448 selectPrims( NavigatableComponent.asColl(toSelect), false, false);447 selectPrims(asColl(toSelect), false, false); 449 448 useLastMoveCommandIfPossible(); 450 449 // Schedule a timer to update status line "initialMoveDelay+1" ms in the future … … 522 521 needsRepaint = true; 523 522 } 524 mv.setNewCursor(getCursor( MapView.asColl(p)), this);523 mv.setNewCursor(getCursor(asColl(p)), this); 525 524 // also update the stored mouse event, so we can display the correct cursor 526 525 // when dragging a node onto another one and then press CTRL to merge … … 953 952 if (!(alt || multipleMatchesParameter)) { 954 953 // no real cycling, just one element in cycle list 955 cycleList = MapView.asColl(osm);954 cycleList = asColl(osm); 956 955 957 956 if (waitForMouseUpParameter) { … … 1060 1059 } 1061 1060 // return one-element collection with one element to be selected (or added to selection) 1062 return MapView.asColl(nxt);1061 return asColl(nxt); 1063 1062 } 1064 1063 } … … 1162 1161 } 1163 1162 } 1163 1164 /** 1165 * @return o as collection of o's type. 1166 */ 1167 protected static <T> Collection<T> asColl(T o) { 1168 if (o == null) 1169 return Collections.emptySet(); 1170 return Collections.singleton(o); 1171 } 1164 1172 }
Note:
See TracChangeset
for help on using the changeset viewer.