Index: /applications/editors/josm/plugins/native-password-manager/.classpath
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/.classpath	(revision 30442)
+++ /applications/editors/josm/plugins/native-password-manager/.classpath	(revision 30442)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/jna.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
Index: /applications/editors/josm/plugins/native-password-manager/.project
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/.project	(revision 30442)
+++ /applications/editors/josm/plugins/native-password-manager/.project	(revision 30442)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-native-password-manager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 30441)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 30442)
@@ -4,5 +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,5 +17,4 @@
 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,5 +194,5 @@
         }
         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");
Index: /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java
===================================================================
--- /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java	(revision 30441)
+++ /applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java	(revision 30442)
@@ -1,4 +1,6 @@
 // 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,6 +8,6 @@
 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,5 +65,5 @@
     public static NPMType fromPrefString(String pref) {
         for (NPMType t : NPMType.values()) {
-            if (equal(pref, t.prefString)) {
+            if (Objects.equals(pref, t.prefString)) {
                 return t;
             }