Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml (revision 15468)
+++ /trunk/build.xml (revision 15469)
@@ -198,5 +198,5 @@
-
+
@@ -417,8 +417,4 @@
-
-
-
-
@@ -515,8 +511,4 @@
-
-
-
-
Index: /trunk/josm-latest.jnlp
===================================================================
--- /trunk/josm-latest.jnlp (revision 15468)
+++ /trunk/josm-latest.jnlp (revision 15469)
@@ -21,5 +21,5 @@
-
+
Index: /trunk/josm.jnlp
===================================================================
--- /trunk/josm.jnlp (revision 15468)
+++ /trunk/josm.jnlp (revision 15469)
@@ -21,5 +21,5 @@
-
+
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 15468)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 15469)
@@ -83,4 +83,6 @@
private static final String[] OBSOLETE_PREF_KEYS = {
+ "remotecontrol.https.enabled", /* remove entry after Dec. 2019 */
+ "remotecontrol.https.port", /* remove entry after Dec. 2019 */
};
Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 15468)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 15469)
@@ -27,10 +27,7 @@
import java.security.CodeSource;
import java.security.GeneralSecurityException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
-import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -929,15 +926,4 @@
SwingUtilities.invokeLater(new GuiFinalizationWorker(args, proxySelector));
- if (PlatformManager.isPlatformWindows()) {
- try {
- // Check for insecure certificates to remove.
- // This is Windows-dependant code but it can't go to preStartupHook (need i18n)
- // neither startupHook (need to be called before remote control)
- PlatformHookWindows.removeInsecureCertificates();
- } catch (NoSuchAlgorithmException | CertificateException | KeyStoreException | IOException e) {
- Logging.error(e);
- }
- }
-
if (RemoteControl.PROP_REMOTECONTROL_ENABLED.get()) {
RemoteControl.start();
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 15468)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 15469)
@@ -8,10 +8,4 @@
import java.awt.GridBagLayout;
import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -20,8 +14,6 @@
import javax.swing.BorderFactory;
import javax.swing.Box;
-import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JSeparator;
@@ -36,11 +28,7 @@
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
-import org.openstreetmap.josm.io.remotecontrol.RemoteControlHttpsServer;
import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.PlatformHookWindows;
-import org.openstreetmap.josm.tools.PlatformManager;
/**
@@ -73,8 +61,4 @@
private final Map prefs = new LinkedHashMap<>();
private JCheckBox enableRemoteControl;
- private JCheckBox enableHttpsSupport;
-
- private JButton installCertificate;
- private JButton uninstallCertificate;
private final JCheckBox loadInNewLayer = new JCheckBox(tr("Download as new layer"));
@@ -93,8 +77,7 @@
final JLabel portLabel = new JLabel(""
- + tr("JOSM will always listen at port {0} (http) and port {1} (https) on localhost."
- + "
These ports are not configurable because they are referenced by external applications talking to JOSM.",
- Config.getPref().get("remote.control.port", "8111"),
- Config.getPref().get("remote.control.https.port", "8112")) + "");
+ + tr("JOSM will always listen at port {0} (http) on localhost."
+ + "
This port is not configurable because it is referenced by external applications talking to JOSM.",
+ Config.getPref().get("remote.control.port", "8111")) + "