Changeset 33847 in osm for applications/editors/josm

Timestamp:

2017-11-21T01:24:57+01:00 (7 years ago)

Author:

donvip

Message:

fix deprecation warnings

File:

• applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.java (modified) (5 diffs)

applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.java

@@ -16 +16 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -23 +22 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -137 +137 @@
         OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "layer2", null);
 
-        Main.getLayerManager().addLayer(layer1);
-        Main.getLayerManager().addLayer(layer2);
+        MainApplication.getLayerManager().addLayer(layer1);
+        MainApplication.getLayerManager().addLayer(layer2);
 
         JosmSelectionListModel model = new JosmSelectionListModel(layer1);
-        Main.getLayerManager().addActiveLayerChangeListener(model);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(model);
         // switch from edit layer1 to edit layer2. content of the JOSM selection
         // should be empty thereafter
-        Main.getLayerManager().setActiveLayer(layer1);
-        Main.getLayerManager().setActiveLayer(layer2);
+        MainApplication.getLayerManager().setActiveLayer(layer1);
+        MainApplication.getLayerManager().setActiveLayer(layer2);
         assertEquals(0, model.getSize());
 
@@ -151 +151 @@
         // be displayed in the JOSM selection list
         ds.setSelected(Collections.singleton(objects.get(0)));
-        Main.getLayerManager().setActiveLayer(layer1);
+        MainApplication.getLayerManager().setActiveLayer(layer1);
         assertEquals(1, model.getSize());
         assertEquals(objects.get(0), model.getElementAt(0));
@@ -157 +157 @@
         // switch to a "null" edit layer (i.e. no edit layer)- nothing should
         // be displayed in the selection list
-        Main.getLayerManager().removeLayer(layer2);
-        Main.getLayerManager().removeLayer(layer1);
+        MainApplication.getLayerManager().removeLayer(layer2);
+        MainApplication.getLayerManager().removeLayer(layer1);
         assertEquals(0, model.getSize());
 
-        Main.getLayerManager().removeActiveLayerChangeListener(model);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(model);
     }
 }