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

Timestamp:

2018-08-12T02:21:19+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.platform and related methods - new class PlatformManager

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• KeyboardUtils.java (modified) (2 diffs)
• OpenBrowser.java (modified) (2 diffs)
• PlatformManager.java (added)
• Shortcut.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import java.util.Locale;
 import java.util.Map;
-
-import org.openstreetmap.josm.Main;
 
 /**
@@ -293 +291 @@
             // UK Apple, https://en.wikipedia.org/wiki/QWERTY#UK_Apple_keyboard
             // International English Apple, https://en.wikipedia.org/wiki/QWERTY#Apple_International_English_Keyboard
-            if (Main.isPlatformOsx()) {
+            if (PlatformManager.isPlatformOsx()) {
                 result.add('§'); // https://en.wikipedia.org/wiki/Section_sign
             }

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

@@ -25 +25 @@
 
     private static void displayUrlFallback(URI uri) throws IOException {
-        if (Main.platform == null)
+        if (PlatformManager.getPlatform() == null)
             throw new IllegalStateException(tr("Failed to open URL. There is currently no platform set. Please set a platform first."));
-        Main.platform.openUrl(uri.toString());
+        PlatformManager.getPlatform().openUrl(uri.toString());
     }
 
@@ -45 +45 @@
         if (Desktop.isDesktopSupported()) {
             try {
-                if (Main.isPlatformWindows()) {
+                if (PlatformManager.isPlatformWindows()) {
                     // Desktop API works fine under Windows, so we don't try any fallback in case of I/O exceptions because it's not API's fault
                     Desktop.getDesktop().browse(uri);
-                } else if (Main.platform instanceof PlatformHookUnixoid || Main.platform instanceof PlatformHookOsx) {
+                } else if (PlatformManager.isPlatformUnixoid() || PlatformManager.isPlatformOsx()) {
                     // see #5629 #5108 #9568
-                    Main.platform.openUrl(uri.toString());
+                    PlatformManager.getPlatform().openUrl(uri.toString());
                 } else {
                     // This is not the case with some Linux environments (see below),

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

@@ -371 +371 @@
         if (initdone) return;
         initdone = true;
-        int commandDownMask = Main.platform.getMenuShortcutKeyMaskEx();
+        int commandDownMask = PlatformManager.getPlatform().getMenuShortcutKeyMaskEx();
         groups.put(NONE, -1);
         groups.put(MNEMONIC, KeyEvent.ALT_DOWN_MASK);
@@ -384 +384 @@
 
         // (1) System reserved shortcuts
-        Main.platform.initSystemShortcuts();
+        PlatformManager.getPlatform().initSystemShortcuts();
         // (2) User defined shortcuts
         Main.pref.getAllPrefixCollectionKeys("shortcut.entry.").stream()
@@ -507 +507 @@
         } else if (existing.isPresent()) {
             final Shortcut conflict = existing.get();
-            if (Main.isPlatformOsx()) {
+            if (PlatformManager.isPlatformOsx()) {
                 // Try to reassign Meta to Ctrl
                 int newmodifier = findNewOsxModifier(requestedGroup);