Changeset 8933 in josm

Timestamp:

2015-10-23T14:50:40+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11262 - Images not displayed correctly in Help Browser

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/widgets/JosmHTMLEditorKit.java (modified) (3 diffs)
• gui/widgets/JosmHTMLFactory.java (added)
• gui/widgets/JosmImageView.java (added)
• tools/Utils.java (modified) (1 diff)
• tools/WikiReader.java (modified) (1 diff)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import javax.swing.text.ViewFactory;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
@@ -8 +9 @@
  * A subclass of {@link HTMLEditorKit} that fixes an uncommon design choice that shares the set stylesheet between all instances.
  * This class stores a single stylesheet per instance, as it should have be done by Sun in the first place.
+ * Moreover it allows to display SVG images.
  * @since 6040
  */
 public class JosmHTMLEditorKit extends HTMLEditorKit {
 
-    protected StyleSheet ss = super.getStyleSheet();
+    /** Shared factory for creating HTML Views. */
+    private static final ViewFactory FACTORY = new JosmHTMLFactory();
+
+    private StyleSheet ss = super.getStyleSheet();
 
     /**
@@ -42 +47 @@
         return ss;
     }
+
+    @Override
+    public ViewFactory getViewFactory() {
+        return FACTORY;
+    }
 }

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

@@ -1411 +1411 @@
      */
     public static boolean hasExtension(String filename, String... extensions) {
-        String name = filename.toLowerCase(Locale.ENGLISH);
+        String name = filename.toLowerCase(Locale.ENGLISH).replace("?format=raw", "");
         for (String ext : extensions) {
             if (name.endsWith('.' + ext.toLowerCase(Locale.ENGLISH)))

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

@@ -142 +142 @@
                 // add a border="0" attribute to images, otherwise the internal help browser
                 // will render a thick  border around images inside an <a> element
+                // remove width information to avoid distorded images (fix #11262)
                 b.append(line.replaceAll("<img ", "<img border=\"0\" ")
+                         .replaceAll("width=\"(\\d+)\"", "")
                          .replaceAll("<span class=\"icon\">.</span>", "")
                          .replaceAll("href=\"/", "href=\"" + baseurl + '/')