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

Timestamp:

2018-05-26T23:13:23+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #11949 - History dialog: insert <wbr> in username labels to preserve dialog layout for long usernames

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• history/VersionInfoPanel.java (modified) (3 diffs)
• widgets/UrlLabel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -264 +264 @@
                 username = user.getName();
             }
-            lblUser.setDescription(username);
+            lblUser.setDescription(insertWbr(username), false);
             if (user != null && user != User.getAnonymous()) {
                 lblUser.setUrl(getUserUrl(username));
@@ -276 +276 @@
                 lblUser.setUrl(null);
             } else {
-                lblUser.setDescription(username);
+                lblUser.setDescription(insertWbr(username), false);
                 lblUser.setUrl(getUserUrl(username));
             }
@@ -293 +293 @@
     }
 
+    private static String insertWbr(String s) {
+        return Utils.escapeReservedCharactersHTML(s).replace("_", "_<wbr>");
+    }
+
     protected static void updateText(Changeset cs, String attr, JTextArea textArea, JLabel label, Changeset oppCs, JComponent container) {
         final String text = cs != null ? cs.get(attr) : null;

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

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -102 +103 @@
      */
     public final void setDescription(String description) {
+        setDescription(description, true);
+    }
+
+    /**
+     * Sets the text part of the URL label. Defaults to the empty string if description is null.
+     *
+     * @param description the description
+     * @param escapeReservedCharacters if {@code true}, HTML reserved characters will be escaped
+     * @since 13853
+     */
+    public final void setDescription(String description, boolean escapeReservedCharacters) {
         this.description = description == null ? "" : description;
-        this.description = this.description.replace("&", "&amp;").replace(">", "&gt;").replace("<", "&lt;");
+        if (escapeReservedCharacters) {
+            this.description = Utils.escapeReservedCharactersHTML(this.description);
+        }
         refresh();
     }