Changeset 13949 in josm

Timestamp:

2018-06-18T01:35:43+02:00 (6 years ago)

Author:

Don-vip

Message:

use IPrimitive in InspectPrimitiveDialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified) (4 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmData;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveComparator;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -115 +114 @@
 
     protected static String buildMapPaintText() {
-        final Collection<OsmPrimitive> sel = MainApplication.getLayerManager().getActiveDataSet().getAllSelected();
+        final Collection<? extends IPrimitive> sel = MainApplication.getLayerManager().getActiveData().getAllSelected();
         ElemStyles elemstyles = MapPaintStyles.getStyles();
         NavigatableComponent nc = MainApplication.getMap().mapView;
@@ -123 +122 @@
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
-            for (OsmPrimitive osm : sel) {
+            for (IPrimitive osm : sel) {
                 txtMappaint.append(tr("Styles Cache for \"{0}\":", osm.getDisplayName(DefaultNameFormatter.getInstance())));
 
@@ -151 +150 @@
         }
         if (sel.size() == 2) {
-            List<OsmPrimitive> selList = new ArrayList<>(sel);
+            List<IPrimitive> selList = new ArrayList<>(sel);
             StyleCache sc1 = selList.get(0).getCachedStyle();
             StyleCache sc2 = selList.get(1).getCachedStyle();