Changeset 14138 in josm for trunk/src/org/openstreetmap/josm/Main.java

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

File:

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

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

@@ -41 +41 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Platform;
 import org.openstreetmap.josm.tools.PlatformHook;
-import org.openstreetmap.josm.tools.PlatformHookOsx;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -88 +86 @@
      * So if you need to hook into those early ones, split your class and send the one with the early hooks
      * to the JOSM team for inclusion.
-     */
-    public static volatile PlatformHook platform;
+     * @deprecated Use {@link PlatformManager#getPlatform}
+     */
+    @Deprecated
+    public static final PlatformHook platform = PlatformManager.getPlatform();
 
     /**
@@ -291 +291 @@
      * Identifies the current operating system family and initializes the platform hook accordingly.
      * @since 1849
-     */
+     * @deprecated Not needed anymore
+     */
+    @Deprecated
     public static void determinePlatformHook() {
-        platform = Platform.determinePlatform().accept(PlatformHook.CONSTRUCT_FROM_PLATFORM);
+        // Do nothing
     }
 
@@ -461 +463 @@
      * @return {@code true} if we are currently running on OSX
      * @since 6957
-     */
+     * @deprecated Use {@link PlatformManager#isPlatformOsx}
+     */
+    @Deprecated
     public static boolean isPlatformOsx() {
-        return Main.platform instanceof PlatformHookOsx;
+        return PlatformManager.isPlatformOsx();
     }
 
@@ -470 +474 @@
      * @return {@code true} if we are currently running on Windows
      * @since 7335
-     */
+     * @deprecated Use {@link PlatformManager#isPlatformWindows}
+     */
+    @Deprecated
     public static boolean isPlatformWindows() {
-        return Main.platform instanceof PlatformHookWindows;
+        return PlatformManager.isPlatformWindows();
     }