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

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/CommandStackDialog.java (modified) (3 diffs)
• dialogs/InspectPrimitiveDialog.java (modified) (6 diffs)
• layer/OsmDataLayer.java (modified) (3 diffs)

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)+", ";