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

Timestamp:

2013-06-29T01:23:39+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8827 - HTML rendering differ if run before or after having launched Help Browser

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• HelpAwareOptionPane.java (modified) (2 diffs)
• help/HelpBrowser.java (modified) (3 diffs)
• io/UploadParameterSummaryPanel.java (modified) (2 diffs)
• widgets/HtmlPanel.java (modified) (3 diffs)
• widgets/JosmHTMLEditorKit.java (added)

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -21 +21 @@
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -284 +284 @@
      */
     static public void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic)  {
-        SwingUtilities.invokeLater(new Runnable() {
+        GuiHelper.runInEDT(new Runnable() {
             public void run() {
                 showOptionDialog(parentComponent, msg, title, messageType, null, null, null, helpTopic);

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -41 +41 @@
 import javax.swing.text.html.HTML.Tag;
 import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
@@ -49 +48 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
@@ -168 +168 @@
     protected void build() {
         help = new JosmEditorPane();
-        HTMLEditorKit kit = new HTMLEditorKit();
+        JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
         kit.setStyleSheet(buildStyleSheet());
         help.setEditorKit(kit);

trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

@@ -17 +17 @@
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
-import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
 
+// FIXME this class should extend HtmlPanel instead (duplicated code in here)
 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
     private UploadStrategySpecification spec = new UploadStrategySpecification();
@@ -127 +128 @@
         ss.addRule(rule);
         ss.addRule("a {text-decoration: underline; color: blue}");
-        HTMLEditorKit kit = new HTMLEditorKit();
+        JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
         kit.setStyleSheet(ss);
         jepMessage.setEditorKit(kit);

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

@@ -9 +9 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
-import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
@@ -19 +18 @@
  * blue and they are underlined. There is also a CSS rule for the HTML tag <strong>
  * configured.
- *
+ * @since 2688
  */
 public class HtmlPanel extends JPanel {
@@ -50 +49 @@
         ss.addRule("a {text-decoration: underline; color: blue}");
         ss.addRule("ul {margin-left: 1cm; list-style-type: disc}");
-        HTMLEditorKit kit = new HTMLEditorKit();
+        JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
         kit.setStyleSheet(ss);
         jepMessage.setEditorKit(kit);