Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/gui/MainFrame.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/MainFrame.java (modified) (5 diffs)

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

@@ -67 +67 @@
         super();
         this.geometry = geometry;
-        this.panel = new MainPanel(Main.getLayerManager());
+        this.panel = new MainPanel(MainApplication.getLayerManager());
         setContentPane(new JPanel(new BorderLayout()));
     }
@@ -94 +94 @@
 
         // This listener is never removed, since the main frame exists forever.
-        Main.getLayerManager().addActiveLayerChangeListener(e -> refreshTitle());
-        Main.getLayerManager().addAndFireLayerChangeListener(new ManageLayerListeners());
+        MainApplication.getLayerManager().addActiveLayerChangeListener(e -> refreshTitle());
+        MainApplication.getLayerManager().addAndFireLayerChangeListener(new ManageLayerListeners());
 
         refreshTitle();
@@ -156 +156 @@
      */
     public void refreshTitle() {
-        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         boolean dirty = editLayer != null && (editLayer.requiresSaveToFile()
                 || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
@@ -164 +164 @@
 
     private void onLayerChange(OsmDataLayer layer) {
-        if (layer == Main.getLayerManager().getEditLayer()) {
+        if (layer == MainApplication.getLayerManager().getEditLayer()) {
             refreshTitle();
         }
@@ -172 +172 @@
         @Override
         public void windowClosing(final WindowEvent evt) {
-            Main.exitJosm(true, 0, null);
+            MainApplication.exitJosm(true, 0, null);
         }
     }