Changeset 13122 in josm for trunk/src

Timestamp:

2017-11-14T01:41:49+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15550 - Automatic line break of note tooltips (tested on western and ideographic scripts)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -17 +17 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import javax.swing.Action;
@@ -58 +59 @@
 public class NoteLayer extends AbstractModifiableLayer implements MouseListener, NoteDataUpdateListener {
 
+    /**
+     * Pattern to detect end of sentences followed by another one, or a link, in western script.
+     * Group 1 (capturing): period, interrogation mark, exclamation mark
+     * Group non capturing: at least one horizontal or vertical whitespace
+     * Group 2 (capturing): a letter (any script), or any punctuation
+     */
+    private static final Pattern SENTENCE_MARKS_WESTERN = Pattern.compile("([\\.\\?\\!])(?:[\\h\\v]+)([\\p{L}\\p{Punct}])");
+
+    /**
+     * Pattern to detect end of sentences followed by another one, or a link, in eastern script.
+     * Group 1 (capturing): ideographic full stop
+     * Group 2 (capturing): a letter (any script), or any punctuation
+     */
+    private static final Pattern SENTENCE_MARKS_EASTERN = Pattern.compile("(\\u3002)([\\p{L}\\p{Punct}])");
+
     private final NoteData noteData;
 
@@ -205 +221 @@
         Dimension d = displayedPanel.getPreferredSize();
         if (d.width > mv.getWidth() / 2) {
-            // To make sure long notes such as https://www.openstreetmap.org/note/278197 are displayed correctly
-            displayedPanel.setText(text.replaceAll("\\. ([\\p{Lower}\\p{Upper}\\p{Punct}])", "\\.<br>$1"));
-        }
+            // To make sure long notes are displayed correctly
+            displayedPanel.setText(insertLineBreaks(text));
+        }
+    }
+
+    /**
+     * Inserts HTML line breaks ({@code <br>} at the end of each sentence mark
+     * (period, interrogation mark, exclamation mark, ideographic full stop).
+     * @param longText a long text that does not fit on a single line without exceeding half of the map view
+     * @return text with line breaks
+     */
+    static String insertLineBreaks(String longText) {
+        return SENTENCE_MARKS_WESTERN.matcher(SENTENCE_MARKS_EASTERN.matcher(longText).replaceAll("$1<br>$2")).replaceAll("$1<br>$2");
     }