Changeset 30442 in osm for applications/editors/josm/plugins/native-password-manager

Timestamp:

2014-05-11T02:29:19+02:00 (11 years ago)

Author:

donvip

Message:

[josm_native_password_manager] see #josm8465 - Java 7 update

Location:

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

Files:

• .classpath (added)
• .project (added)
• src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/npm/NPMType.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import java.awt.Component;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.net.Authenticator.RequestorType;
@@ -18 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.preferences.server.OsmApiUrlInputPanel;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -196 +194 @@
         }
         String prolog = getOAuthDescriptor();
-        if (key == null || equal(key, "") || secret == null || equal(secret, "")) {
+        if (key == null || key.isEmpty() || secret == null || secret.isEmpty()) {
             getProvider().delete(prolog+".key");
             getProvider().delete(prolog+".secret");

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.npm;
+
+import java.util.Objects;
 
 import org.netbeans.modules.keyring.gnome.GnomeProvider;
@@ -6 +8 @@
 import org.netbeans.modules.keyring.mac.MacProvider;
 import org.netbeans.spi.keyring.KeyringProvider;
+
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 public enum NPMType {
@@ -63 +65 @@
     public static NPMType fromPrefString(String pref) {
         for (NPMType t : NPMType.values()) {
-            if (equal(pref, t.prefString)) {
+            if (Objects.equals(pref, t.prefString)) {
                 return t;
             }