Changeset 2371 in josm for trunk/src

Timestamp:

2009-11-01T11:35:55+01:00 (15 years ago)

Author:

stoecker

Message:

moved system deps into platform hooks

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (1 diff)

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

@@ -308 +308 @@
         try {
             try {
-                String laf = Main.pref.get("laf");
+                String laf = Main.pref.get("laf", platform.getDefaultStyle());
                 if(laf != null && laf.length() > 0) {
                     UIManager.setLookAndFeel(laf);

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -468 +468 @@
     public final void resetToDefault(){
         properties.clear();
-        if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
-            put("laf", "javax.swing.plaf.metal.MetalLookAndFeel");
-        } else {
-            put("laf", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-        }
     }
 

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -100 +100 @@
       */
     public String makeTooltip(String name, Shortcut sc);
+
+    public String getDefaultStyle();
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -263 +263 @@
         return result;
     }
+
+    @Override
+    public String getDefaultStyle()
+    {
+        return "javax.swing.plaf.metal.MetalLookAndFeel";
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -74 +74 @@
         return result;
     }
+
+    @Override
+    public String getDefaultStyle()
+    {
+        return "javax.swing.plaf.metal.MetalLookAndFeel";
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -53 +53 @@
         Shortcut.registerSystemShortcut("system:help", "unused", KeyEvent.VK_F1, 0);
     }
+
+    @Override
+    public String getDefaultStyle()
+    {
+        return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+    }
 }
-
-
-
-