Changeset 11509 in josm for trunk/src/org

Timestamp:

2017-01-29T19:24:14+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14305 - allow file:// URL for command-line argument --load-preferences

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -283 +283 @@
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
                 info("Reading preferences from " + i);
-                try (InputStream is = HttpClient.create(new URL(i)).connect().getContent()) {
+                try (InputStream is = openStream(new URL(i))) {
                     config.openAndReadXML(is);
                 } catch (IOException ex) {
@@ -382 +382 @@
             info("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console");
             RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+        }
+    }
+
+    private static InputStream openStream(URL url) throws IOException {
+        if ("file".equals(url.getProtocol())) {
+            return url.openStream();
+        } else {
+            return HttpClient.create(url).connect().getContent();
         }
     }