Changeset 10364 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

2016-06-12T20:46:23+02:00 (9 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage

Location:

trunk/test/unit/org/openstreetmap/josm/io

Files:

• NoteImporterTest.java (modified) (1 diff)
• remotecontrol/handler/ImportHandlerTest.java (modified) (1 diff)
• session/SessionReaderTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java

@@ -23 +23 @@
     public void testTicket12531() {
         if (Main.map != null) {
-            for (Layer l: Main.map.mapView.getAllLayers()) {
+            for (Layer l: Main.getLayerManager().getLayers()) {
                 Main.map.mapView.removeLayer(l);
             }

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

@@ -95 +95 @@
             newHandler("https://localhost?url=" + Utils.encodeUrl(url)).handle();
         } finally {
-            for (OsmDataLayer layer : Main.map.mapView.getLayersOfType(OsmDataLayer.class)) {
+            for (OsmDataLayer layer : Main.getLayerManager().getLayersOfType(OsmDataLayer.class)) {
                 Main.main.removeLayer(layer);
             }

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -139 +139 @@
     public void testReadNotes() throws IOException, IllegalDataException {
         if (Main.isDisplayingMapView()) {
-            for (NoteLayer nl : Main.map.mapView.getLayersOfType(NoteLayer.class)) {
+            for (NoteLayer nl : Main.getLayerManager().getLayersOfType(NoteLayer.class)) {
                 Main.map.mapView.removeLayer(nl);
             }