Skip to content

Commit cd3e4c0

Browse files
aivanov-jdkaivanov-jdk
committedMay 24, 2024
8326734: text-decoration applied to <span> lost when mixed with <u> or <s>
8325620: HTMLReader uses ConvertAction instead of specified CharacterAction for <b>, <i>, <u> Reviewed-by: honkar, prr
1 parent c2cca2a commit cd3e4c0

File tree

8 files changed

+563
-56
lines changed

8 files changed

+563
-56
lines changed
 

‎src/java.desktop/share/classes/javax/swing/text/html/CSS.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -843,6 +843,18 @@ Object getInternalCSSValue(CSS.Attribute key, String value) {
843843
return r != null ? r : conv.parseCssValue(key.getDefaultValue());
844844
}
845845

846+
static Object mergeTextDecoration(String value) {
847+
boolean underline = value.contains("underline");
848+
boolean strikeThrough = value.contains("line-through");
849+
if (!underline && !strikeThrough) {
850+
return null;
851+
}
852+
String newValue = underline && strikeThrough
853+
? "underline,line-through"
854+
: (underline ? "underline" : "line-through");
855+
return new StringValue().parseCssValue(newValue);
856+
}
857+
846858
/**
847859
* Maps from a StyleConstants to a CSS Attribute.
848860
*/

‎src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java

+36-35
Original file line numberDiff line numberDiff line change
@@ -2499,7 +2499,7 @@ public HTMLReader(int offset, int popDepth, int pushDepth,
24992499
tagMap.put(HTML.Tag.SCRIPT, ha);
25002500
tagMap.put(HTML.Tag.SELECT, fa);
25012501
tagMap.put(HTML.Tag.SMALL, ca);
2502-
tagMap.put(HTML.Tag.SPAN, ca);
2502+
tagMap.put(HTML.Tag.SPAN, new ConvertSpanAction());
25032503
tagMap.put(HTML.Tag.STRIKE, conv);
25042504
tagMap.put(HTML.Tag.S, conv);
25052505
tagMap.put(HTML.Tag.STRONG, ca);
@@ -3423,47 +3423,53 @@ public void start(HTML.Tag t, MutableAttributeSet attr) {
34233423
if (styleAttributes != null) {
34243424
charAttr.addAttributes(styleAttributes);
34253425
}
3426+
3427+
convertAttributes(t, attr);
34263428
}
34273429

34283430
public void end(HTML.Tag t) {
34293431
popCharacterStyle();
34303432
}
3433+
3434+
/**
3435+
* Converts HTML tags to CSS attributes.
3436+
* @param t the current HTML tag
3437+
* @param attr the attributes of the HTML tag
3438+
*/
3439+
void convertAttributes(HTML.Tag t, MutableAttributeSet attr) {
3440+
}
3441+
}
3442+
3443+
final class ConvertSpanAction extends CharacterAction {
3444+
@Override
3445+
void convertAttributes(HTML.Tag t, MutableAttributeSet attr) {
3446+
Object newDecoration = attr.getAttribute(CSS.Attribute.TEXT_DECORATION);
3447+
Object previousDecoration =
3448+
charAttrStack.peek()
3449+
.getAttribute(CSS.Attribute.TEXT_DECORATION);
3450+
3451+
if (newDecoration != null
3452+
&& !"none".equals(newDecoration.toString())
3453+
&& previousDecoration != null
3454+
&& !"none".equals(previousDecoration.toString())) {
3455+
StyleSheet sheet = getStyleSheet();
3456+
sheet.addCSSAttribute(charAttr,
3457+
CSS.Attribute.TEXT_DECORATION,
3458+
CSS.mergeTextDecoration(newDecoration + ","
3459+
+ previousDecoration)
3460+
.toString());
3461+
}
3462+
}
34313463
}
34323464

