Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 13953)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 13954)
@@ -14,6 +14,5 @@
 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,6 +100,6 @@
 
     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,5 +110,5 @@
         // 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) {
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 13953)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 13954)
@@ -8,5 +8,5 @@
 
 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,7 +32,7 @@
     @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;
Index: trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 13953)
+++ trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 13954)
@@ -10,4 +10,5 @@
 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,7 +36,7 @@
     @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;