Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

Timestamp:

2016-05-11T02:44:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

File:

• trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

@@ -117 +117 @@
     public void prepareForOsmApiCredentials(String username, String password) {
         setTitle(tr("Enter credentials for OSM API"));
-        getContentPane().add(pnlCredentials = new OsmApiCredentialsPanel(this), BorderLayout.CENTER);
+        pnlCredentials = new OsmApiCredentialsPanel(this);
+        getContentPane().add(pnlCredentials, BorderLayout.CENTER);
         pnlCredentials.init(username, password);
         validate();
@@ -124 +125 @@
     public void prepareForOtherHostCredentials(String username, String password, String host) {
         setTitle(tr("Enter credentials for host"));
-        getContentPane().add(pnlCredentials = new OtherHostCredentialsPanel(this, host), BorderLayout.CENTER);
+        pnlCredentials = new OtherHostCredentialsPanel(this, host);
+        getContentPane().add(pnlCredentials, BorderLayout.CENTER);
         pnlCredentials.init(username, password);
         validate();
@@ -131 +133 @@
     public void prepareForProxyCredentials(String username, String password) {
         setTitle(tr("Enter credentials for HTTP proxy"));
-        getContentPane().add(pnlCredentials = new HttpProxyCredentialsPanel(this), BorderLayout.CENTER);
+        pnlCredentials = new HttpProxyCredentialsPanel(this);
+        getContentPane().add(pnlCredentials, BorderLayout.CENTER);
         pnlCredentials.init(username, password);
         validate();
@@ -137 +140 @@
 
     public String getUsername() {
-        if (pnlCredentials == null) return null;
+        if (pnlCredentials == null)
+            return null;
         return pnlCredentials.getUserName();
     }
 
     public char[] getPassword() {
-        if (pnlCredentials == null) return null;
+        if (pnlCredentials == null)
+            return null;
         return pnlCredentials.getPassword();
     }
 
     public boolean isSaveCredentials() {
-        if (pnlCredentials == null) return false;
+        if (pnlCredentials == null)
+            return false;
         return pnlCredentials.isSaveCredentials();
     }
@@ -155 +161 @@
         protected JosmPasswordField tfPassword;
         protected JCheckBox cbSaveCredentials;
-        protected JMultilineLabel lblHeading;
-        protected JMultilineLabel lblWarning;
+        protected final JMultilineLabel lblHeading = new JMultilineLabel("");
+        protected final JMultilineLabel lblWarning = new JMultilineLabel("");
         protected CredentialDialog owner; // owner Dependency Injection to use Key listeners for username and password text fields
 
@@ -176 +182 @@
             gc.weighty = 0.0;
             gc.insets = new Insets(0, 0, 10, 0);
-            add(lblHeading = new JMultilineLabel(""), gc);
+            add(lblHeading, gc);
 
             gc.gridx = 0;
@@ -208 +214 @@
             gc.weightx = 1.0;
             gc.weighty = 0.0;
-            lblWarning = new JMultilineLabel("");
             lblWarning.setFont(lblWarning.getFont().deriveFont(Font.ITALIC));
             add(lblWarning, gc);