Changeset 10340 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2016-06-08T09:33:20+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #12927 - Move title management and main frame layout to new class (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (11 diffs)

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

@@ -9 +9 @@
 import java.awt.GridBagLayout;
 import java.awt.Window;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -47 +45 @@
 import javax.swing.InputMap;
 import javax.swing.JComponent;
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -121 +118 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -563 +559 @@
 
     /**
-     * Constructs new {@code Main} object. A lot of global variables are initialized here.
+     * Constructs new {@code Main} object.
+     * @see #initialize()
      */
     public Main() {
         main = this;
+    }
+
+    /**
+     * Initializes the main object. A lot of global variables are initialized here.
+     * @since 10340
+     */
+    public void initialize() {
         isOpenjdk = System.getProperty("java.vm.name").toUpperCase(Locale.ENGLISH).indexOf("OPENJDK") != -1;
         fileWatcher.start();
@@ -581 +585 @@
             @Override
             public void initialize() {
-                contentPanePrivate.add(panel, BorderLayout.CENTER);
-                panel.add(gettingStarted, BorderLayout.CENTER);
-                menu = new MainMenu();
+                initializeMainWindow();
             }
         }.call();
@@ -715 +717 @@
     }
 
+    /**
+     * Called once at startup to initialize the main window content.
+     * Should set {@link #menu}
+     */
+    protected void initializeMainWindow() {
+        // can be implementd by subclasses
+    }
+
     private abstract static class InitializationTask implements Callable<Void> {
 
@@ -936 +946 @@
      */
     public static final JPanel panel = new JPanel(new BorderLayout());
-
-    protected static volatile WindowGeometry geometry;
-    protected static int windowState = JFrame.NORMAL;
 
     private final CommandQueueListener redoUndoListener = new CommandQueueListener() {
@@ -1016 +1023 @@
         }
 
-        geometry = WindowGeometry.mainWindow("gui.geometry",
-            args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null,
-            !args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
     }
 
@@ -1107 +1111 @@
     public static boolean exitJosm(boolean exit, int exitCode) {
         if (Main.saveUnsavedModifications()) {
-            worker.shutdown();
-            ImageProvider.shutdown(false);
-            JCSCacheManager.shutdown();
-            if (geometry != null) {
-                geometry.remember("gui.geometry");
-            }
-            if (map != null) {
-                map.rememberToggleDialogWidth();
-            }
-            pref.put("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);
-            // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
-            if (Main.isDisplayingMapView()) {
-                Collection<Layer> layers = new ArrayList<>(getLayerManager().getLayers());
-                for (Layer l: layers) {
-                    Main.main.removeLayer(l);
-                }
-            }
-            try {
-                pref.saveDefaults();
-            } catch (IOException ex) {
-                Main.warn(tr("Failed to save default preferences."));
-            }
-            worker.shutdownNow();
-            ImageProvider.shutdown(true);
+            Main.main.shutdown();
 
             if (exit) {
@@ -1138 +1119 @@
         }
         return false;
+    }
+
+    protected void shutdown() {
+        worker.shutdown();
+        ImageProvider.shutdown(false);
+        JCSCacheManager.shutdown();
+        if (map != null) {
+            map.rememberToggleDialogWidth();
+        }
+        // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
+        if (Main.isDisplayingMapView()) {
+            Collection<Layer> layers = new ArrayList<>(getLayerManager().getLayers());
+            for (Layer l: layers) {
+                Main.main.removeLayer(l);
+            }
+        }
+        try {
+            pref.saveDefaults();
+        } catch (IOException ex) {
+            Main.warn(tr("Failed to save default preferences."));
+        }
+        worker.shutdownNow();
+        ImageProvider.shutdown(true);
     }
 
@@ -1287 +1291 @@
             platform = new PlatformHookUnixoid();
         }
-    }
-
-    private static class WindowPositionSizeListener extends WindowAdapter implements ComponentListener {
-        @Override
-        public void windowStateChanged(WindowEvent e) {
-            Main.windowState = e.getNewState();
-        }
-
-        @Override
-        public void componentHidden(ComponentEvent e) {
-            // Do nothing
-        }
-
-        @Override
-        public void componentMoved(ComponentEvent e) {
-            handleComponentEvent(e);
-        }
-
-        @Override
-        public void componentResized(ComponentEvent e) {
-            handleComponentEvent(e);
-        }
-
-        @Override
-        public void componentShown(ComponentEvent e) {
-            // Do nothing
-        }
-
-        private static void handleComponentEvent(ComponentEvent e) {
-            Component c = e.getComponent();
-            if (c instanceof JFrame && c.isVisible()) {
-                if (Main.windowState == JFrame.NORMAL) {
-                    Main.geometry = new WindowGeometry((JFrame) c);
-                } else {
-                    Main.geometry.fixScreen((JFrame) c);
-                }
-            }
-        }
-    }
-
-    protected static void addListener() {
-        parent.addComponentListener(new WindowPositionSizeListener());
-        ((JFrame) parent).addWindowStateListener(new WindowPositionSizeListener());
     }