Changeset 5868 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2013-04-15T19:12:01+02:00 (11 years ago)

Author:

stoecker

Message:

see #8606 - use JOSM agent also for WebStart, join help browser and WikiReader

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Utils.java (modified) (4 diffs)
• WikiReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -10 +10 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -18 +20 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLConnection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -28 +31 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 
@@ -554 +558 @@
         }
         HttpURLConnection connection = (HttpURLConnection) httpURL.openConnection();
+        connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString());
         return connection;
     }
     
+    /**
+     * Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
+     * @param url The url to open
+     * @return An stream for the given URL
+     * @throws IOException if an I/O exception occurs.
+     * @since 5867
+     */
+    public static InputStream openURL(URL url) throws IOException {
+        URLConnection connection = url.openConnection();
+        connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString());
+        connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+        connection.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
+        return connection.getInputStream();
+    }
+
+    /**
+     * Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
+     * @param url The url to open
+     * @return An buffered stream reader for the given URL (using UTF-8)
+     * @throws IOException if an I/O exception occurs.
+     * @since 5867
+     */
+    public static BufferedReader openURLReader(URL url) throws IOException {
+        return new BufferedReader(new InputStreamReader(openURL(url), "utf-8"));
+    }
+
     /**
      * Opens a HTTP connection to the given URL, sets the User-Agent property to JOSM's one and optionnaly disables Keep-Alive.

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URL;
 
@@ -36 +35 @@
      */
     public String read(String url) throws IOException {
-        BufferedReader in = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "utf-8"));
+        BufferedReader in = Utils.openURLReader(new URL(url));
         try {
             if (url.startsWith(baseurl) && !url.endsWith("?format=txt"))
@@ -60 +59 @@
 
     private String readLang(URL url) throws IOException {
-        InputStream in = url.openStream();
+        BufferedReader in = Utils.openURLReader(url);
         try {
-            return readFromTrac(new BufferedReader(new InputStreamReader(in, "utf-8")));
+            return readFromTrac(in);
         } finally {
             in.close();
@@ -78 +77 @@
     }
 
-    private String readFromTrac(BufferedReader in) throws IOException {
+    protected String readFromTrac(BufferedReader in) throws IOException {
         boolean inside = false;
         boolean transl = false;