Changeset 10931 in josm for trunk


Ignore:
Timestamp:
2016-09-02T22:51:06+02:00 (3 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
Files:
8 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r10909 r10931  
    5757import org.openstreetmap.josm.io.auth.CredentialsManager;
    5858import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
     59import org.openstreetmap.josm.io.protocols.data.Handler;
    5960import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
    6061import org.openstreetmap.josm.plugins.PluginHandler;
     
    260261        I18n.setupLanguageFonts();
    261262
     263        Handler.install();
     264
    262265        WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
    263266                args.getSingle(Option.GEOMETRY).orElse(null),
  • trunk/src/org/openstreetmap/josm/gui/widgets/NativeFileChooser.java

    r10611 r10931  
    1212
    1313import org.openstreetmap.josm.Main;
     14import org.openstreetmap.josm.tools.Utils;
    1415
    1516/**
     
    135136        boolean appleProperty = Main.isPlatformOsx() && selectionMode == JFileChooser.DIRECTORIES_ONLY;
    136137        if (appleProperty) {
    137             System.setProperty("apple.awt.fileDialogForDirectories", "true");
     138            Utils.updateSystemProperty("apple.awt.fileDialogForDirectories", "true");
    138139        }
    139140        try {
     
    144145        } finally {
    145146            if (appleProperty) {
    146                 System.setProperty("apple.awt.fileDialogForDirectories", "false");
     147                Utils.updateSystemProperty("apple.awt.fileDialogForDirectories", "false");
    147148            }
    148149        }
  • trunk/src/org/openstreetmap/josm/tools/Utils.java

    r10873 r10931  
    13161316        if (value != null) {
    13171317            String old = System.setProperty(key, value);
    1318             if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
    1319                 Main.debug("System property '" + key + "' set to '" + value + "'. Old value was '" + old + '\'');
    1320             } else {
    1321                 Main.debug("System property '" + key + "' changed.");
     1318            if (Main.isDebugEnabled()) {
     1319                if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
     1320                    Main.debug("System property '" + key + "' set to '" + value + "'. Old value was '" + old + '\'');
     1321                } else {
     1322                    Main.debug("System property '" + key + "' changed.");
     1323                }
    13221324            }
    13231325            return old;
Note: See TracChangeset for help on using the changeset viewer.