Changeset 5887 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-04-20T02:24:00+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8606 - Fix user-agent used with JEditorPage.setPage() or JEditorPane(URL) + fix version number from previous commit

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/widgets/JosmEditorPane.java (modified) (2 diffs)
• gui/widgets/JosmTextArea.java (modified) (1 diff)
• gui/widgets/JosmTextField.java (modified) (1 diff)
• gui/widgets/PopupMenuLauncher.java (modified) (1 diff)
• gui/widgets/TextContextualPopupMenu.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java

@@ -3 +3 @@
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.net.URLConnection;
 
 import javax.swing.JEditorPane;
 
+import org.openstreetmap.josm.tools.Utils;
+
 /**
- * Subclass of {@link JEditorPane} that adds a "native" context menu (cut/copy/paste/select all).
- * @since 5885
+ * Subclass of {@link JEditorPane} that adds a "native" context menu (cut/copy/paste/select all)
+ * and effectively uses JOSM user agent when performing HTTP request in {@link #setPage(URL)} method.
+ * @since 5886
  */
 public class JosmEditorPane extends JEditorPane {
@@ -59 +64 @@
         setText(text);
     }
+
+    @Override
+    protected InputStream getStream(URL page) throws IOException {
+        URLConnection conn = Utils.setupURLConnection(page.openConnection());
+        InputStream result = conn.getInputStream();
+        String type = conn.getContentType();
+        if (type != null) {
+            setContentType(type);
+        }
+        return result;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java

@@ -7 +7 @@
 /**
  * Subclass of {@link JTextArea} that adds a "native" context menu (cut/copy/paste/select all).
- * @since 5885
+ * @since 5886
  */
 public class JosmTextArea extends JTextArea {

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

@@ -7 +7 @@
 /**
  * Subclass of {@link JTextField} that adds a "native" context menu (cut/copy/paste/select all).
- * @since 5885
+ * @since 5886
  */
 public class JosmTextField extends JTextField {

trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java

@@ -39 +39 @@
      * @param menu The popup menu to display
      * @param checkEnabled if {@code true}, the popup menu will only be displayed if the component triggering the mouse event is enabled
-     * @since 5885
+     * @since 5886
      */
     public PopupMenuLauncher(JPopupMenu menu, boolean checkEnabled) {

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -34 +34 @@
  * <li>Select All</li>
  * </ul>
- * @since 5885
+ * @since 5886
  */
 public class TextContextualPopupMenu extends JPopupMenu {

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

@@ -586 +586 @@
      */
     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();
+        return setupURLConnection(url.openConnection()).getInputStream();
+    }
+
+    /***
+     * Setups the given URL connection to match JOSM needs by setting its User-Agent and timeout properties.
+     * @param connection The connection to setup
+     * @return {@code connection}, with updated properties
+     * @since 5887
+     */
+    public static URLConnection setupURLConnection(URLConnection connection) {
+        if (connection != null) {
+            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;
     }