Changeset 33587 in osm for applications/editors

Timestamp:

2017-09-09T17:19:12+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12805

Location:

applications/editors/josm/plugins/native-password-manager

Files:

• build.xml (modified) (1 diff)
• src/org/netbeans/modules/keyring/kde/KWalletProvider.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/npm/NPMType.java (modified) (2 diffs)

applications/editors/josm/plugins/native-password-manager/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12678"/>
+    <property name="plugin.main.version" value="12805"/>
     <property name="plugin.author" value="Paul Hartmann"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.npm.NPMPlugin"/>

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/kde/KWalletProvider.java

@@ -222 +222 @@
     }      
   
-    private class CommandResult {
+    private static class CommandResult {
         private int exitCode;
         private char[] retVal;

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java

@@ -43 +43 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
@@ -365 +365 @@
             }
             
-            String proxy_username = Main.pref.get(ProxyPreferencesPanel.PROXY_USER, null);
-            String proxy_password = Main.pref.get(ProxyPreferencesPanel.PROXY_PASS, null);
-            String proxy_host = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST, null);
+            String proxy_username = Main.pref.get(DefaultProxySelector.PROXY_USER, null);
+            String proxy_password = Main.pref.get(DefaultProxySelector.PROXY_PASS, null);
+            String proxy_host = Main.pref.get(DefaultProxySelector.PROXY_HTTP_HOST, null);
             if (proxy_username != null || proxy_password != null) {
                 try {
                     cm.store(RequestorType.PROXY, proxy_host, new PasswordAuthentication(string(proxy_username), toCharArray(proxy_password)));
                     if (rbClear.isSelected()) {
-                        Main.pref.put(ProxyPreferencesPanel.PROXY_USER, null);
-                        Main.pref.put(ProxyPreferencesPanel.PROXY_PASS, null);
+                        Main.pref.put(DefaultProxySelector.PROXY_USER, null);
+                        Main.pref.put(DefaultProxySelector.PROXY_PASS, null);
                     }
                 } catch (CredentialsAgentException ex) {
@@ -425 +425 @@
             Main.pref.get("osm-server.username", null) != null ||
             Main.pref.get("osm-server.password", null) != null ||
-            Main.pref.get(ProxyPreferencesPanel.PROXY_USER, null) != null ||
-            Main.pref.get(ProxyPreferencesPanel.PROXY_PASS, null) != null ||
+            Main.pref.get(DefaultProxySelector.PROXY_USER, null) != null ||
+            Main.pref.get(DefaultProxySelector.PROXY_PASS, null) != null ||
             Main.pref.get("oauth.access-token.key", null) != null ||
             Main.pref.get("oauth.access-token.secret", null) != null;

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.npm;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.Component;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
@@ -12 +12 @@
 import java.util.Map;
 import java.util.zip.CRC32;
+
 import javax.swing.text.html.HTMLEditorKit;
 
@@ -17 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.auth.AbstractCredentialsAgent;
@@ -70 +71 @@
     protected String getProxyDescriptor() {
         String pref = Main.pref.getPreferenceFile().getAbsolutePath();
-        String host = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST, "");
-        String port = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_PORT, "");
+        String host = Main.pref.get(DefaultProxySelector.PROXY_HTTP_HOST, "");
+        String port = Main.pref.get(DefaultProxySelector.PROXY_HTTP_PORT, "");
         
         CRC32 id = new CRC32();
@@ -229 +230 @@
             sensitive.add(tr("password"));
         }
-        if (Main.pref.get(ProxyPreferencesPanel.PROXY_USER, null) != null) {
+        if (Main.pref.get(DefaultProxySelector.PROXY_USER, null) != null) {
             sensitive.add(tr("proxy username"));
         }
-        if (Main.pref.get(ProxyPreferencesPanel.PROXY_PASS, null) != null) {
+        if (Main.pref.get(DefaultProxySelector.PROXY_PASS, null) != null) {
             sensitive.add(tr("proxy password"));
         }

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java

@@ -8 +8 @@
 import org.netbeans.modules.keyring.mac.MacProvider;
 import org.netbeans.spi.keyring.KeyringProvider;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -92 +93 @@
         if (provider == null) {
             try {
-                provider = providerClass.newInstance();
-            } catch (InstantiationException ex) {
-                throw new RuntimeException();
-            } catch (IllegalAccessException ex) {
-                throw new RuntimeException();
+                provider = providerClass.getDeclaredConstructor().newInstance();
+            } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException ex) {
+                throw new JosmRuntimeException(ex);
             }
         }