Changeset 3973 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2011-03-10T00:39:28+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r3760 r3973 16 16 import org.openstreetmap.josm.Main; 17 17 import org.openstreetmap.josm.data.Bounds; 18 import org.openstreetmap.josm.data.conflict.Conflict; 18 19 import org.openstreetmap.josm.data.osm.OsmPrimitive; 19 20 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; … … 201 202 sel = getCurrentDataSet().getSelected(); 202 203 } else if (mode.equals("conflict")) { 203 if (Main.map.conflictDialog.getConflicts() != null) { 204 Conflict<? extends OsmPrimitive> c = Main.map.conflictDialog.getSelectedConflict(); 205 if (c != null) { 206 sel.add(c.getMy()); 207 } else if (Main.map.conflictDialog.getConflicts() != null) { 204 208 sel = Main.map.conflictDialog.getConflicts().getMyConflictParties(); 205 209 }
Note:
See TracChangeset
for help on using the changeset viewer.