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

Timestamp:

2017-08-24T23:29:01+02:00 (7 years ago)

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (13 diffs)

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

@@ -46 +46 @@
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.LookAndFeel;
 import javax.swing.RepaintManager;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
@@ -74 +77 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
@@ -98 +103 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -127 +133 @@
      */
     static MapFrame map;
+
+    /**
+     * The toolbar preference control to register new actions.
+     */
+    static volatile ToolbarPreferences toolbar;
 
     private final MainFrame mainFrame;
@@ -237 +248 @@
         } else {
             // required for running some tests.
-            panel = new MainPanel(MainApplication.getLayerManager());
+            panel = new MainPanel(layerManager);
             menu = new MainMenu();
         }
@@ -256 +267 @@
         }
         // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
-        getLayerManager().resetState();
+        layerManager.resetState();
         super.shutdown();
         if (!GraphicsEnvironment.isHeadless()) {
@@ -289 +300 @@
             return ((DrawAction) map.mapMode).getInProgressSelection();
         } else {
-            DataSet ds = getLayerManager().getEditDataSet();
+            DataSet ds = layerManager.getEditDataSet();
             if (ds == null) return null;
             return ds.getSelected();
@@ -307 +318 @@
      * Returns the main layer manager that is used by the map view.
      * @return The layer manager. The value returned will never change.
-     * @since 12636 (as a replacement to {@code MainApplication.getLayerManager()})
+     * @since 12636 (as a replacement to {@code Main.getLayerManager()})
      */
     @SuppressWarnings("deprecation")
@@ -324 +335 @@
     public static MapFrame getMap() {
         return map;
+    }
+
+    /**
+     * Returns the toolbar preference control to register new actions.
+     * @return the toolbar preference control
+     * @since 12637 (as a replacement to {@code Main.toolbar})
+     */
+    public static ToolbarPreferences getToolbar() {
+        return toolbar;
     }
 
@@ -351 +371 @@
     public static boolean exitJosm(boolean exit, int exitCode, SaveLayersDialog.Reason reason) {
         final boolean proceed = Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
-                SaveLayersDialog.saveUnsavedModifications(MainApplication.getLayerManager().getLayers(),
+                SaveLayersDialog.saveUnsavedModifications(layerManager.getLayers(),
                         reason != null ? reason : SaveLayersDialog.Reason.EXIT)));
         if (proceed) {
@@ -430 +450 @@
      * @param argArray Command-line arguments
      */
+    @SuppressWarnings("deprecation")
     public static void main(final String[] argArray) {
         I18n.init();
@@ -576 +597 @@
 
         monitor.indeterminateSubTask(tr("Setting defaults"));
+        setupUIManager();
+        toolbar = new ToolbarPreferences();
+        Main.toolbar = toolbar;
         preConstructorInit();
 
@@ -627 +651 @@
             Logging.info("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console");
             RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+        }
+    }
+
+    static void setupUIManager() {
+        String defaultlaf = platform.getDefaultStyle();
+        String laf = LafPreference.LAF.get();
+        try {
+            UIManager.setLookAndFeel(laf);
+        } catch (final NoClassDefFoundError | ClassNotFoundException e) {
+            // Try to find look and feel in plugin classloaders
+            Logging.trace(e);
+            Class<?> klass = null;
+            for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) {
+                try {
+                    klass = cl.loadClass(laf);
+                    break;
+                } catch (ClassNotFoundException ex) {
+                    Logging.trace(ex);
+                }
+            }
+            if (klass != null && LookAndFeel.class.isAssignableFrom(klass)) {
+                try {
+                    UIManager.setLookAndFeel((LookAndFeel) klass.getConstructor().newInstance());
+                } catch (ReflectiveOperationException ex) {
+                    Logging.log(Logging.LEVEL_WARN, "Cannot set Look and Feel: " + laf + ": "+ex.getMessage(), ex);
+                } catch (UnsupportedLookAndFeelException ex) {
+                    Logging.info("Look and Feel not supported: " + laf);
+                    LafPreference.LAF.put(defaultlaf);
+                    Logging.trace(ex);
+                }
+            } else {
+                Logging.info("Look and Feel not found: " + laf);
+                LafPreference.LAF.put(defaultlaf);
+            }
+        } catch (UnsupportedLookAndFeelException e) {
+            Logging.info("Look and Feel not supported: " + laf);
+            LafPreference.LAF.put(defaultlaf);
+            Logging.trace(e);
+        } catch (InstantiationException | IllegalAccessException e) {
+            Logging.error(e);
+        }
+
+        UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
+        UIManager.put("OptionPane.yesIcon", UIManager.get("OptionPane.okIcon"));
+        UIManager.put("OptionPane.cancelIcon", ImageProvider.get("cancel"));
+        UIManager.put("OptionPane.noIcon", UIManager.get("OptionPane.cancelIcon"));
+        // Ensures caret color is the same than text foreground color, see #12257
+        // See http://docs.oracle.com/javase/8/docs/api/javax/swing/plaf/synth/doc-files/componentProperties.html
+        for (String p : Arrays.asList(
+                "EditorPane", "FormattedTextField", "PasswordField", "TextArea", "TextField", "TextPane")) {
+            UIManager.put(p+".caretForeground", UIManager.getColor(p+".foreground"));
         }
     }