Changeset 14406 in josm

Timestamp:

2018-11-03T01:07:53+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16937 - Support user logins with space character on Java 11 (JOSM startup)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (3 diffs)
• io/CachedFile.java (modified) (1 diff)
• tools/I18n.java (modified) (8 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.InvalidPathException;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -105 +107 @@
      */
     public void init() {
-        try (InputStream stream = Version.class.getResourceAsStream("/REVISION")) {
+        try (InputStream stream = openRevisionStream("/REVISION")) {
             if (stream == null) {
                 Logging.warn(tr("The revision file ''/REVISION'' is missing."));
@@ -118 +120 @@
     }
 
+    private static InputStream openRevisionStream(String path) throws IOException {
+        try {
+            return Version.class.getResourceAsStream(path);
+        } catch (InvalidPathException e) {
+            Logging.error("Cannot open {0}: {1}", path, e.getMessage());
+            URL betterUrl = Utils.betterJarUrl(Version.class.getResource(path));
+            if (betterUrl != null) {
+                return betterUrl.openStream();
+            }
+            return null;
+        }
+    }
+
     /**
      * Replies the version string. Either the SVN revision "1234" (as string) or the

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -227 +227 @@
             if (name != null && name.startsWith("resource://")) {
                 String resourceName = name.substring("resource:/".length());
-                InputStream is = getClass().getResourceAsStream(resourceName);
+                InputStream is = null;
+                try {
+                    is = getClass().getResourceAsStream(resourceName);
+                } catch (InvalidPathException e) {
+                    Logging.error("Cannot open {0}: {1}", resourceName, e.getMessage());
+                    Logging.trace(e);
+                }
                 if (is == null) {
                     URL resource = getClass().getResource(resourceName);

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

@@ -138 +138 @@
     }
 
+    private static String format(String text, Object... objects) {
+        try {
+            return MessageFormat.format(text, objects);
+        } catch (InvalidPathException e) {
+            System.err.println("!!! Unable to format '" + text + "': " + e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     /**
      * Translates some text for the current locale.
@@ -162 +172 @@
     public static String tr(String text, Object... objects) {
         if (text == null) return null;
-        return MessageFormat.format(gettext(text, null), objects);
+        return format(gettext(text, null), objects);
     }
 
@@ -182 +192 @@
         if (text == null)
             return null;
-        return MessageFormat.format(gettext(text, context), (Object) null);
+        return format(gettext(text, context), (Object) null);
     }
 
@@ -190 +200 @@
         if (text == null)
             return null;
-        return MessageFormat.format(gettextLazy(text, context), (Object) null);
+        return format(gettextLazy(text, context), (Object) null);
     }
 
@@ -235 +245 @@
      */
     public static String trn(String singularText, String pluralText, long n, Object... objects) {
-        return MessageFormat.format(gettextn(singularText, pluralText, null, n), objects);
+        return format(gettextn(singularText, pluralText, null, n), objects);
     }
 
@@ -262 +272 @@
      */
     public static String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
-        return MessageFormat.format(gettextn(singularText, pluralText, context, n), objects);
+        return format(gettextn(singularText, pluralText, context, n), objects);
     }
 
@@ -348 +358 @@
     }
 
-    static void setupJavaLocaleProviders() {
+    static String setupJavaLocaleProviders() {
         // Look up SPI providers first (for JosmDecimalFormatSymbolsProvider).
         // Enable CLDR locale provider on Java 8 to get additional languages, such as Khmer.
@@ -355 +365 @@
         // See https://docs.oracle.com/javase/9/docs/api/java/util/spi/LocaleServiceProvider.html
         try {
-            // Don't call Utils.updateSystemProperty to avoid spurious log at startup
-            System.setProperty("java.locale.providers", "SPI,JRE,CLDR");
+            try {
+                // First check we're able to open a stream to our own SPI file
+                // Java will fail on Windows if the jar file is in a folder with a space character!
+                I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider").close();
+                // Don't call Utils.updateSystemProperty to avoid spurious log at startup
+                return System.setProperty("java.locale.providers", "SPI,JRE,CLDR");
+            } catch (RuntimeException | IOException e) {
+                // Don't call Logging class, it may not be fully initialized yet
+                System.err.println("Unable to set SPI locale provider: " + e.getMessage());
+            }
         } catch (SecurityException e) {
             // Don't call Logging class, it may not be fully initialized yet
             System.err.println("Unable to set locale providers: " + e.getMessage());
         }
+        return System.setProperty("java.locale.providers", "JRE,CLDR");
     }
 

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

@@ -31 +31 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.InvalidPathException;
 import java.util.Arrays;
 import java.util.Base64;
@@ -1165 +1166 @@
             synchronized (getSvgUniverse()) {
                 try {
-                    URI uri = getSvgUniverse().loadSVG(path);
+                    URI uri = null;
+                    try {
+                        uri = getSvgUniverse().loadSVG(path);
+                    } catch (InvalidPathException e) {
+                        Logging.error("Cannot open {0}: {1}", path, e.getMessage());
+                        Logging.trace(e);
+                    }
                     if (uri == null && "jar".equals(path.getProtocol())) {
                         URL betterPath = Utils.betterJarUrl(path);