Changeset 3815 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-01-25T10:29:01+01:00 (13 years ago)

Author:

stoecker

Message:

fixes for applet

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• ServerSidePreferences.java (modified) (6 diffs)

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

@@ -645 +645 @@
     }
 
+    /* old style conversion, replace by above call after some transition time */
+    /* remove this function, when no more old-style preference collections in the code */
+    @Deprecated
+    synchronized public Collection<String> getCollectionOld(String key, String sep) {
+        putCollectionDefault(key, null);
+        String s = get(key);
+        if (s != null && s.length() != 0) {
+            if(!s.contains("\u001e") && s.contains(sep)) {
+                s = s.replace(sep, "\u001e");
+                put(key, s);
+            }
+            return Arrays.asList(s.split("\u001e"));
+        }
+        return Collections.emptyList();
+    }
+
     synchronized public void removeFromCollection(String key, String value) {
         List<String> a = new ArrayList<String>(getCollection(key, Collections.<String>emptyList()));

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

@@ -20 +20 @@
 import java.util.StringTokenizer;
 import java.util.Map.Entry;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -38 +38 @@
  */
 public class ServerSidePreferences extends Preferences {
-    static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName());
+    //static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName());
+
+    public class MissingPassword extends Exception{
+        public String realm;
+        public MissingPassword(String r) {
+            realm = r;
+        }
+    }
 
     private final Connection connection;
@@ -47 +54 @@
             this.serverUrl = serverUrl;
         }
-        public String download() {
+        public String download() throws MissingPassword {
             try {
                 System.out.println("reading preferences from "+serverUrl);
                 URLConnection con = serverUrl.openConnection();
-                if (con instanceof HttpURLConnection) {
-                    addAuth((HttpURLConnection) con);
+                String username = get("applet.username");
+                String password = get("applet.password");
+                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) {
+                    String t = ((HttpURLConnection) con).getHeaderField("WWW-Authenticate");
+                    t = t.replace("Basic realm=\"","").replace("\"","");
+                    throw new MissingPassword(t);
                 }
-                con.connect();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
                 StringBuilder b = new StringBuilder();
@@ -67 +82 @@
             } catch (IOException e) {
                 e.printStackTrace();
-            } catch(OsmTransferException e) {
-                e.printStackTrace();
             }
             return null;
@@ -77 +90 @@
                 System.out.println("uploading preferences to "+u);
                 HttpURLConnection con = (HttpURLConnection)u.openConnection();
-                // FIXME:
-                // - doesn't work if CredentialManager isn't JosmPreferencesCredentialManager
-                // - doesn't work for OAuth
-
-                con.addRequestProperty("Authorization", "Basic "+Base64.encode(get("osm-server.username")+":"+get("osm-server.password")));
+                String username = get("applet.username");
+                String password = get("applet.password");
+                if(password.isEmpty() && username.isEmpty())
+                    con.addRequestProperty("Authorization", "Basic "+Base64.encode(username+":"+password));
                 con.setRequestMethod("POST");
                 con.setDoOutput(true);
@@ -146 +158 @@
 
     public void download(String userName, String password) {
-        if (!properties.containsKey("osm-server.username") && userName != null) {
-            properties.put("osm-server.username", userName);
-        }
-        if (!properties.containsKey("osm-server.password") && password != null) {
-            properties.put("osm-server.password", password);
-        }
-        download();
-    }
-
-    public boolean download() {
+        if (!properties.containsKey("applet.username") && userName != null) {
+            properties.put("applet.username", userName);
+        }
+        if (!properties.containsKey("applet.password") && password != null) {
+            properties.put("applet.password", password);
+        }
+        try {
+            download();
+        } catch (MissingPassword e) {
+        }
+    }
+
+    public boolean download() throws MissingPassword {
         resetToDefault();
         String cont = connection.download();