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

Timestamp:

2007-10-26T21:58:25+02:00 (17 years ago)

Author:

gebner

Message:

Make the applet code work again.

File:

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

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

@@ -12 +12 @@
 import java.io.StringReader;
 import java.net.HttpURLConnection;
+import java.net.URLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -46 +47 @@
                         try {
                                 System.out.println("reading preferences from "+serverUrl);
-                                HttpURLConnection con = (HttpURLConnection)serverUrl.openConnection();
-                                addAuth(con);
+                                URLConnection con = serverUrl.openConnection();
+                                if (con instanceof HttpURLConnection) addAuth((HttpURLConnection) con);
                                 con.connect();
                                 BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
@@ -55 +56 @@
                                         b.append("\n");
                                 }
-                                con.disconnect();
+                                if (con instanceof HttpURLConnection) ((HttpURLConnection) con).disconnect();
                                 return b.toString();
                         } catch (IOException e) {
@@ -122 +123 @@
                 if (!properties.containsKey("osm-server.password") && password != null)
                         properties.put("osm-server.password", password);
-                Reader in = new StringReader(connection.download());
+                String cont = connection.download();
+                if (cont == null) return;
+                Reader in = new StringReader(cont);
                 try {
                         XmlObjectParser.Uniform<Prop> parser = new XmlObjectParser.Uniform<Prop>(in, "tag", Prop.class);
@@ -176 +179 @@
                 } catch (MalformedURLException e) {
                         e.printStackTrace();
+                } catch (IllegalArgumentException e) {
+                        e.printStackTrace();
                 } catch (IOException e) {
                         e.printStackTrace();