Changeset 6857 in josm for trunk

Timestamp:

2014-02-17T01:13:18+01:00 (11 years ago)

Author:

Don-vip

Message:

do not attempt to load Quaqua L&F on other platforms than Mac OSX

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -16 +16 @@
 import javax.swing.JScrollPane;
 import javax.swing.ListCellRenderer;
+import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
@@ -29 +30 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.PlatformHookOsx;
 
 /**
@@ -61 +63 @@
 
         // let's try to load additional LookAndFeels and put them into the list
-        try {
-            Class<?> Cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel");
-            Object Oquaqua = Cquaqua.getConstructor((Class[])null).newInstance((Object[])null);
-            // no exception? Then Go!
-            lafCombo.addItem(
-                    new UIManager.LookAndFeelInfo(((javax.swing.LookAndFeel)Oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel")
-            );
-        } catch (Exception ex) {
-            // just debug, Quaqua may not even be installed...
-            Main.debug(ex.getMessage());
+        if (Main.platform instanceof PlatformHookOsx) {
+            try {
+                Class<?> Cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel");
+                Object Oquaqua = Cquaqua.getConstructor((Class[])null).newInstance((Object[])null);
+                // no exception? Then Go!
+                lafCombo.addItem(
+                        new UIManager.LookAndFeelInfo(((LookAndFeel)Oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel")
+                );
+            } catch (Exception ex) {
+                // just debug, Quaqua may not even be installed...
+                Main.debug(ex.getMessage());
+            }
         }