Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.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/PlatformHookWindows.java (modified) (7 diffs)

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

@@ -27 +27 @@
 import static java.awt.event.KeyEvent.VK_Z;
 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 static org.openstreetmap.josm.tools.WinRegistry.HKEY_LOCAL_MACHINE;
 
@@ -270 +272 @@
     @Override
     public String getOSDescription() {
-        return Utils.strip(System.getProperty("os.name")) + ' ' +
-                ((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
+        return Utils.strip(getSystemProperty("os.name")) + ' ' +
+                ((getSystemEnv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
     }
 
@@ -316 +318 @@
             }
             sb.append(" (").append(getCurrentBuild()).append(')');
-        } catch (ReflectiveOperationException | JosmRuntimeException e) {
-            Logging.error(e);
+        } catch (ReflectiveOperationException | JosmRuntimeException | NoClassDefFoundError e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to get Windows build number", e);
+            Logging.debug(e);
         }
         return sb.toString();
@@ -473 +476 @@
     @Override
     public File getDefaultCacheDirectory() {
-        String p = System.getenv("LOCALAPPDATA");
+        String p = getSystemEnv("LOCALAPPDATA");
         if (p == null || p.isEmpty()) {
             // Fallback for Windows OS earlier than Windows Vista, where the variable is not defined
-            p = System.getenv("APPDATA");
+            p = getSystemEnv("APPDATA");
         }
         return new File(new File(p, Main.pref.getJOSMDirectoryBaseName()), "cache");
@@ -483 +486 @@
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(System.getenv("APPDATA"), Main.pref.getJOSMDirectoryBaseName());
+        return new File(getSystemEnv("APPDATA"), Main.pref.getJOSMDirectoryBaseName());
     }
 
@@ -524 +527 @@
             return;
 
-        String javaLibPath = System.getProperty("java.home") + File.separator + "lib";
+        String javaLibPath = getSystemProperty("java.home") + File.separator + "lib";
         Path templateFile = FileSystems.getDefault().getPath(javaLibPath, templateFileName);
-        if (!Files.isReadable(templateFile)) {
-            Logging.warn("extended font config - unable to find font config template file {0}", templateFile.toString());
+        String templatePath = templateFile.toString();
+        if (templatePath.startsWith("null") || !Files.isReadable(templateFile)) {
+            Logging.warn("extended font config - unable to find font config template file {0}", templatePath);
             return;
         }
@@ -612 +616 @@
         // Use more low-level method to find the installed fonts.
         List<String> fontsAvail = new ArrayList<>();
-        Path fontPath = FileSystems.getDefault().getPath(System.getenv("SYSTEMROOT"), "Fonts");
+        Path fontPath = FileSystems.getDefault().getPath(getSystemEnv("SYSTEMROOT"), "Fonts");
         try (DirectoryStream<Path> ds = Files.newDirectoryStream(fontPath)) {
             for (Path p : ds) {