diff --git a/src/org/openstreetmap/josm/command/SelectCommand.java b/src/org/openstreetmap/josm/command/SelectCommand.java index df372ad..d893d18 100644 --- a/src/org/openstreetmap/josm/command/SelectCommand.java +++ b/src/org/openstreetmap/josm/command/SelectCommand.java @@ -37,13 +37,13 @@ public class SelectCommand extends Command { @Override public void undoCommand() { - Main.map.mapView.getEditLayer().data.setSelected(oldSelection); + Main.getLayerManager().getEditLayer().data.setSelected(oldSelection); } @Override public boolean executeCommand() { - oldSelection = Main.map.mapView.getEditLayer().data.getSelected(); - Main.map.mapView.getEditLayer().data.setSelected(newSelection); + oldSelection = Main.getLayerManager().getEditLayer().data.getSelected(); + Main.getLayerManager().getEditLayer().data.setSelected(newSelection); return true; } diff --git a/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java b/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java index d3da64b..8f7e927 100644 --- a/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java +++ b/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java @@ -61,7 +61,7 @@ public class ConflictAddCommand extends Command { @Override public void undoCommand() { - if (Main.isDisplayingMapView() && !Main.map.mapView.hasLayer(getLayer())) { + if (Main.isDisplayingMapView() && !Main.getLayerManager().containsLayer(getLayer())) { Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.", getLayer().getName(), conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) diff --git a/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java b/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java index 98c40de..5f21a57 100644 --- a/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java +++ b/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java @@ -70,7 +70,7 @@ public abstract class ConflictResolveCommand extends Command { super.undoCommand(); if (Main.isDisplayingMapView()) { - if (!Main.map.mapView.hasLayer(getLayer())) { + if (!Main.getLayerManager().containsLayer(getLayer())) { Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), getLayer().toString() @@ -78,7 +78,7 @@ public abstract class ConflictResolveCommand extends Command { return; } - Main.map.mapView.setActiveLayer(getLayer()); + Main.getLayerManager().setActiveLayer(getLayer()); } reconstituteConflicts(); } diff --git a/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java b/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java index 5905af2..820f9cf 100644 --- a/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java +++ b/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java @@ -74,7 +74,7 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman @Override public void undoCommand() { OsmDataLayer layer = getLayer(); - if (!Main.map.mapView.hasLayer(layer)) { + if (!Main.getLayerManager().containsLayer(layer)) { Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), layer.toString() @@ -82,7 +82,7 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman return; } - Main.map.mapView.setActiveLayer(layer); + Main.getLayerManager().setActiveLayer(layer); OsmDataLayer editLayer = Main.main.getEditLayer(); // restore the former state diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java index d872628..1f84387 100644 --- a/src/org/openstreetmap/josm/data/AutosaveTask.java +++ b/src/org/openstreetmap/josm/data/AutosaveTask.java @@ -126,7 +126,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List timer.schedule(this, 1000L, PROP_INTERVAL.get() * 1000L); MapView.addLayerChangeListener(this); if (Main.isDisplayingMapView()) { - for (OsmDataLayer l: Main.map.mapView.getLayersOfType(OsmDataLayer.class)) { + for (OsmDataLayer l: Main.getLayerManager().getLayersOfType(OsmDataLayer.class)) { registerNewlayer(l); } } diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java index a6359bc..2797a60 100644 --- a/src/org/openstreetmap/josm/gui/ImageryMenu.java +++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java @@ -69,7 +69,7 @@ public class ImageryMenu extends JMenu implements LayerChangeListener { @Override public void actionPerformed(ActionEvent e) { - Collection layers = Main.map.mapView.getLayersOfType(ImageryLayer.class); + Collection layers = Main.getLayerManager().getLayersOfType(ImageryLayer.class); if (layers.isEmpty()) { setEnabled(false); return; diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java index c1abe48..5f4df08 100644 --- a/src/org/openstreetmap/josm/gui/MapView.java +++ b/src/org/openstreetmap/josm/gui/MapView.java @@ -416,7 +416,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener { @Deprecated public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) { if (listener != null) { - boolean doFire = initialFire && Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null; + boolean doFire = initialFire && Main.isDisplayingMapView() && Main.getLayerManager().getEditLayer() != null; if (doFire) { Main.getLayerManager().addAndFireActiveLayerChangeListener(new EditLayerChangeAdapter(listener)); } else { diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java index 468b2ee..3a43f9d 100644 --- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java +++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java @@ -890,7 +890,7 @@ public abstract class ListMerger extends JPanel implement protected final

OsmDataLayer findLayerFor(P primitive) { if (primitive != null) { - Iterable layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class); + Iterable layers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class); // Find layer with same dataset for (OsmDataLayer layer : layers) { if (layer.data == primitive.getDataSet()) { diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java index 2d54c21..ca3c889 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java +++ b/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java @@ -56,7 +56,7 @@ public final class DuplicateAction extends AbstractAction implements IEnabledSta return; List layerNames = new ArrayList<>(); - for (Layer l: Main.map.mapView.getAllLayers()) { + for (Layer l: Main.getLayerManager().getLayers()) { layerNames.add(l.getName()); } if (layer instanceof OsmDataLayer) { diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java index 983093d..da9a97e 100644 --- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java @@ -299,7 +299,7 @@ public class GpxLayer extends Layer { if (!visibleSegments.isEmpty()) { drawHelper.readPreferences(getName()); drawHelper.drawAll(g, mv, visibleSegments); - if (Main.map.mapView.getActiveLayer() == this) { + if (Main.getLayerManager().getActiveLayer() == this) { drawHelper.drawColorBar(g, mv); } } diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java index 45f505c..66154ef 100644 --- a/src/org/openstreetmap/josm/gui/layer/Layer.java +++ b/src/org/openstreetmap/josm/gui/layer/Layer.java @@ -170,7 +170,7 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya // calculate total memory needed for all layers long memoryBytesRequired = 50L * 1024L * 1024L; // assumed minimum JOSM memory footprint if (Main.map != null && Main.map.mapView != null) { - for (Layer layer: Main.map.mapView.getAllLayers()) { + for (Layer layer: Main.getLayerManager().getLayers()) { memoryBytesRequired += layer.estimateMemoryUsage(); } if (memoryBytesRequired > Runtime.getRuntime().maxMemory()) { diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java index 8169ef0..53248ff 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java @@ -180,7 +180,7 @@ public class CorrelateGpxWithImages extends AbstractAction { // Search whether an other layer has yet defined some bounding box. // If none, we'll zoom to the bounding box of the layer with the photos. boolean boundingBoxedLayerFound = false; - for (Layer l: Main.map.mapView.getAllLayers()) { + for (Layer l: Main.getLayerManager().getLayers()) { if (l != yLayer) { BoundingXYVisitor bbox = new BoundingXYVisitor(); l.visitBoundingBox(bbox); @@ -556,7 +556,7 @@ public class CorrelateGpxWithImages extends AbstractAction { @Override public void actionPerformed(ActionEvent arg0) { // Construct the list of loaded GPX tracks - Collection layerLst = Main.map.mapView.getAllLayers(); + Collection layerLst = Main.getLayerManager().getLayers(); GpxDataWrapper defaultItem = null; for (Layer cur : layerLst) { if (cur instanceof GpxLayer) { diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java index 70ab30c..10a5f49 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java @@ -783,7 +783,7 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh */ private void clearOtherCurrentPhotos() { for (GeoImageLayer layer: - Main.map.mapView.getLayersOfType(GeoImageLayer.class)) { + Main.getLayerManager().getLayersOfType(GeoImageLayer.class)) { if (layer != this) { layer.clearCurrentPhoto(false); } diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java index f4c51c5..553ab70 100644 --- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java +++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java @@ -115,7 +115,7 @@ public class DownloadWmsAlongTrackAction extends AbstractAction { if (!Main.isDisplayingMapView()) { return null; } - List targetLayers = Main.map.mapView.getLayersOfType(AbstractTileSourceLayer.class); + List targetLayers = Main.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class); if (targetLayers.isEmpty()) { if (!GraphicsEnvironment.isHeadless()) { warnNoImageryLayers(); diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java index 7f7724a..dc61ea3 100644 --- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java @@ -448,12 +448,12 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer { if (!Main.isDisplayingMapView()) return; Marker m = null; - Layer l = Main.map.mapView.getActiveLayer(); + Layer l = Main.getLayerManager().getActiveLayer(); if (l != null) { m = getAdjacentMarker(startMarker, next, l); } if (m == null) { - for (Layer layer : Main.map.mapView.getAllLayers()) { + for (Layer layer : Main.getLayerManager().getLayers()) { m = getAdjacentMarker(startMarker, next, layer); if (m != null) { break; diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java index 6959fe3..a02d039 100644 --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java @@ -69,7 +69,7 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener { } private static boolean mapHasGpxorMarkerLayer() { - for (Layer layer : Main.map.mapView.getAllLayers()) { + for (Layer layer : Main.getLayerManager().getLayers()) { if (layer instanceof GpxLayer || layer instanceof MarkerLayer) { return true; } diff --git a/src/org/openstreetmap/josm/io/NoteImporter.java b/src/org/openstreetmap/josm/io/NoteImporter.java index 8ac259e..da40198 100644 --- a/src/org/openstreetmap/josm/io/NoteImporter.java +++ b/src/org/openstreetmap/josm/io/NoteImporter.java @@ -37,7 +37,7 @@ public class NoteImporter extends FileImporter { } try (InputStream is = Compression.getUncompressedFileInputStream(file)) { final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor); - if (Main.map == null || !Main.map.mapView.hasLayer(layer)) { + if (Main.map == null || !Main.getLayerManager().containsLayer(layer)) { GuiHelper.runInEDT(new Runnable() { @Override public void run() { @@ -68,7 +68,7 @@ public class NoteImporter extends FileImporter { final List fileNotes = new NoteReader(in).parse(); List noteLayers = null; if (Main.map != null) { - noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class); + noteLayers = Main.getLayerManager().getLayersOfType(NoteLayer.class); } final NoteLayer layer; if (noteLayers != null && !noteLayers.isEmpty()) { diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java index d661461..3408a8b 100644 --- a/src/org/openstreetmap/josm/io/OsmApi.java +++ b/src/org/openstreetmap/josm/io/OsmApi.java @@ -248,7 +248,7 @@ public class OsmApi extends OsmConnection { * to load the layers in the first place because they would have * been disabled! */ if (Main.isDisplayingMapView()) { - for (Layer l : Main.map.mapView.getLayersOfType(ImageryLayer.class)) { + for (Layer l : Main.getLayerManager().getLayersOfType(ImageryLayer.class)) { if (((ImageryLayer) l).getInfo().isBlacklisted()) { Main.info(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName())); Main.main.removeLayer(l); diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java index d601f15..f85c5dc 100644 --- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java +++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java @@ -94,7 +94,7 @@ public class ImageryHandler extends RequestHandler.RawURLParseRequestHandler { protected void handleRequest() throws RequestHandlerErrorException { final ImageryInfo imgInfo = buildImageryInfo(); if (Main.isDisplayingMapView()) { - for (ImageryLayer layer : Main.map.mapView.getLayersOfType(ImageryLayer.class)) { + for (ImageryLayer layer : Main.getLayerManager().getLayersOfType(ImageryLayer.class)) { if (layer.getInfo().equals(imgInfo)) { Main.info("Imagery layer already exists: "+imgInfo); return; diff --git a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java index fe34c07..838997d 100644 --- a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java +++ b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java @@ -43,7 +43,7 @@ public class MarkerSessionExporter extends AbstractSessionExporter @Override public Collection getDependencies() { Layer gpxLayer = layer.fromLayer; - if (gpxLayer != null && Main.map.mapView.hasLayer(gpxLayer)) + if (gpxLayer != null && Main.getLayerManager().containsLayer(gpxLayer)) return Collections.singleton(gpxLayer); return Collections.emptySet(); } diff --git a/test/unit/org/openstreetmap/josm/JOSMFixture.java b/test/unit/org/openstreetmap/josm/JOSMFixture.java index 12872f2..9666bd4 100644 --- a/test/unit/org/openstreetmap/josm/JOSMFixture.java +++ b/test/unit/org/openstreetmap/josm/JOSMFixture.java @@ -124,7 +124,7 @@ public class JOSMFixture { if (Main.map == null) { Main.main.createMapFrame(null, null); } else { - for (Layer l: Main.map.mapView.getAllLayers()) { + for (Layer l: Main.getLayerManager().getLayers()) { Main.map.mapView.removeLayer(l); } } diff --git a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java index da3a1f8..1650c29 100644 --- a/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java +++ b/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java @@ -46,15 +46,15 @@ public final class AddImageryLayerActionTest { */ @Test public void testActionPerformedEnabled() { - assertTrue(Main.map.mapView.getLayersOfType(TMSLayer.class).isEmpty()); + assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).actionPerformed(null); - List tmsLayers = Main.map.mapView.getLayersOfType(TMSLayer.class); + List tmsLayers = Main.getLayerManager().getLayersOfType(TMSLayer.class); assertEquals(1, tmsLayers.size()); try { new AddImageryLayerAction(new ImageryInfo("wms.openstreetmap.fr", "http://wms.openstreetmap.fr/wms?", "wms_endpoint", null, null)).actionPerformed(null); - List wmsLayers = Main.map.mapView.getLayersOfType(WMSLayer.class); + List wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class); assertEquals(1, wmsLayers.size()); Main.map.mapView.removeLayer(wmsLayers.get(0)); @@ -68,8 +68,8 @@ public final class AddImageryLayerActionTest { */ @Test public void testActionPerformedDisabled() { - assertTrue(Main.map.mapView.getLayersOfType(TMSLayer.class).isEmpty()); + assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null); - assertTrue(Main.map.mapView.getLayersOfType(TMSLayer.class).isEmpty()); + assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); } } diff --git a/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java b/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java index 9a8d73a..f51b203 100644 --- a/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java +++ b/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java @@ -50,7 +50,7 @@ public class ConflictAddCommandTest { */ @Test public void testExecuteUndoCommand() { - OsmDataLayer layer = Main.map.mapView.getEditLayer(); + OsmDataLayer layer = Main.getLayerManager().getEditLayer(); Conflict conflict = new Conflict<>(new Node(), new Node()); ConflictAddCommand cmd = new ConflictAddCommand(layer, conflict); assertTrue(cmd.executeCommand()); @@ -66,7 +66,7 @@ public class ConflictAddCommandTest { */ @Test public void testGetDescriptionIcon() { - OsmDataLayer layer = Main.map.mapView.getEditLayer(); + OsmDataLayer layer = Main.getLayerManager().getEditLayer(); Conflict conflict = new Conflict<>(new Node(), new Node()); assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon()); } diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java index dd20ea9..ba79468 100644 --- a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java +++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java @@ -48,7 +48,7 @@ public class GeoImageLayerTest { Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))), gpxLayer).run(); assertEquals(2, Main.map.mapView.getNumLayers()); - GeoImageLayer layer = Main.map.mapView.getLayersOfType(GeoImageLayer.class).iterator().next(); + GeoImageLayer layer = Main.getLayerManager().getLayersOfType(GeoImageLayer.class).iterator().next(); try { assertEquals(gpxLayer, layer.getGpxLayer()); List images = layer.getImages(); diff --git a/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java b/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java index 012f095..ca34b92 100644 --- a/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java +++ b/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java @@ -22,7 +22,7 @@ public class NoteImporterTest { @Test 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); } Main.main.setMapFrame(null); diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java index 0345ca0..912347f 100644 --- a/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java +++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java @@ -94,7 +94,7 @@ public class ImportHandlerTest { try { 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); } } diff --git a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java index ff23165..d5924eb 100644 --- a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java +++ b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java @@ -138,7 +138,7 @@ public class SessionReaderTest { @Test 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); } }