Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/gui/oauth

Timestamp:

2015-05-02T00:55:19+02:00 (10 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• AbstractAuthorizationUI.java (modified) (3 diffs)
• AdvancedOAuthPropertiesPanel.java (modified) (1 diff)
• FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• ManualAuthorizationUI.java (modified) (1 diff)
• OAuthAuthorizationWizard.java (modified) (1 diff)
• SemiAutomaticAuthorizationUI.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

@@ -7 +7 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+import com.sun.org.apache.xerces.internal.utils.Objects;
 
 /**
@@ -21 +23 @@
     private String apiUrl;
     private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
-    private OAuthToken accessToken;
+    private transient OAuthToken accessToken;
 
     protected void fireAccessTokenChanged(OAuthToken oldValue, OAuthToken newValue) {
@@ -99 +101 @@
         } else if (oldValue == null && this.accessToken == null) {
             // no change - don't fire an event
-        } else if (! oldValue.equals(this.accessToken)) {
+        } else if (!Objects.equals(oldValue, this.accessToken)) {
             fireAccessTokenChanged(oldValue, this.accessToken);
         }

trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java

@@ -48 +48 @@
     private JosmTextField tfAccessTokenURL;
     private JosmTextField tfAuthoriseURL;
-    private UseDefaultItemListener ilUseDefault;
+    private transient UseDefaultItemListener ilUseDefault;
     private String apiUrl;
 

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -60 +60 @@
     private JosmTextField tfUserName;
     private JosmPasswordField tfPassword;
-    private UserNameValidator valUserName;
-    private PasswordValidator valPassword;
+    private transient UserNameValidator valUserName;
+    private transient PasswordValidator valPassword;
     private AccessTokenInfoPanel pnlAccessTokenInfo;
     private OsmPrivilegesPanel pnlOsmPrivileges;

trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -42 +42 @@
 
     private JosmTextField tfAccessTokenKey;
-    private AccessTokenKeyValidator valAccessTokenKey;
+    private transient AccessTokenKeyValidator valAccessTokenKey;
     private JosmTextField tfAccessTokenSecret;
-    private AccessTokenSecretValidator valAccessTokenSecret;
+    private transient AccessTokenSecretValidator valAccessTokenSecret;
     private JCheckBox cbSaveToPreferences;
     private HtmlPanel pnlMessage;

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -333 +333 @@
 
     class AcceptAccessTokenAction extends AbstractAction implements PropertyChangeListener {
-        private OAuthToken token;
+        private transient OAuthToken token;
 
         public AcceptAccessTokenAction() {

trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /**
@@ -42 +42 @@
 public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
     private AccessTokenInfoPanel pnlAccessTokenInfo;
-    private OAuthToken requestToken;
+    private transient OAuthToken requestToken;
 
     private RetrieveRequestTokenPanel pnlRetrieveRequestToken;