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

Timestamp:

2016-06-08T09:33:20+02:00 (8 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/gui/MainApplication.java (modified) (9 diffs)

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

@@ -6 +6 @@
 
 import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
@@ -33 +29 @@
 import java.util.Collection;
 import java.util.EnumMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -41 +36 @@
 import java.util.concurrent.Callable;
 
-import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.RepaintManager;
@@ -70 +64 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.WindowGeometry;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
@@ -86 +80 @@
 public class MainApplication extends Main {
 
+    private MainFrame mainFrame;
+
     /**
-     * Constructs a new {@code MainApplication}.
+     * Constructs a new {@code MainApplication} without a window.
      */
     public MainApplication() {
-       // Allow subclassing (see JOSM.java)
+        // Allow subclassing (see JOSM.java)
+        this(null);
     }
 
@@ -96 +93 @@
      * Constructs a main frame, ready sized and operating. Does not display the frame.
      * @param mainFrame The main JFrame of the application
+     * @since 10340
      */
-    public MainApplication(JFrame mainFrame) {
-        addListener();
-        mainFrame.setContentPane(contentPanePrivate);
-        mainFrame.setJMenuBar(menu);
-        geometry.applySafe(mainFrame);
-        List<Image> l = new LinkedList<>();
-        l.add(ImageProvider.get("logo_16x16x32").getImage());
-        l.add(ImageProvider.get("logo_16x16x8").getImage());
-        l.add(ImageProvider.get("logo_32x32x32").getImage());
-        l.add(ImageProvider.get("logo_32x32x8").getImage());
-        l.add(ImageProvider.get("logo_48x48x32").getImage());
-        l.add(ImageProvider.get("logo_48x48x8").getImage());
-        l.add(ImageProvider.get("logo").getImage());
-        mainFrame.setIconImages(l);
-        mainFrame.addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(final WindowEvent arg0) {
-                Main.exitJosm(true, 0);
-            }
-        });
-        mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+    public MainApplication(MainFrame mainFrame) {
+        this.mainFrame = mainFrame;
+    }
+
+    @Override
+    protected void initializeMainWindow() {
+        if (mainFrame != null) {
+            mainFrame.initialize();
+
+            menu = mainFrame.getMenu();
+        } else {
+            // required for running some tests.
+            menu = new MainMenu();
+        }
+    }
+
+    @Override
+    protected void shutdown() {
+        mainFrame.storeState();
+        super.shutdown();
     }
 
@@ -397 +394 @@
         I18n.setupLanguageFonts();
 
-        final JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
+        WindowGeometry 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));
+        final MainFrame mainFrame = new MainFrame(contentPanePrivate, geometry);
         Main.parent = mainFrame;
 
@@ -464 +464 @@
         monitor.indeterminateSubTask(tr("Creating main GUI"));
         final Main main = new MainApplication(mainFrame);
+        main.initialize();
 
         if (!skipLoadingPlugins) {
@@ -483 +484 @@
         boolean maximized = Main.pref.getBoolean("gui.maximized", false);
         if ((!args.containsKey(Option.NO_MAXIMIZE) && maximized) || args.containsKey(Option.MAXIMIZE)) {
-            if (Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
-                Main.windowState = JFrame.MAXIMIZED_BOTH;
-                mainFrame.setExtendedState(Main.windowState);
-            } else {
-                Main.debug("Main window: maximizing not supported");
-            }
+            mainFrame.setMaximized(true);
         }
         if (main.menu.fullscreenToggleAction != null) {