Changeset 753 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-08-06T18:53:20+02:00 (16 years ago)

Author:

stoecker

Message:

no longer select relations and incomplete elements. Fixes #616.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SelectAllAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (1 diff)

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

@@ -16 +16 @@
 
         public void actionPerformed(ActionEvent e) {
-                Main.ds.setSelected(Main.ds.allNonDeletedPrimitives());
+                Main.ds.setSelected(Main.ds.allNonDeletedPhysicalPrimitives());
         }
 }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -88 +88 @@
                         Collection<OsmPrimitive> sel = Main.ds.getSelected();
                         SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive);
-                        for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+                        for (OsmPrimitive osm : Main.ds.allNonDeletedPhysicalPrimitives()) {
                                 if (mode == SearchMode.replace) {
                                         if (matcher.match(osm))

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

@@ -78 +78 @@
                 for (OsmPrimitive osm : allPrimitives())
                         if (!osm.deleted)
+                                o.add(osm);
+                return o;
+        }
+
+        public Collection<OsmPrimitive> allNonDeletedPhysicalPrimitives() {
+                Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
+                for (OsmPrimitive osm : allPrimitives())
+                        if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation))
                                 o.add(osm);
                 return o;