Changeset 14144 in josm

Timestamp:

2018-08-12T14:45:46+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - code refactoring - add PlatformHook.getPossiblePreferenceDirs()

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• tools/Geometry.java (modified) (2 diffs)
• tools/PlatformHook.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (2 diffs)

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

@@ -281 +281 @@
         addPossibleResourceDir(locations, getSystemEnv("JOSM_RESOURCES"));
         addPossibleResourceDir(locations, getSystemProperty("josm.resources"));
-        if (PlatformManager.isPlatformWindows()) {
-            String appdata = getSystemEnv("APPDATA");
-            if (appdata != null && getSystemEnv("ALLUSERSPROFILE") != null
-                    && appdata.lastIndexOf(File.separator) != -1) {
-                appdata = appdata.substring(appdata.lastIndexOf(File.separator));
-                locations.add(new File(new File(getSystemEnv("ALLUSERSPROFILE"),
-                        appdata), "JOSM").getPath());
-            }
-        } else {
-            locations.add("/usr/local/share/josm/");
-            locations.add("/usr/local/lib/josm/");
-            locations.add("/usr/share/josm/");
-            locations.add("/usr/lib/josm/");
-        }
+        locations.addAll(PlatformManager.getPlatform().getPossiblePreferenceDirs());
         return locations;
     }

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

@@ -18 +18 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -1046 +1045 @@
      *
      * @param nodes the list of nodes representing the polygon
-     * @param projection the projection to use for the calculation, {@code null} defaults to {@link Main#getProjection()}
+     * @param projection the projection to use for the calculation, {@code null} defaults to {@link ProjectionRegistry#getProjection()}
      * @return area and perimeter
      * @since 13638 (signature)

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

@@ -16 +16 @@
 import java.security.cert.X509Certificate;
 import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -369 +371 @@
         return file;
     }
+
+    /**
+     * Returns a set of possible platform specific directories where resources could be stored.
+     * @return A set of possible platform specific directories where resources could be stored.
+     * @since 14144
+     */
+    default Collection<String> getPossiblePreferenceDirs() {
+        return Collections.emptyList();
+    }
 }

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

@@ -24 +24 @@
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
@@ -419 +422 @@
         return null;
     }
+
+    @Override
+    public Collection<String> getPossiblePreferenceDirs() {
+        Set<String> locations = new HashSet<>();
+        locations.add("/usr/local/share/josm/");
+        locations.add("/usr/local/lib/josm/");
+        locations.add("/usr/share/josm/");
+        locations.add("/usr/lib/josm/");
+        return locations;
+    }
 }

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

@@ -65 +65 @@
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -781 +783 @@
         return file;
     }
+
+    @Override
+    public Collection<String> getPossiblePreferenceDirs() {
+        Set<String> locations = new HashSet<>();
+        String appdata = getSystemEnv("APPDATA");
+        if (appdata != null && getSystemEnv("ALLUSERSPROFILE") != null
+                && appdata.lastIndexOf(File.separator) != -1) {
+            appdata = appdata.substring(appdata.lastIndexOf(File.separator));
+            locations.add(new File(new File(getSystemEnv("ALLUSERSPROFILE"), appdata), "JOSM").getPath());
+        }
+        return locations;
+    }
 }