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

Timestamp:

2011-01-22T14:36:36+01:00 (14 years ago)

Author:

bastiK

Message:

generalize DatasetCollection.java (make OsmPrimitive a generic type parameter)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (6 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (6 diffs)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)
• tools/SubclassFilteredCollection.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/DatasetCollection.java ) (5 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -174 +176 @@
 
     private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<OsmPrimitive> predicate) {
-        return new DatasetCollection<T>(allPrimitives, predicate);
+        return new SubclassFilteredCollection<OsmPrimitive, T>(allPrimitives, predicate);
     }
 
@@ -386 +388 @@
 
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
-        return new DatasetCollection<OsmPrimitive>(getSelected(), new Predicate<OsmPrimitive>() {
+        return new FilteredCollection<OsmPrimitive>(getSelected(), new Predicate<OsmPrimitive>() {
             @Override
             public boolean evaluate(OsmPrimitive primitive) {
@@ -415 +417 @@
      */
     public Collection<Node> getSelectedNodes() {
-        return new DatasetCollection<Node>(getSelected(), OsmPrimitive.nodePredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Node>(getSelected(), OsmPrimitive.nodePredicate);
     }
 
@@ -422 +424 @@
      */
     public Collection<Way> getSelectedWays() {
-        return new DatasetCollection<Way>(getSelected(), OsmPrimitive.wayPredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Way>(getSelected(), OsmPrimitive.wayPredicate);
     }
 
@@ -429 +431 @@
      */
     public Collection<Relation> getSelectedRelations() {
-        return new DatasetCollection<Relation>(getSelected(), OsmPrimitive.relationPredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Relation>(getSelected(), OsmPrimitive.relationPredicate);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -38 +38 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.PseudoCommand;
-import org.openstreetmap.josm.data.osm.DatasetCollection;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -45 +44 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -331 +331 @@
             final OsmDataLayer currentLayer = Main.map.mapView.getEditLayer();
 
-            DatasetCollection<OsmPrimitive> prims = new DatasetCollection<OsmPrimitive>(
+            FilteredCollection<OsmPrimitive> prims = new FilteredCollection<OsmPrimitive>(
                     c.getParticipatingPrimitives(),
                     new Predicate<OsmPrimitive>(){

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DatasetCollection;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -65 +65 @@
     protected String buildText() {
         StringBuilder s = new StringBuilder();
-        for (Node n : new DatasetCollection<Node>(primitives, OsmPrimitive.nodePredicate)) {
+        for (Node n : new SubclassFilteredCollection<OsmPrimitive, Node>(primitives, OsmPrimitive.nodePredicate)) {
             s.append("Node id="+n.getUniqueId());
             if (!checkDataSet(n)) {
@@ -87 +87 @@
         }
 
-        for (Way w : new DatasetCollection<Way>(primitives, OsmPrimitive.wayPredicate)) {
+        for (Way w : new SubclassFilteredCollection<OsmPrimitive, Way>(primitives, OsmPrimitive.wayPredicate)) {
             s.append("Way id="+ w.getUniqueId());
             if (!checkDataSet(w)) {
@@ -110 +110 @@
         }
 
-        for (Relation r : new DatasetCollection<Relation>(primitives, OsmPrimitive.relationPredicate)) {
+        for (Relation r : new SubclassFilteredCollection<OsmPrimitive, Relation>(primitives, OsmPrimitive.relationPredicate)) {
             s.append("Relation id="+r.getUniqueId());
             if (!checkDataSet(r)) {
@@ -181 +181 @@
         // add way referrer
         List<OsmPrimitive> refs = n.getReferrers();
-        DatasetCollection<Way> wayRefs = new DatasetCollection<Way>(refs, OsmPrimitive.wayPredicate);
+        Collection<Way> wayRefs = new SubclassFilteredCollection<OsmPrimitive, Way>(refs, OsmPrimitive.wayPredicate);
         if (wayRefs.size() > 0) {
             s.append("  way referrer:\n");
@@ -192 +192 @@
     protected void addRelationReferrer(StringBuilder s, OsmPrimitive o) {
         List<OsmPrimitive> refs = o.getReferrers();
-        DatasetCollection<Relation> relRefs = new DatasetCollection<Relation>(refs, OsmPrimitive.relationPredicate);
+        Collection<Relation> relRefs = new SubclassFilteredCollection<OsmPrimitive, Relation>(refs, OsmPrimitive.relationPredicate);
         if (relRefs.size() > 0) {
             s.append("  relation referrer:\n");

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -50 +50 @@
 import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.data.osm.DatasetCollection;
 import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
 import org.openstreetmap.josm.data.osm.Node;
@@ -71 +70 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -271 +271 @@
 
     @Override public String getToolTipText() {
-        int nodes = new DatasetCollection<OsmPrimitive>(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
-        int ways = new DatasetCollection<OsmPrimitive>(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
+        int nodes = new FilteredCollection<Node>(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
+        int ways = new FilteredCollection<Way>(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
 
         String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";

trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.tools;
 
 import java.util.AbstractCollection;
@@ -6 +6 @@
 import java.util.Iterator;
 
-import org.openstreetmap.josm.tools.Predicate;
+/**
+ * Filtered view of a collection.
+ * (read-only collection, but elements can be changed, of course)
+ * Lets you iterate through those elements of a given collection that satisfy a
+ * certain condition (imposed by a predicate).
+ * @param <S> element type of the underlying collection
+ * @param <T> element type of filtered collection (and subclass of S). The predicate
+ *      must except only objects of type T.
+ */
+public class SubclassFilteredCollection<S, T extends S> extends AbstractCollection<T> {
 
-public class DatasetCollection<T extends OsmPrimitive> extends AbstractCollection<T> {
+    private final Collection<? extends S> collection;
+    private final Predicate<? super S> predicate;
+    int size = -1;
 
     private class FilterIterator implements Iterator<T> {
 
-        private final Iterator<? extends OsmPrimitive> iterator;
-        private OsmPrimitive current;
+        private final Iterator<? extends S> iterator;
+        private S current;
 
-        public FilterIterator(Iterator<? extends OsmPrimitive> iterator) {
+        public FilterIterator(Iterator<? extends S> iterator) {
             this.iterator = iterator;
         }
@@ -35 +46 @@
         }
 
-        @SuppressWarnings("unchecked")
         public T next() {
             findNext();
-            OsmPrimitive old = current;
+            S old = current;
             current = null;
-            return (T)old;
+            return (T) old;
         }
 
@@ -48 +58 @@
     }
 
-    private final Collection<? extends OsmPrimitive> primitives;
-    private final Predicate<OsmPrimitive> predicate;
-    int size = -1;
-
-    public DatasetCollection(Collection<? extends OsmPrimitive> primitives, Predicate<OsmPrimitive> predicate) {
-        this.primitives = primitives;
+    public SubclassFilteredCollection(Collection<? extends S> collection, Predicate<? super S> predicate) {
+        this.collection = collection;
         this.predicate = predicate;
     }
@@ -59 +65 @@
     @Override
     public Iterator<T> iterator() {
-        return new FilterIterator(primitives.iterator());
+        return new FilterIterator(collection.iterator());
     }