Changeset 5887 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java (modified) (2 diffs)

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;
+    }
 }