Changeset 1023 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2008-10-05T17:06:27+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1622. Keyboard shortcuts and specific OS handling

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• OpenBrowser.java (modified) (3 diffs)
• PlatformHook.java (added)
• PlatformHookOsx.java (added)
• PlatformHookUnixoid.java (added)
• PlatformHookWindows.java (added)
• ShortCut.java (added)
• ShortCutLabel.java (modified) (1 diff)

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

@@ -12 +12 @@
 /**
  * Helper to open platform web browser on different platforms
+ *
+ * This now delegates the real work to a platform specific class.
+ *
  * @author Imi
  */
@@ -30 +33 @@
                 }
 
-                String os = System.getProperty("os.name");
-                if (os == null)
-                        return "unknown operating system";
                 try {
-                        if (os != null && os.startsWith("Windows"))
-                                windows(url);
-                        else if (os.equals("Linux") || os.equals("Solaris") || os.equals("SunOS") || os.equals("AIX") || os.equals("FreeBSD"))
-                                linux(url);
-                        else if (os.equals("Mac OS") || os.equals("Mac OS X"))
-                                mac(url);
-                        else
-                                return "unknown operating system";
+                        Main.platform.openUrl(url);
                 } catch (IOException e) {
                         return e.getMessage();
@@ -48 +41 @@
         }
 
-        private static void windows(String url) throws IOException {
-                Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
-        }
-
-        private static void linux(String url) {
-                String[] programs = {"gnome-open", "kfmclient openURL", "firefox"};
-                for (String program : programs) {
-                        try {
-                                Runtime.getRuntime().exec(program+" "+url);
-                                return;
-                        } catch (IOException e) {
-            }
-                }
-        }
-
-        private static void mac(String url) throws IOException {
-                Runtime.getRuntime().exec("open " + url);
-        }
 }

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

@@ -6 +6 @@
 import java.awt.event.KeyEvent;
 
-
+@Deprecated
 public class ShortCutLabel {
+        @Deprecated
         public static String name(int shortCut, int modifiers) {
                 if (shortCut == 0 && modifiers == 0)