Changeset 5897 in josm for trunk/src/org

Timestamp:

2013-04-21T15:11:28+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8582 - Use Main.removeLayer() everywhere

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/MergeLayerAction.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (1 diff)
• gui/MapFrame.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (4 diffs)
• gui/layer/ValidatorLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -753 +753 @@
                 Collection<Layer> layers = new ArrayList<Layer>(Main.map.mapView.getAllLayers());
                 for (Layer l: layers) {
-                    Main.map.mapView.removeLayer(l);
+                    Main.main.removeLayer(l);
                 }
             }

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -47 +47 @@
                         }
                         targetLayer.mergeFrom(sourceLayer);
-                        Main.map.mapView.removeLayer(sourceLayer);
+                        Main.main.removeLayer(sourceLayer);
                         layerMerged = true;
                     }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -309 +309 @@
         if (Main.map.mapView.getLayersOfType(OsmDataLayer.class).isEmpty()) {
             if (errorLayer != null) {
-                Main.map.mapView.removeLayer(errorLayer);
+                Main.main.removeLayer(errorLayer);
             }
         }

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -91 +91 @@
      * The view control displayed.
      */
-    public MapView mapView;
+    public final MapView mapView;
     /**
      * The toolbar with the action icons. To add new toggle dialog actions, use addToggleDialog
@@ -155 +155 @@
         setSize(400,400);
         setLayout(new BorderLayout());
-
 
         mapView = new MapView(contentPane, viewportData);

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -63 +62 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -71 +71 @@
 import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /**
@@ -92 +91 @@
             throw new IllegalStateException("Dialog was already created");
         instance = new LayerListDialog(mapFrame);
-
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -157 +157 @@
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer instanceof OsmDataLayer &&  Main.map.mapView.getEditLayer() == null) {
-            Main.map.mapView.removeLayer(this);
+            Main.main.removeLayer(this);
         } else if (oldLayer == this) {
             MapView.removeLayerChangeListener(this);