Changeset 20784 in osm for applications/editors/josm/plugins

Timestamp:

2010-04-04T17:42:05+02:00 (15 years ago)

Author:

skela

Message:

'Adjust to read-only JOSM selection object'

Location:

applications/editors/josm/plugins/wayselector

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/wayselector/WaySelection.java (modified) (4 diffs)

applications/editors/josm/plugins/wayselector/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="Initial release of the Way Selector plugin" />
+        <property name="commit.message" value="Adjust to read-only JOSM selection object" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3095" />

applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelection.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.TreeSet;
@@ -103 +104 @@
      @param data the data set in which to extend the selection */
     void extend(DataSet data) {
-        Collection<OsmPrimitive> selection = data.getSelected();
+        Collection<OsmPrimitive> currentSelection;
+        LinkedList<OsmPrimitive> selection;
         boolean selectionChanged = false;
         Way way;
@@ -110 +112 @@
             return;
 
-        while ((way = findWay(selection)) != null) {
+        currentSelection = data.getSelected();
+
+        way = findWay(currentSelection);
+
+        if (way == null)
+            return;
+
+        selection = new LinkedList<OsmPrimitive>();
+        for (OsmPrimitive primitive : currentSelection)
+            selection.add(primitive);
+
+        do {
             if (!selection.add(way))
                 break;
@@ -117 +130 @@
             ways.add(way);
             addNodes(way);
-        }
+
+            way = findWay(selection);
+        } while (way != null);
 
         if (selectionChanged)