Changeset 4874 in josm for trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

Timestamp:

26.01.2012 21:52:34 (4 months ago)

Author:

jttt

Message:

Use static class were appropriate

File:

• trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -15 +15 @@
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-import java.util.Map.Entry;
 
 import javax.swing.JOptionPane;
@@ -26 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmConnection;
-import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Base64;
 
@@ -36 +30 @@
  */
 public class ServerSidePreferences extends Preferences {
-    public class MissingPassword extends Exception{
+    public static class MissingPassword extends Exception{
         public String realm;
         public MissingPassword(String r) {
@@ -56 +50 @@
                 String username = get("applet.username");
                 String password = get("applet.password");
-                if(password.isEmpty() && username.isEmpty())
+                if(password.isEmpty() && username.isEmpty()) {
                     con.addRequestProperty("Authorization", "Basic "+Base64.encode(username+":"+password));
+                }
                 con.connect();
                 if(username.isEmpty() && con instanceof HttpURLConnection
-                    && ((HttpURLConnection) con).getResponseCode()
-                    == HttpURLConnection.HTTP_UNAUTHORIZED) {
+                        && ((HttpURLConnection) con).getResponseCode()
+                        == HttpURLConnection.HTTP_UNAUTHORIZED) {
                     String t = ((HttpURLConnection) con).getHeaderField("WWW-Authenticate");
                     t = t.replace("Basic realm=\"","").replace("\"","");
@@ -88 +83 @@
                 String username = get("applet.username");
                 String password = get("applet.password");
-                if(password.isEmpty() && username.isEmpty())
+                if(password.isEmpty() && username.isEmpty()) {
                     con.addRequestProperty("Authorization", "Basic "+Base64.encode(username+":"+password));
+                }
                 con.setRequestMethod("POST");
                 con.setDoOutput(true);
@@ -103 +99 @@
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE
-                );
+                        );
             } catch (Exception e) {
                 e.printStackTrace();
@@ -111 +107 @@
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE
-                );
+                        );
             }
         }
@@ -127 +123 @@
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE
-            );
+                    );
         }
         this.connection = connection;