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

Timestamp:

2018-06-18T19:56:34+02:00 (6 years ago)

Author:

Don-vip

Message:

use IPrimitive in *InfoWebActions

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (3 diffs)
• HistoryInfoWebAction.java (modified) (2 diffs)
• InfoWebAction.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.notes.Note;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -101 +100 @@
 
     protected void launchInfoBrowsersForSelectedPrimitivesAndNote() {
-        List<OsmPrimitive> primitivesToShow = new ArrayList<>();
-        DataSet ds = getLayerManager().getActiveDataSet();
+        List<IPrimitive> primitivesToShow = new ArrayList<>();
+        OsmData<?, ?, ?, ?> ds = getLayerManager().getActiveData();
         if (ds != null) {
             primitivesToShow.addAll(ds.getAllSelected());
@@ -111 +110 @@
         // filter out new primitives which are not yet uploaded to the server
         //
-        primitivesToShow.removeIf(AbstractPrimitive::isNew);
+        primitivesToShow.removeIf(IPrimitive::isNew);
 
         if (primitivesToShow.isEmpty() && noteToShow == null) {

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -32 +32 @@
     @Override
     protected String createInfoUrl(Object infoObject) {
-        if (infoObject instanceof OsmPrimitive) {
-            OsmPrimitive primitive = (OsmPrimitive) infoObject;
-            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getId() + "/history";
+        if (infoObject instanceof IPrimitive) {
+            IPrimitive primitive = (IPrimitive) infoObject;
+            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId() + "/history";
         } else {
             return null;

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -35 +36 @@
     @Override
     protected String createInfoUrl(Object infoObject) {
-        if (infoObject instanceof OsmPrimitive) {
-            OsmPrimitive primitive = (OsmPrimitive) infoObject;
-            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getId();
+        if (infoObject instanceof IPrimitive) {
+            IPrimitive primitive = (IPrimitive) infoObject;
+            return Main.getBaseBrowseUrl() + '/' + OsmPrimitiveType.from(primitive).getAPIName() + '/' + primitive.getOsmId();
         } else if (infoObject instanceof Note) {
             Note note = (Note) infoObject;