Changeset 7634 in josm for trunk

Timestamp:

2014-10-19T18:49:43+02:00 (10 years ago)

Author:

Don-vip

Message:

allow plugins to install custom look-and-feels

File:

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

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

@@ -45 +45 @@
 import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -95 +96 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.I18n;
@@ -826 +828 @@
             }
             catch (final NoClassDefFoundError | ClassNotFoundException e) {
-                info("Look and Feel not found: " + laf);
-                Main.pref.put("laf", defaultlaf);
+                // Try to find look and feel in plugin classloaders
+                Class<?> klass = null;
+                for (ClassLoader cl : PluginHandler.getResourceClassLoaders()) {
+                    try {
+                        klass = cl.loadClass(laf);
+                        break;
+                    } catch (ClassNotFoundException ex) {
+                        // Do nothing
+                    }
+                }
+                if (klass != null && LookAndFeel.class.isAssignableFrom(klass)) {
+                    try {
+                        UIManager.setLookAndFeel((LookAndFeel) klass.newInstance());
+                    } catch (Exception ex) {
+                        warn("Cannot set Look and Feel: " + laf + ": "+ex.getMessage());
+                    }
+                } else {
+                    info("Look and Feel not found: " + laf);
+                    Main.pref.put("laf", defaultlaf);
+                }
             }
             catch (final UnsupportedLookAndFeelException e) {