Changeset 13926 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

Timestamp:

2018-06-13T01:33:47+02:00 (6 years ago)

Author:

Don-vip

Message:

add AbstractOsmDataLayer, MainLayerManager.getActiveData, Main.getInProgressISelection

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (modified) (13 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.INode;
+import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IRelationMember;
+import org.openstreetmap.josm.data.osm.IWay;
+import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
@@ -36 +39 @@
 
     private final StringBuilder s = new StringBuilder();
-    private final DataSet ds;
-
-    InspectPrimitiveDataText(DataSet ds) {
+    private final OsmData<?, ?, ?, ?> ds;
+
+    InspectPrimitiveDataText(OsmData<?, ?, ?, ?> ds) {
         this.ds = ds;
     }
@@ -63 +66 @@
      * @param o primitive to add
      */
-    public void addPrimitive(OsmPrimitive o) {
+    public void addPrimitive(IPrimitive o) {
 
         addHeadline(o);
@@ -82 +85 @@
         addSpecial(o);
         addReferrers(s, o);
-        addConflicts(o);
+        if (o instanceof OsmPrimitive) {
+            addConflicts((OsmPrimitive) o);
+        }
         s.append(NL);
     }
 
-    void addHeadline(OsmPrimitive o) {
+    void addHeadline(IPrimitive o) {
         addType(o);
         addNameAndId(o);
     }
 
-    void addType(OsmPrimitive o) {
-        if (o instanceof Node) {
+    void addType(IPrimitive o) {
+        if (o instanceof INode) {
             s.append(tr("Node: "));
-        } else if (o instanceof Way) {
+        } else if (o instanceof IWay) {
             s.append(tr("Way: "));
-        } else if (o instanceof Relation) {
+        } else if (o instanceof IRelation) {
             s.append(tr("Relation: "));
         }
     }
 
-    void addNameAndId(OsmPrimitive o) {
+    void addNameAndId(IPrimitive o) {
         String name = o.get("name");
         if (name == null) {
@@ -110 +115 @@
     }
 
-    void addState(OsmPrimitive o) {
+    void addState(IPrimitive o) {
         StringBuilder sb = new StringBuilder(INDENT);
         /* selected state is left out: not interesting as it is always selected */
@@ -141 +146 @@
     }
 
-    void addCommon(OsmPrimitive o) {
+    void addCommon(IPrimitive o) {
         add(tr("Data Set: "), Integer.toHexString(o.getDataSet().hashCode()));
         add(tr("Edited at: "), o.isTimestampEmpty() ? tr("<new object>")
@@ -151 +156 @@
     }
 
-    void addAttributes(OsmPrimitive o) {
+    void addAttributes(IPrimitive o) {
         if (o.hasKeys()) {
             add(tr("Tags: "));
@@ -161 +166 @@
     }
 
-    void addSpecial(OsmPrimitive o) {
-        if (o instanceof Node) {
-            addCoordinates((Node) o);
-        } else if (o instanceof Way) {
+    void addSpecial(IPrimitive o) {
+        if (o instanceof INode) {
+            addCoordinates((INode) o);
+        } else if (o instanceof IWay) {
             addBbox(o);
             add(tr("Centroid: "),
                     toStringCSV(", ", Main.getProjection().eastNorth2latlon(
                             Geometry.getCentroid(((Way) o).getNodes()))));
-            addWayNodes((Way) o);
-        } else if (o instanceof Relation) {
+            addWayNodes((IWay<?>) o);
+        } else if (o instanceof IRelation) {
             addBbox(o);
-            addRelationMembers((Relation) o);
-        }
-    }
-
-    void addRelationMembers(Relation r) {
+            addRelationMembers((IRelation<?>) o);
+        }
+    }
+
+    void addRelationMembers(IRelation<?> r) {
         add(trn("{0} Member: ", "{0} Members: ", r.getMembersCount(), r.getMembersCount()));
-        for (RelationMember m : r.getMembers()) {
+        for (IRelationMember<?> m : r.getMembers()) {
             s.append(INDENT).append(INDENT);
             addHeadline(m.getMember());
@@ -186 +191 @@
     }
 
-    void addWayNodes(Way w) {
+    void addWayNodes(IWay<?> w) {
         add(tr("{0} Nodes: ", w.getNodesCount()));
-        for (Node n : w.getNodes()) {
+        for (INode n : w.getNodes()) {
             s.append(INDENT).append(INDENT);
             addNameAndId(n);
@@ -195 +200 @@
     }
 
-    void addBbox(OsmPrimitive o) {
+    void addBbox(IPrimitive o) {
         BBox bbox = o.getBBox();
         if (bbox != null) {
@@ -210 +215 @@
     }
 
-    void addCoordinates(Node n) {
+    void addCoordinates(INode n) {
         if (n.isLatLonKnown()) {
             add(tr("Coordinates:"), " ",
@@ -225 +230 @@
     }
 
-    void addReferrers(StringBuilder s, OsmPrimitive o) {
-        List<OsmPrimitive> refs = o.getReferrers();
+    void addReferrers(StringBuilder s, IPrimitive o) {
+        List<? extends IPrimitive> refs = o.getReferrers();
         if (!refs.isEmpty()) {
             add(tr("Part of: "));
-            for (OsmPrimitive p : refs) {
+            for (IPrimitive p : refs) {
                 s.append(INDENT).append(INDENT);
                 addHeadline(p);
@@ -238 +243 @@
 
     void addConflicts(OsmPrimitive o) {
-        Conflict<?> c = ds.getConflicts().getConflictForMy(o);
+        Conflict<?> c = ((DataSet) ds).getConflicts().getConflictForMy(o);
         if (c != null) {
             add(tr("In conflict with: "));