Changeset 4172 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2011-06-26T13:43:35+02:00 (13 years ago)

Author:

stoecker

Message:

remove unused icons, make connection timouts configurable and increase them a bit to handle JOSM server delays

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MirroredInputStream.java (modified) (2 diffs)
• OsmApi.java (modified) (1 diff)
• OsmServerReader.java (modified) (1 diff)
• imagery/WMSGrabber.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -65 +65 @@
                 if(Main.applet) {
                     URLConnection conn = url.openConnection();
-                    conn.setConnectTimeout(5000);
-                    conn.setReadTimeout(5000);
+                    conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                    conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
                     fs = new BufferedInputStream(conn.getInputStream());
                     file = new File(url.getFile());
@@ -218 +218 @@
         try {
             URLConnection conn = url.openConnection();
-            conn.setConnectTimeout(5000);
-            conn.setReadTimeout(5000);
+            conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+            conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
             bis = new BufferedInputStream(conn.getInputStream());
             FileOutputStream fos = new FileOutputStream(destDirFile);

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -546 +546 @@
                 System.out.print(requestMethod + " " + url + "... ");
                 activeConnection = (HttpURLConnection)url.openConnection();
-                activeConnection.setConnectTimeout(fastFail ? 1000 : 15000);
+                activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect",15)*1000);
                 activeConnection.setRequestMethod(requestMethod);
                 if (doAuthenticate) {

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -79 +79 @@
             }
 
-            activeConnection.setConnectTimeout(15000);
+            activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
             try {

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -175 +175 @@
         }
         conn.setRequestProperty("User-Agent", Main.pref.get("imagery.wms.user_agent", Version.getInstance().getAgentString()));
-        conn.setConnectTimeout(Main.pref.getInteger("imagery.wms.timeout.connect", 30) * 1000);
-        conn.setReadTimeout(Main.pref.getInteger("imagery.wms.timeout.read", 30) * 1000);
+        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15) * 1000);
+        conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read", 30) * 1000);
 
         String contentType = conn.getHeaderField("Content-Type");