Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

Timestamp:

2018-04-19T20:37:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - Allow to start and close JOSM in WebStart sandbox mode (where every external access is denied). This was very useful to reproduce some very tricky bugs that occured in real life but were almost impossible to diagnose.

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (8 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.Utils.getSystemEnv;
+import static org.openstreetmap.josm.tools.Utils.getSystemProperty;
 
 import java.awt.Desktop;
@@ -45 +47 @@
     public void preStartupHook() {
         // See #12022 - Disable GNOME ATK Java wrapper as it causes a lot of serious trouble
-        if ("org.GNOME.Accessibility.AtkWrapper".equals(System.getProperty("assistive_technologies"))) {
+        if ("org.GNOME.Accessibility.AtkWrapper".equals(getSystemProperty("assistive_technologies"))) {
             System.clearProperty("assistive_technologies");
         }
@@ -154 +156 @@
      */
     public String getJavaPackageDetails() {
-        String home = System.getProperty("java.home");
+        String home = getSystemProperty("java.home");
         if (home.contains("java-8-openjdk") || home.contains("java-1.8.0-openjdk")) {
             return getPackageDetails("openjdk-8-jre", "java-1_8_0-openjdk", "java-1.8.0-openjdk");
@@ -202 +204 @@
 
     private String buildOSDescription() {
-        String osName = System.getProperty("os.name");
+        String osName = getSystemProperty("os.name");
         if ("Linux".equalsIgnoreCase(osName)) {
             try {
@@ -339 +341 @@
     private static File getDotDirectory() {
         String dirName = "." + Main.pref.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);
-        return new File(System.getProperty("user.home"), dirName);
+        return new File(getSystemProperty("user.home"), dirName);
     }
 
@@ -357 +359 @@
             return new File(getDotDirectory(), "cache");
         } else {
-            String xdgCacheDir = System.getenv("XDG_CACHE_HOME");
+            String xdgCacheDir = getSystemEnv("XDG_CACHE_HOME");
             if (xdgCacheDir != null && !xdgCacheDir.isEmpty()) {
                 return new File(xdgCacheDir, Main.pref.getJOSMDirectoryBaseName());
             } else {
-                return new File(System.getProperty("user.home") + File.separator +
+                return new File(getSystemProperty("user.home") + File.separator +
                         ".cache" + File.separator + Main.pref.getJOSMDirectoryBaseName());
             }
@@ -372 +374 @@
             return getDotDirectory();
         } else {
-            String xdgConfigDir = System.getenv("XDG_CONFIG_HOME");
+            String xdgConfigDir = getSystemEnv("XDG_CONFIG_HOME");
             if (xdgConfigDir != null && !xdgConfigDir.isEmpty()) {
                 return new File(xdgConfigDir, Main.pref.getJOSMDirectoryBaseName());
             } else {
-                return new File(System.getProperty("user.home") + File.separator +
+                return new File(getSystemProperty("user.home") + File.separator +
                         ".config" + File.separator + Main.pref.getJOSMDirectoryBaseName());
             }
@@ -387 +389 @@
             return getDotDirectory();
         } else {
-            String xdgDataDir = System.getenv("XDG_DATA_HOME");
+            String xdgDataDir = getSystemEnv("XDG_DATA_HOME");
             if (xdgDataDir != null && !xdgDataDir.isEmpty()) {
                 return new File(xdgDataDir, Main.pref.getJOSMDirectoryBaseName());
             } else {
-                return new File(System.getProperty("user.home") + File.separator +
+                return new File(getSystemProperty("user.home") + File.separator +
                         ".local" + File.separator + "share" + File.separator + Main.pref.getJOSMDirectoryBaseName());
             }