Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2017-08-24T22:53:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• FilterModel.java (modified) (4 diffs)
• event/DatasetEventManager.java (modified) (2 diffs)
• event/SelectionEventManager.java (modified) (3 diffs)
• history/HistoryDataSet.java (modified) (3 diffs)
• visitor/paint/relations/MultipolygonCache.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java

@@ -96 +96 @@
      */
     public void executeFilters() {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         changed = false;
         if (ds == null) {
@@ -145 +145 @@
      */
     public void executeFilters(Collection<? extends OsmPrimitive> primitives) {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         if (ds == null)
             return;
@@ -197 +197 @@
 
     private static void updateMap() {
-        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         if (editLayer != null) {
             editLayer.invalidate();
@@ -207 +207 @@
      */
     public void clearFilterFlags() {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         if (ds != null) {
             FilterWorker.clearFilterFlags(ds.allPrimitives());

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -12 +12 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
@@ -152 +152 @@
      */
     public DatasetEventManager() {
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -11 +11 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -105 +105 @@
      */
     protected SelectionEventManager() {
-        MainLayerManager layerManager = Main.getLayerManager();
+        MainLayerManager layerManager = MainApplication.getLayerManager();
         // We do not allow for destructing this object.
         // Currently, this is a singleton class, so this is not required.
@@ -212 +212 @@
         inEDTListeners.clear();
         immedatelyListeners.clear();
-        Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this);
     }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -12 +12 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -42 +41 @@
         if (historyDataSet == null) {
             historyDataSet = new HistoryDataSet();
-            Main.getLayerManager().addLayerChangeListener(historyDataSet);
+            MainApplication.getLayerManager().addLayerChangeListener(historyDataSet);
         }
         return historyDataSet;
@@ -228 +227 @@
     public void layerRemoving(LayerRemoveEvent e) {
         if (!MainApplication.isDisplayingMapView()) return;
-        if (Main.getLayerManager().getLayers().isEmpty()) {
+        if (MainApplication.getLayerManager().getLayers().isEmpty()) {
             data.clear();
             fireCacheCleared();

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -51 +52 @@
         Main.addProjectionChangeListener(this);
         DataSet.addSelectionListener(this);
-        Main.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
     }