Changeset 13926 in josm for trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.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/history/NodeListViewer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.actions.AutoScaleAction;
-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;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -247 +248 @@
             if (!isEnabled())
                 return;
-            OsmPrimitive p = getPrimitiveToZoom();
+            IPrimitive p = getPrimitiveToZoom();
             if (p != null) {
-                DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+                OsmData<?, ?, ?, ?> ds = MainApplication.getLayerManager().getActiveData();
                 if (ds != null) {
                     ds.setSelected(p.getPrimitiveId());
@@ -262 +263 @@
         }
 
-        protected OsmPrimitive getPrimitiveToZoom() {
+        protected IPrimitive getPrimitiveToZoom() {
             if (primitiveId == null)
                 return null;
-            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+            OsmData<?, ?, ?, ?> ds = MainApplication.getLayerManager().getActiveData();
             if (ds == null)
                 return null;
@@ -272 +273 @@
 
         public void updateEnabledState() {
-            setEnabled(MainApplication.getLayerManager().getActiveDataSet() != null && getPrimitiveToZoom() != null);
+            setEnabled(MainApplication.getLayerManager().getActiveData() != null && getPrimitiveToZoom() != null);
         }
     }