[patch] Commend and CDATA cause display of double end tag which causes distortion

[stoecker]

When HTML contains CDATA or comments the display is wrong. Reason is that in this case the ">" is handled twice. Following patch solves the issues.

[stoecker]

Index: src/net/boplicity/xmleditor/XmlView.java
===================================================================
--- src/net/boplicity/xmleditor/XmlView.java (Revision 33275)
+++ src/net/boplicity/xmleditor/XmlView.java (Arbeitskopie)
@@ -17,6 +17,7 @@

import java.awt.Color;
import java.awt.Graphics;
+import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.SortedMap;
@@ -62,8 +63,6 @@
patternColors.put(Pattern.compile(TAG_CDATA), Color.GRAY);
patternColors.put(Pattern.compile(TAG_ATTRIBUTE_PATTERN), new Color(
127, 0, 127));
- patternColors.put(Pattern.compile(TAG_END_PATTERN), new Color(63, 127,
- 127));
patternColors.put(Pattern.compile(TAG_ATTRIBUTE_VALUE), new Color(42,
0, 255));
patternColors.put(Pattern.compile(TAG_COMMENT), Color.BLUE);
@@ -103,7 +102,18 @@
colorMap.put(matcher.start(1), entry.getValue());
}
}
+ /* Fix end tag duplication for CDATA and comments */
+ Matcher matcher = Pattern.compile(TAG_END_PATTERN).matcher(text);
+ Color c = new Color(63, 127, 127);
+ Collection<Integer> ends = startMap.values();

+ while (matcher.find()) {
+ if(!ends.contains(matcher.end())) {
+ startMap.put(matcher.start(1), matcher.end());
+ colorMap.put(matcher.start(1), c);
+ }
+ }
+
// TODO: check the map for overlapping parts

int i = 0;

[stoecker]

Aaargh. This Ticket interface is awful, here is a link: https://trac.openstreetmap.org/changeset/33276/subversion?format=diff&new=33276