Changeset 10931 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-09-02T22:51:06+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #13513 - Registers a protocol handler for data: URLs allowing to display base64-inlined images in HTML help

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• widgets/NativeFileChooser.java (modified) (3 diffs)

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

@@ -57 +57 @@
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
+import org.openstreetmap.josm.io.protocols.data.Handler;
 import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -260 +261 @@
         I18n.setupLanguageFonts();
 
+        Handler.install();
+
         WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
                 args.getSingle(Option.GEOMETRY).orElse(null),

trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -135 +136 @@
         boolean appleProperty = Main.isPlatformOsx() && selectionMode == JFileChooser.DIRECTORIES_ONLY;
         if (appleProperty) {
-            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+            Utils.updateSystemProperty("apple.awt.fileDialogForDirectories", "true");
         }
         try {
@@ -144 +145 @@
         } finally {
             if (appleProperty) {
-                System.setProperty("apple.awt.fileDialogForDirectories", "false");
+                Utils.updateSystemProperty("apple.awt.fileDialogForDirectories", "false");
             }
         }