Changeset 6990 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

Timestamp:

2014-04-19T00:36:43+02:00 (12 years ago)

Author:

Don-vip

Message:

sonar - place Strings literals on the left side when checking for equality (can avoid NPEs)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java

@@ -115 +115 @@
     public final void initFromPreferences() {
         String authMethod = Main.pref.get("osm-server.auth-method", "basic");
-        if (authMethod.equals("basic")) {
+        if ("basic".equals(authMethod)) {
             rbBasicAuthentication.setSelected(true);
-        } else if (authMethod.equals("oauth")) {
+        } else if ("oauth".equals(authMethod)) {
             rbOAuth.setSelected(true);
         } else {
@@ -140 +140 @@
         }
         Main.pref.put("osm-server.auth-method", authMethod);
-        if (authMethod.equals("basic")) {
+        if ("basic".equals(authMethod)) {
             // save username and password and clear the OAuth token
             pnlBasicAuthPreferences.saveToPreferences();
             OAuthAccessTokenHolder.getInstance().clear();
             OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
-        } else if (authMethod.equals("oauth")) {
+        } else if ("oauth".equals(authMethod)) {
             // clear the password in the preferences
             pnlBasicAuthPreferences.clearPassword();