Changeset 271 in josm for src

Timestamp:

2007-07-04T00:34:16+02:00 (18 years ago)

Author:

imi

Message:

• fixed bug in 'combine way' that did not collect all properties.

Location:

src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -84 +84 @@
                                 p.add(c, GBC.eol());
                                 components.put(e.getKey(), c);
-                        }
+                        } else
+                                newWay.put(e.getKey(), e.getValue().iterator().next());
                 }
                 if (!components.isEmpty()) {

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -106 +106 @@
         }
 
-        public void setSelected(OsmPrimitive osm) {
+        public void setSelected(OsmPrimitive... osm) {
                 clearSelection();
-                if (osm == null)
+                if (osm.length == 0)
                         return;
-                osm.selected = true;
-                fireSelectionChanged(Arrays.asList(new OsmPrimitive[]{osm}));
+                for (OsmPrimitive o : osm)
+                        o.selected = true;
+                fireSelectionChanged(Arrays.asList(osm));
         }