Changeset 12776 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

Timestamp:

2017-09-07T23:41:42+02:00 (9 years ago)

Author:

bastiK

Message:

see #15229 - remove dependency of NTV2GridShiftFileWrapper on Main.platform

• PlatformHook bundles all application-wide platform dependent code, which is

convenient, but problematic for separating modules

• introduces lightweight tools.Platform for adding platform dependent code more locally

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (3 diffs)

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

@@ -20 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -29 +30 @@
  */
 public interface PlatformHook {
+
+    /**
+     * Visitor to construct a PlatformHook from a given {@link Platform} object.
+     */
+    public static final PlatformVisitor<PlatformHook> CONSTRUCT_FROM_PLATFORM = new PlatformVisitor<PlatformHook>() {
+        @Override
+        public PlatformHook visitUnixoid() {
+            return new PlatformHookUnixoid();
+        }
+
+        @Override
+        public PlatformHook visitWindows() {
+            return new PlatformHookWindows();
+        }
+
+        @Override
+        public PlatformHook visitOsx() {
+            return new PlatformHookUnixoid();
+        }
+    };
+
+    /**
+     * Get the platform corresponding to this platform hook.
+     * @return the platform corresponding to this platform hook
+     */
+    Platform getPlatform();
 
     /**
@@ -231 +258 @@
      * @since 11642
      */
-    List<File> getDefaultProj4NadshiftDirectories();
+    default List<File> getDefaultProj4NadshiftDirectories() {
+        return getPlatform().accept(NTV2GridShiftFileWrapper.DEFAULT_PROJ4_NTV2_SHIFT_DIRS);
+    }
 
     /**