Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/io/auth

Timestamp:

2015-06-20T23:42:21+02:00 (10 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/io/auth

Files:

• CredentialsAgentException.java (modified) (1 diff)
• CredentialsManager.java (modified) (1 diff)
• DefaultAuthenticator.java (modified) (1 diff)
• JosmPreferencesCredentialAgent.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgentException.java

@@ -3 +3 @@
 
 public class CredentialsAgentException extends Exception {
-    public CredentialsAgentException() {super();}
-    public CredentialsAgentException(String message, Throwable cause) {super(message, cause);}
-    public CredentialsAgentException(String message) {super(message);}
-    public CredentialsAgentException(Throwable cause) {super(cause);}
 
+    /**
+     * Constructs a new {@code CredentialsAgentException}.
+     * @param message the detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+     */
+    public CredentialsAgentException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new {@code CredentialsAgentException}.
+     * @param message the detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+     */
+    public CredentialsAgentException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new {@code CredentialsAgentException}.
+     * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+     */
+    public CredentialsAgentException(Throwable cause) {
+        super(cause);
+    }
 }

trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -118 +118 @@
         if (requestorType == RequestorType.SERVER && Objects.equals(OsmApi.getOsmApi().getHost(), host)) {
             String username = credentials.getUserName();
-            if(username != null && !username.trim().isEmpty()) {
+            if (username != null && !username.trim().isEmpty()) {
                 JosmUserIdentityManager.getInstance().setPartiallyIdentified(username);
             }

trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java

@@ -57 +57 @@
             credentialsTried.put(getRequestorType(), true);
             return new PasswordAuthentication(response.getUsername(), response.getPassword());
-        } catch(CredentialsAgentException e) {
+        } catch (CredentialsAgentException e) {
             Main.error(e);
             return null;

trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java

@@ -28 +28 @@
      */
     @Override
-    public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException{
+    public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException {
         if (requestorType == null)
             return null;
@@ -38 +38 @@
                 user = Main.pref.get("osm-server.username", null);
                 password = Main.pref.get("osm-server.password", null);
-            } else if(host != null) {
+            } else if (host != null) {
                 user = Main.pref.get("server.username."+host, null);
                 password = Main.pref.get("server.password."+host, null);
@@ -74 +74 @@
                     Main.pref.put("osm-server.password", String.valueOf(credentials.getPassword()));
                 }
-            } else if(host != null) {
+            } else if (host != null) {
                 Main.pref.put("server.username."+host, credentials.getUserName());
                 if (credentials.getPassword() == null) {
@@ -130 +130 @@
     public Component getPreferencesDecorationPanel() {
         HtmlPanel pnlMessage = new HtmlPanel();
-        HTMLEditorKit kit = (HTMLEditorKit)pnlMessage.getEditorPane().getEditorKit();
+        HTMLEditorKit kit = (HTMLEditorKit) pnlMessage.getEditorPane().getEditorKit();
         kit.getStyleSheet().addRule(
-                ".warning-body {background-color:rgb(253,255,221);padding: 10pt; border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
-        pnlMessage.setText(
-                tr(
+                ".warning-body {background-color:rgb(253,255,221);padding: 10pt; " +
+                "border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
+        pnlMessage.setText(tr(
                         "<html><body>"
                         + "<p class=\"warning-body\">"