Changeset 6941 in josm


Ignore:
Timestamp:
2014-03-29T00:34:18+01:00 (12 years ago)
Author:
Don-vip
Message:

fix #9720 - Remote control: listen also in HTTPS

Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r6905 r6941  
    12981298        if (value != null) {
    12991299            String old = System.setProperty(key, value);
    1300             Main.debug("System property '"+key+"' set to '"+value+"'. Old value was '"+old+"'");
     1300            if (!key.toLowerCase().contains("password")) {
     1301                Main.debug("System property '"+key+"' set to '"+value+"'. Old value was '"+old+"'");
     1302            } else {
     1303                Main.debug("System property '"+key+"' changed.");
     1304            }
    13011305            return old;
    13021306        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

    r6623 r6941  
    7474        remote.add(descLabel, GBC.eol().insets(5, 5, 0, 10).fill(GBC.HORIZONTAL));
    7575
    76         final JLabel portLabel = new JLabel("<html>" + tr("JOSM will always listen at <b>port 8111</b> on localhost. "
    77                 + "<br>This port is not configurable because it is referenced by external applications talking to JOSM.") + "</html>");
     76        final JLabel portLabel = new JLabel("<html>" + tr("JOSM will always listen at <b>port {0}</b> (http) and <b>port {1}</b> (https) on localhost."
     77                + "<br>These ports are not configurable because they are referenced by external applications talking to JOSM.",
     78                Main.pref.get("remote.control.port", "8111"),
     79                Main.pref.get("remote.control.https.port", "8112")) + "</html>");
    7880        portLabel.setFont(portLabel.getFont().deriveFont(Font.PLAIN));
    7981        remote.add(portLabel, GBC.eol().insets(5, 5, 0, 10).fill(GBC.HORIZONTAL));

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

    r6342 r6941  
    3232    public static void start() {
    3333        RemoteControlHttpServer.restartRemoteControlHttpServer();
     34        RemoteControlHttpsServer.restartRemoteControlHttpsServer();
    3435    }
    3536
    … …  
    4041    public static void stop() {
    4142        RemoteControlHttpServer.stopRemoteControlHttpServer();
     43        RemoteControlHttpsServer.stopRemoteControlHttpsServer();
    4244    }
    4345
Note: See TracChangeset for help on using the changeset viewer.