Changeset 13916 in josm for trunk/src

Timestamp:

2018-06-11T01:32:42+02:00 (6 years ago)

Author:

Don-vip

Message:

move getSelected*() default implementation from DataSet to OsmData

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• OsmData.java (modified) (5 diffs)

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

@@ -607 +607 @@
 
     @Override
-    public Collection<OsmPrimitive> getSelected() {
-        return new SubclassFilteredCollection<>(getAllSelected(), p -> !p.isDeleted());
-    }
-
-    @Override
     public Collection<OsmPrimitive> getAllSelected() {
         return currentSelectedPrimitives;
-    }
-
-    @Override
-    public Collection<Node> getSelectedNodes() {
-        return new SubclassFilteredCollection<>(getSelected(), Node.class::isInstance);
-    }
-
-    @Override
-    public Collection<Way> getSelectedWays() {
-        return new SubclassFilteredCollection<>(getSelected(), Way.class::isInstance);
-    }
-
-    @Override
-    public Collection<Relation> getSelectedRelations() {
-        return new SubclassFilteredCollection<>(getSelected(), Relation.class::isInstance);
     }
 

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -332 +333 @@
      * @return unmodifiable collection of primitives
      */
-    Collection<O> getSelected();
+    default Collection<O> getSelected() {
+        return new SubclassFilteredCollection<>(getAllSelected(), p -> !p.isDeleted());
+    }
 
     /**
@@ -348 +351 @@
      * @return selected nodes
      */
-    Collection<N> getSelectedNodes();
+    default Collection<N> getSelectedNodes() {
+        return new SubclassFilteredCollection<>(getSelected(), Node.class::isInstance);
+    }
 
     /**
@@ -354 +359 @@
      * @return selected ways
      */
-    Collection<W> getSelectedWays();
+    default Collection<W> getSelectedWays() {
+        return new SubclassFilteredCollection<>(getSelected(), Way.class::isInstance);
+    }
 
     /**
@@ -360 +367 @@
      * @return selected relations
      */
-    Collection<R> getSelectedRelations();
+    default Collection<R> getSelectedRelations() {
+        return new SubclassFilteredCollection<>(getSelected(), Relation.class::isInstance);
+    }
 
     /**