Context Navigation

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

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/gui/widgets

Files:

-              r5886
+              r5887
 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 {
 …
         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;
+    }
+}

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

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

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

r5886	r5887
34	34	* <li>Select All</li>
35	35	* </ul>
36		* @since 5885
	36	* @since 5886
37	37	*/
38	38	public class TextContextualPopupMenu extends JPopupMenu {

Note: See TracChangeset for help on using the changeset viewer.