34333465
/**
34343466
* Provides conversion of HTML tag/attribute
34353467
* mappings that have a corresponding StyleConstants
34363468
* and CSS mapping. The conversion is to CSS attributes.
34373469
*/
3438-
class ConvertAction extends TagAction {
3439-
3440-
public void start(HTML.Tag t, MutableAttributeSet attr) {
3441-
pushCharacterStyle();
3442-
if (!foundInsertTag) {
3443-
// Note that the third argument should really be based off
3444-
// inParagraph and impliedP. If we're wrong (that is
3445-
// insertTagDepthDelta shouldn't be changed), we'll end up
3446-
// removing an extra EndSpec, which won't matter anyway.
3447-
boolean insert = canInsertTag(t, attr, false);
3448-
if (foundInsertTag) {
3449-
if (!inParagraph) {
3450-
inParagraph = impliedP = true;
3451-
}
3452-
}
3453-
if (!insert) {
3454-
return;
3455-
}
3456-
}
3457-
if (attr.isDefined(IMPLIED)) {
3458-
attr.removeAttribute(IMPLIED);
3459-
}
3460-
if (styleAttributes != null) {
3461-
charAttr.addAttributes(styleAttributes);
3462-
}
3463-
// We also need to add attr, otherwise we lose custom
3464-
// attributes, including class/id for style lookups, and
3465-
// further confuse style lookup (doesn't have tag).
3466-
charAttr.addAttribute(t, attr.copyAttributes());
3470+
final class ConvertAction extends CharacterAction {
3471+
@Override
3472+
void convertAttributes(HTML.Tag t, MutableAttributeSet attr) {
34673473
StyleSheet sheet = getStyleSheet();
34683474
if (t == HTML.Tag.B) {
34693475
sheet.addCSSAttribute(charAttr, CSS.Attribute.FONT_WEIGHT, "bold");
@@ -3504,11 +3510,6 @@ public void start(HTML.Tag t, MutableAttributeSet attr) {
35043510
}
35053511
}
35063512
}
3507-
3508-
public void end(HTML.Tag t) {
3509-
popCharacterStyle();
3510-
}
3511-
35123513
}
35133514

35143515
class AnchorAction extends CharacterAction {

‎src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java

+26-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,16 @@
2424
*/
2525
package javax.swing.text.html;
2626

27-
import javax.swing.text.*;
2827
import java.io.Serializable;
29-
import java.util.*;
28+
import java.util.Arrays;
29+
import java.util.Enumeration;
30+
import java.util.NoSuchElementException;
31+
import java.util.Objects;
32+
import java.util.stream.Collectors;
33+
34+
import javax.swing.text.AttributeSet;
35+
import javax.swing.text.MutableAttributeSet;
36+
import javax.swing.text.SimpleAttributeSet;
3037

3138
/**
3239
* An implementation of <code>AttributeSet</code> that can multiplex
@@ -196,15 +203,24 @@ public AttributeSet copyAttributes() {
196203
* @see AttributeSet#getAttribute
197204
*/
198205
public Object getAttribute(Object key) {
199-
AttributeSet[] as = getAttributes();
200-
int n = as.length;
201-
for (int i = 0; i < n; i++) {
202-
Object o = as[i].getAttribute(key);
203-
if (o != null) {
204-
return o;
206+
final AttributeSet[] as = getAttributes();
207+
final int n = as.length;
208+
if (key != CSS.Attribute.TEXT_DECORATION) {
209+
for (int i = 0; i < n; i++) {
210+
Object o = as[i].getAttribute(key);
211+
if (o != null) {
212+
return o;
213+
}
205214
}
215+
return null;
206216
}
207-
return null;
217+
218+
String values = Arrays.stream(as)
219+
.map(a -> a.getAttribute(key))
220+
.filter(Objects::nonNull)
221+
.map(Object::toString)
222+
.collect(Collectors.joining(","));
223+
return CSS.mergeTextDecoration(values);
208224
}
209225

210226
/**

‎src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java

+66-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,17 +24,53 @@
2424
*/
2525
package javax.swing.text.html;
2626

27-
import sun.swing.SwingUtilities2;
28-
import java.util.*;
29-
import java.awt.*;
30-
import java.io.*;
31-
import java.net.*;
27+
import java.awt.Color;
28+
import java.awt.Component;
29+
import java.awt.Container;
30+
import java.awt.Font;
31+
import java.awt.FontMetrics;
32+
import java.awt.Graphics;
33+
import java.awt.Graphics2D;
34+
import java.awt.Insets;
35+
import java.awt.Rectangle;
36+
import java.awt.RenderingHints;
37+
import java.awt.Shape;
38+
import java.io.BufferedReader;
39+
import java.io.IOException;
40+
import java.io.InputStream;
41+
import java.io.InputStreamReader;
42+
import java.io.Reader;
43+
import java.io.Serializable;
44+
import java.io.StringReader;
45+
import java.net.MalformedURLException;
46+
import java.net.URL;
47+
import java.util.EmptyStackException;
48+
import java.util.Enumeration;
49+
import java.util.HashMap;
50+
import java.util.HashSet;
51+
import java.util.Hashtable;
52+
import java.util.Stack;
53+
import java.util.StringTokenizer;
54+
import java.util.Vector;
55+
3256
import javax.swing.Icon;
3357
import javax.swing.ImageIcon;
3458
import javax.swing.UIManager;
35-
import javax.swing.border.*;
59+
import javax.swing.border.BevelBorder;
60+
import javax.swing.border.Border;
3661
import javax.swing.event.ChangeListener;
37-
import javax.swing.text.*;
62+
import javax.swing.text.AttributeSet;
63+
import javax.swing.text.Document;
64+
import javax.swing.text.Element;
65+
import javax.swing.text.MutableAttributeSet;
66+
import javax.swing.text.SimpleAttributeSet;
67+
import javax.swing.text.Style;
68+
import javax.swing.text.StyleConstants;
69+
import javax.swing.text.StyleContext;
70+
import javax.swing.text.StyledDocument;
71+
import javax.swing.text.View;
72+
73+
import sun.swing.SwingUtilities2;
3874

3975
/**
4076
* Support for defining the visual characteristics of
@@ -2817,10 +2853,31 @@ public Object getAttribute(Object key) {
28172853
return doGetAttribute(key);
28182854
}
28192855

2856+
/**
2857+
* Merges the current value of the 'text-decoration' property
2858+
* with the value from parent.
2859+
*/
2860+
private Object getTextDecoration(Object value) {
2861+
AttributeSet parent = getResolveParent();
2862+
if (parent == null) {
2863+
return value;
2864+
}
2865+
2866+
Object parentValue = parent.getAttribute(CSS.Attribute.TEXT_DECORATION);
2867+
return parentValue == null
2868+
? value
2869+
: CSS.mergeTextDecoration(value + "," + parentValue);
2870+
}
2871+
28202872
Object doGetAttribute(Object key) {
28212873
Object retValue = super.getAttribute(key);
28222874
if (retValue != null) {
2823-
return retValue;
2875+
if (key != CSS.Attribute.TEXT_DECORATION) {
2876+
return retValue;
2877+
} else {
2878+
// Merge current value with parent
2879+
return getTextDecoration(retValue);
2880+
}
28242881
}
28252882

28262883
if (key == CSS.Attribute.FONT_SIZE) {

‎test/jdk/javax/swing/text/html/HTMLDocument/HTMLStrikeOnly.java

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.Dimension;
25+
import java.awt.Graphics;
26+
import java.awt.image.BufferedImage;
27+
import java.io.File;
28+
import java.io.IOException;
29+
30+
import javax.imageio.ImageIO;
31+
import javax.swing.JEditorPane;
32+
import javax.swing.text.View;
33+
import javax.swing.text.html.CSS;
34+
35+
/*
36+
* @test
37+
* @bug 8326734
38+
* @summary Tests different combinations of setting 'line-through'
39+
* @run main HTMLStrikeOnly
40+
*/
41+
public class HTMLStrikeOnly {
42+
private static final String HTML = """
43+
<!DOCTYPE html>
44+
<html lang="en">
45+
<head>
46+
<meta charset="UTF-8">
47+
<title>line-through</title>
48+
<style>
49+
.lineThrough { text-decoration: line-through }
50+
</style>
51+
</head>
52+
<body>
53+
<p><s><span style='text-decoration: line-through'>line-through?</span></s></p>
54+
<p><strike><span style='text-decoration: line-through'>line-through?</span></strike></p>
55+
<p><span style='text-decoration: line-through'><s>line-through?</s></span></p>
56+
<p><span style='text-decoration: line-through'><strike>line-through?</strike></span></p>
57+
58+
<p><s><span class="lineThrough">line-through?</span></s></p>
59+
<p><strike><span class="lineThrough">line-through?</span></strike></p>
60+
<p><span class="lineThrough"><s>line-through?</s></span></p>
61+
<p><span class="lineThrough"><strike>line-through?</strike></span></p>
62+
63+
<p style='text-decoration: line-through'><s>line-through?</s></p>
64+
<p style='text-decoration: line-through'><strike>line-through?</strike></p>
65+
<p style='text-decoration: line-through'><span style='text-decoration: line-through'>line-through?</span></p>
66+
67+
<p class="lineThrough"><s>line-through</s></p>
68+
<p class="lineThrough"><strike>line-through</strike></p>
69+
<p class="lineThrough"><span style='text-decoration: line-through'>line-through</span></p>
70+
<p class="lineThrough"><span class="lineThrough">line-through</span></p>
71+
</body>
72+
</html>
73+
""";
74+
public static void main(String[] args) {
75+
final JEditorPane html = new JEditorPane("text/html", HTML);
76+
html.setEditable(false);
77+
78+
final Dimension size = html.getPreferredSize();
79+
html.setSize(size);
80+
81+
BufferedImage image = new BufferedImage(size.width, size.height,
82+
BufferedImage.TYPE_INT_RGB);
83+
Graphics g = image.createGraphics();
84+
// Paint the editor pane to ensure all views are created
85+
html.paint(g);
86+
g.dispose();
87+
88+
int errorCount = 0;
89+
String firstError = null;
90+
91+
System.out.println("----- Views -----");
92+
final View bodyView = html.getUI()
93+
.getRootView(html)
94+
.getView(1)
95+
.getView(1);
96+
for (int i = 0; i < bodyView.getViewCount(); i++) {
97+
View pView = bodyView.getView(i);
98+
View contentView = getContentView(pView);
99+
100+
String decoration =
101+
contentView.getAttributes()
102+
.getAttribute(CSS.Attribute.TEXT_DECORATION)
103+
.toString();
104+
105+
System.out.println(i + ": " + decoration);
106+
if (!decoration.contains("line-through")
107+
|| decoration.contains("underline")) {
108+
errorCount++;
109+
if (firstError == null) {
110+
firstError = "Line " + i + ": " + decoration;
111+
}
112+
}
113+
}
114+
115+
if (errorCount > 0) {
116+
saveImage(image);
117+
throw new RuntimeException(errorCount + " error(s) found, "
118+
+ "the first one: " + firstError);
119+
}
120+
}
121+
122+
private static View getContentView(View parent) {
123+
View view = parent.getView(0);
124+
return view.getViewCount() > 0
125+
? getContentView(view)
126+
: view;
127+
}
128+
129+
private static void saveImage(BufferedImage image) {
130+
try {
131+
ImageIO.write(image, "png",
132+
new File("html.png"));
133+
} catch (IOException ignored) { }
134+
}
135+
}

‎test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecoration.java

+157
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.Dimension;
25+
import java.awt.Graphics;
26+
import java.awt.image.BufferedImage;
27+
import java.io.File;
28+
import java.io.IOException;
29+
30+
import javax.imageio.ImageIO;
31+
import javax.swing.JEditorPane;
32+
import javax.swing.text.View;
33+
import javax.swing.text.html.CSS;
34+
35+
/*
36+
* @test
37+
* @bug 8323801 8326734
38+
* @summary Tests different combination of 'underline' and 'line-through';
39+
* the text should render with both 'underline' and 'line-through'.
40+
* @run main HTMLTextDecoration
41+
*/
42+
public final class HTMLTextDecoration {
43+
private static final String HTML = """
44+
<!DOCTYPE html>
45+
<html lang="en">
46+
<head>
47+
<meta charset="UTF-8">
48+
<title>underline + line-through text</title>
49+
<style>
50+
.underline { text-decoration: underline }
51+
.lineThrough { text-decoration: line-through }
52+
</style>
53+
</head>
54+
<body>
55+
<p><u><span style='text-decoration: line-through'>underline + line-through?</span></u></p>
56+
<p><s><span style='text-decoration: underline'>underline + line-through?</span></s></p>
57+
<p><strike><span style='text-decoration: underline'>underline + line-through?</span></strike></p>
58+
59+
<p><span style='text-decoration: line-through'><u>underline + line-through?</u></span></p>
60+
<p><span style='text-decoration: underline'><s>underline + line-through?</s></span></p>
61+
<p><span style='text-decoration: underline'><strike>underline + line-through?</strike></span></p>
62+
63+
<p><span style='text-decoration: line-through'><span style='text-decoration: underline'>underline + line-through?</span></span></p>
64+
<p><span style='text-decoration: underline'><span style='text-decoration: line-through'>underline + line-through?</span></span></p>
65+
66+
<p style='text-decoration: line-through'><u>underline + line-through?</u></p>
67+
<p style='text-decoration: underline'><s>underline + line-through?</s></p>
68+
<p style='text-decoration: underline'><strike>underline + line-through?</strike></p>
69+
70+
<p style='text-decoration: line-through'><span style='text-decoration: underline'>underline + line-through?</span></p>
71+
<p style='text-decoration: underline'><span style='text-decoration: line-through'>underline + line-through?</span></p>
72+
73+
<p class="underline"><span class="lineThrough">underline + line-through?</span></p>
74+
<p class="underline"><s>underline + line-through?</s></p>
75+
<p class="underline"><strike>underline + line-through?</strike></p>
76+
77+
<p class="lineThrough"><span class="underline">underline + line-through?</span></p>
78+
<p class="lineThrough"><u>underline + line-through?</u></p>
79+
80+
<div class="underline"><span class="lineThrough">underline + line-through?</span></div>
81+
<div class="underline"><s>underline + line-through?</s></div>
82+
<div class="underline"><strike>underline + line-through?</strike></div>
83+
84+
<div class="lineThrough"><span class="underline">underline + line-through?</span></div>
85+
<div class="lineThrough"><u>underline + line-through?</u></div>
86+
87+
<div class="underline"><p class="lineThrough">underline + line-through?</p></div>
88+
<div class="lineThrough"><p class="underline">underline + line-through?</p></div>
89+
90+
<div class="underline"><div class="lineThrough">underline + line-through?</div></div>
91+
<div class="lineThrough"><div class="underline">underline + line-through?</div></div>
92+
</body>
93+
</html>
94+
""";
95+
96+
public static void main(String[] args) {
97+
final JEditorPane html = new JEditorPane("text/html", HTML);
98+
html.setEditable(false);
99+
100+
final Dimension size = html.getPreferredSize();
101+
html.setSize(size);
102+
103+
BufferedImage image = new BufferedImage(size.width, size.height,
104+
BufferedImage.TYPE_INT_RGB);
105+
Graphics g = image.createGraphics();
106+
// Paint the editor pane to ensure all views are created
107+
html.paint(g);
108+
g.dispose();
109+
110+
int errorCount = 0;
111+
String firstError = null;
112+
113+
System.out.println("----- Views -----");
114+
final View bodyView = html.getUI()
115+
.getRootView(html)
116+
.getView(1)
117+
.getView(1);
118+
for (int i = 0; i < bodyView.getViewCount(); i++) {
119+
View pView = bodyView.getView(i);
120+
View contentView = getContentView(pView);
121+
122+
String decoration =
123+
contentView.getAttributes()
124+
.getAttribute(CSS.Attribute.TEXT_DECORATION)
125+
.toString();
126+
127+
System.out.println(i + ": " + decoration);
128+
if (!decoration.contains("underline")
129+
|| !decoration.contains("line-through")) {
130+
errorCount++;
131+
if (firstError == null) {
132+
firstError = "Line " + i + ": " + decoration;
133+
}
134+
}
135+
}
136+
137+
if (errorCount > 0) {
138+
saveImage(image);
139+
throw new RuntimeException(errorCount + " error(s) found, "
140+
+ "the first one: " + firstError);
141+
}
142+
}
143+
144+
private static View getContentView(View parent) {
145+
View view = parent.getView(0);
146+
return view.getViewCount() > 0
147+
? getContentView(view)
148+
: view;
149+
}
150+
151+
private static void saveImage(BufferedImage image) {
152+
try {
153+
ImageIO.write(image, "png",
154+
new File("html.png"));
155+
} catch (IOException ignored) { }
156+
}
157+
}

‎test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineOnly.java

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.Dimension;
25+
import java.awt.Graphics;
26+
import java.awt.image.BufferedImage;
27+
import java.io.File;
28+
import java.io.IOException;
29+
30+
import javax.imageio.ImageIO;
31+
import javax.swing.JEditorPane;
32+
import javax.swing.text.View;
33+
import javax.swing.text.html.CSS;
34+
35+
/*
36+
* @test
37+
* @bug 8326734
38+
* @summary Tests different combinations of setting 'underline'
39+
* @run main HTMLUnderlineOnly
40+
*/
41+
public class HTMLUnderlineOnly {
42+
private static final String HTML = """
43+
<!DOCTYPE html>
44+
<html lang="en">
45+
<head>
46+
<meta charset="UTF-8">
47+
<title>underline</title>
48+
<style>
49+
.underline { text-decoration: underline }
50+
</style>
51+
</head>
52+
<body>
53+
<p><u><span style='text-decoration: underline'>underline?</span></u></p>
54+
<p><span style='text-decoration: underline'><u>underline?</u></span></p>
55+
56+
<p><u><span class="underline">underline?</span></u></p>
57+
<p><span class="underline"><u>underline?</u></span></p>
58+
59+
<p style='text-decoration: underline'><u>underline?</u></p>
60+
<p style='text-decoration: underline'><span style='text-decoration: underline'>underline?</span></p>
61+
62+
<p class="underline"><u>underline</u></p>
63+
<p class="underline"><span style='text-decoration: underline'>underline</span></p>
64+
<p class="underline"><span class="underline">underline</span></p>
65+
</body>
66+
</html>
67+
""";
68+
public static void main(String[] args) {
69+
final JEditorPane html = new JEditorPane("text/html", HTML);
70+
html.setEditable(false);
71+
72+
final Dimension size = html.getPreferredSize();
73+
html.setSize(size);
74+
75+
BufferedImage image = new BufferedImage(size.width, size.height,
76+
BufferedImage.TYPE_INT_RGB);
77+
Graphics g = image.createGraphics();
78+
// Paint the editor pane to ensure all views are created
79+
html.paint(g);
80+
g.dispose();
81+
82+
int errorCount = 0;
83+
String firstError = null;
84+
85+
System.out.println("----- Views -----");
86+
final View bodyView = html.getUI()
87+
.getRootView(html)
88+
.getView(1)
89+
.getView(1);
90+
for (int i = 0; i < bodyView.getViewCount(); i++) {
91+
View pView = bodyView.getView(i);
92+
View contentView = getContentView(pView);
93+
94+
String decoration =
95+
contentView.getAttributes()
96+
.getAttribute(CSS.Attribute.TEXT_DECORATION)
97+
.toString();
98+
99+
System.out.println(i + ": " + decoration);
100+
if (!decoration.contains("underline")
101+
|| decoration.contains("line-through")) {
102+
errorCount++;
103+
if (firstError == null) {
104+
firstError = "Line " + i + ": " + decoration;
105+
}
106+
}
107+
}
108+
109+
if (errorCount > 0) {
110+
saveImage(image);
111+
throw new RuntimeException(errorCount + " error(s) found, "
112+
+ "the first one: " + firstError);
113+
}
114+
}
115+
116+
private static View getContentView(View parent) {
117+
View view = parent.getView(0);
118+
return view.getViewCount() > 0
119+
? getContentView(view)
120+
: view;
121+
}
122+
123+
private static void saveImage(BufferedImage image) {
124+
try {
125+
ImageIO.write(image, "png",
126+
new File("html.png"));
127+
} catch (IOException ignored) { }
128+
}
129+
}

‎test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineStrike.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
/*
3333
* @test
34-
* @bug 8323801
34+
* @bug 8323801 8326734
3535
* @summary Tests that '<u><s>' produce underlined and struck-through text
3636
*/
3737
public final class HTMLUnderlineStrike {

0 commit comments

Comments
 (0)
Please sign in to comment.