Index: applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java
===================================================================
--- applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java	(revision 30695)
+++ applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java	(revision 30737)
@@ -46,5 +46,4 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.netbeans.modules.keyring.impl.Utils;
 import org.netbeans.modules.keyring.spi.EncryptionProvider;
 import org.netbeans.spi.keyring.KeyringProvider;
Index: applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java
===================================================================
--- applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java	(revision 30695)
+++ applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java	(revision 30737)
@@ -61,5 +61,5 @@
     protected JPanel cardPanel;
     
-    List<WizardPanel> panels = new ArrayList<WizardPanel>();
+    List<WizardPanel> panels = new ArrayList<>();
     int panelIndex;
     
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 30695)
+++ applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 30737)
@@ -38,5 +38,5 @@
      * In contrast, this cache avoids read request the backend in general.
      */
-    private Map<RequestorType, PasswordAuthentication> credentialsCache = new HashMap<RequestorType, PasswordAuthentication>();
+    private Map<RequestorType, PasswordAuthentication> credentialsCache = new HashMap<>();
     private OAuthToken oauthCache;
     
@@ -222,5 +222,5 @@
                     + tr("The username and password is protected by {0}.", type.getName())
         );
-        List<String> sensitive = new ArrayList<String>();
+        List<String> sensitive = new ArrayList<>();
         if (Main.pref.get("osm-server.username", null) != null) {
             sensitive.add(tr("username"));