Changeset 32454 in osm for applications/editors/josm/plugins/measurement/src/org

Timestamp:

2016-06-30T00:08:28+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement

Files:

• MeasurementDialog.java (modified) (3 diffs)
• MeasurementPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -241 +241 @@
         });
 
-        DataSet currentDs = Main.main.getCurrentDataSet();
+        DataSet currentDs = Main.getLayerManager().getEditDataSet();
 
         if (ds != currentDs) {
@@ -280 +280 @@
         // Refresh selection if a node belonging to a selected member has moved (example: scale action)
         if ((nodes != null && nodes.contains(n)) || waysContain(n)) {
-            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+            selectionChanged(Main.getLayerManager().getEditDataSet().getSelected());
         }
     }
@@ -295 +295 @@
     public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
         // Refresh selection to take into account new system of measurement
-        DataSet currentDs = Main.main.getCurrentDataSet();
+        DataSet currentDs = Main.getLayerManager().getEditDataSet();
         if (currentDs != null) {
             selectionChanged(currentDs.getSelected());

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java

@@ -7 +7 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -42 +46 @@
         if (currentLayer == null) {
             currentLayer = new MeasurementLayer(tr("Measurements"));
-            Main.main.addLayer(currentLayer);
-            MapView.addLayerChangeListener(new LayerChangeListener(){
-                public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
-                    if(newLayer instanceof MeasurementLayer)
+            Main.getLayerManager().addLayer(currentLayer);
+            final ActiveLayerChangeListener activeListener = new ActiveLayerChangeListener() {
+                @Override
+                public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+                    Layer newLayer = Main.getLayerManager().getActiveLayer();
+                    if (newLayer instanceof MeasurementLayer)
                         MeasurementPlugin.currentLayer = (MeasurementLayer)newLayer;
                 }
-                public void layerAdded(final Layer newLayer) {
+            };
+            Main.getLayerManager().addActiveLayerChangeListener(activeListener);
+            Main.getLayerManager().addLayerChangeListener(new LayerChangeListener(){
+                @Override
+                public void layerAdded(LayerAddEvent e) {
+                    // Do nothing
                 }
-                public void layerRemoved(final Layer oldLayer) {
-                    if (oldLayer != null && oldLayer == currentLayer)
-                        MapView.removeLayerChangeListener(this);
+
+                @Override
+                public void layerRemoving(LayerRemoveEvent e) {
+                    Layer oldLayer = e.getRemovedLayer();
+                    if (oldLayer != null && oldLayer == currentLayer) {
+                        Main.getLayerManager().removeActiveLayerChangeListener(activeListener);
+                        Main.getLayerManager().removeLayerChangeListener(this);
+                    }
+                }
+
+                @Override
+                public void layerOrderChanged(LayerOrderChangeEvent e) {
+                    // Do nothing
                 }
             });