Changeset 1750 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

File:

• trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.HashSet;
 
 import javax.swing.JOptionPane;
@@ -70 +71 @@
         BoundingXYVisitor v = new BoundingXYVisitor();
         if (mode.equals("data")) {
-            for (Layer l : Main.map.mapView.getAllLayers())
+            for (Layer l : Main.map.mapView.getAllLayers()) {
                 l.visitBoundingBox(v);
-        } else if (mode.equals("layer"))
+            }
+        } else if (mode.equals("layer")) {
             Main.map.mapView.getActiveLayer().visitBoundingBox(v);
-        else if (mode.equals("selection") || mode.equals("conflict")) {
-            Collection<OsmPrimitive> sel = mode.equals("selection") ? Main.ds.getSelected()
-                    : Main.map.conflictDialog.conflicts.keySet();
+        } else if (mode.equals("selection") || mode.equals("conflict")) {
+            Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
+            if (mode.equals("selection")) {
+                sel = Main.ds.getSelected();
+            } else if (mode.equals("conflict")) {
+                if (Main.map.conflictDialog.getConflicts() != null) {
+                    sel = Main.map.conflictDialog.getConflicts().getMyConflictParties();
+                }
+            }
             if (sel.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
@@ -82 +90 @@
                 return null;
             }
-            for (OsmPrimitive osm : sel)
+            for (OsmPrimitive osm : sel) {
                 osm.visit(v);
+            }
             // increase bbox by 0.001 degrees on each side. this is required
             // especially if the bbox contains one single node, but helpful