stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5074006: Swing JOptionPane shows </html> tag as a string after newline

Browse Source 
8042134: JOptionPane bungles HTML messages

Reviewed-by: jdv, tr
This commit is contained in:
Prasanta Sadhukhan 2022-10-31 12:30:23 +00:00
parent 274ea1db5b
commit 91072ee393
2 changed files with 132 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
View File

@ -456,51 +456,75 @@ public class BasicOptionPaneUI extends OptionPaneUI {
} else if ((nl = s.indexOf('\n')) >= 0) {
nll = 1;
}
if (nl >= 0) {
// break up newlines
if (nl == 0) {
@SuppressWarnings("serial") // anonymous class
JPanel breakPanel = new JPanel() {
public Dimension getPreferredSize() {
Font f = getFont();
if (f != null) {
return new Dimension(1, f.getSize() + 2);
}
return new Dimension(0, 0);
}
};
breakPanel.setName("OptionPane.break");
addMessageComponents(container, cons, breakPanel, maxll,
true);
} else {
addMessageComponents(container, cons, s.substring(0, nl),
maxll, false);
if (s.contains("<html>")) {
/* line break in html text is done by <br> tag
* and not by /n so it's incorrect to address newline
* same as non-html text.
* Text between <html> </html> tags are extracted
* and rendered as JLabel text
*/
int index1 = s.indexOf("<html>");
int index2 = s.indexOf("</html>");
String str = "";
if (index2 >= 0) {
str = s.substring(index2 + "</html>".length());
s = s.substring(index1, index2 + + "</html>".length());
}
// Prevent recursion of more than
// 200 successive newlines in a message
// and indicate message is truncated via ellipsis
if (recursionCount++ > 200) {
recursionCount = 0;
addMessageComponents(container, cons, new String("..."),
maxll,false);
return;
}
addMessageComponents(container, cons, s.substring(nl + nll), maxll,
false);
} else if (len > maxll) {
Container c = Box.createVerticalBox();
c.setName("OptionPane.verticalBox");
burstStringInto(c, s, maxll);
addMessageComponents(container, cons, c, maxll, true );
} else {
JLabel label;
label = new JLabel( s, JLabel.LEADING );
label = new JLabel(s, JLabel.LEADING);
label.setName("OptionPane.label");
configureMessageLabel(label);
addMessageComponents(container, cons, label, maxll, true);
if (!str.isEmpty()) {
addMessageComponents(container, cons, str, maxll, false);
}
} else {
if (nl >= 0) {
// break up newlines
if (nl == 0) {
@SuppressWarnings("serial") // anonymous class
JPanel breakPanel = new JPanel() {
public Dimension getPreferredSize() {
Font f = getFont();
if (f != null) {
return new Dimension(1, f.getSize() + 2);
}
return new Dimension(0, 0);
}
};
breakPanel.setName("OptionPane.break");
addMessageComponents(container, cons, breakPanel, maxll,
true);
} else {
addMessageComponents(container, cons, s.substring(0, nl),
maxll, false);
}
// Prevent recursion of more than
// 200 successive newlines in a message
// and indicate message is truncated via ellipsis
if (recursionCount++ > 200) {
recursionCount = 0;
addMessageComponents(container, cons, new String("..."),
maxll, false);
return;
}
addMessageComponents(container, cons, s.substring(nl + nll), maxll,
false);
} else if (len > maxll) {
Container c = Box.createVerticalBox();
c.setName("OptionPane.verticalBox");
burstStringInto(c, s, maxll);
addMessageComponents(container, cons, c, maxll, true);
} else {
JLabel label;
label = new JLabel(s, JLabel.LEADING);
label.setName("OptionPane.label");
configureMessageLabel(label);
addMessageComponents(container, cons, label, maxll, true);
}
}
}
}

68
test/jdk/javax/swing/JOptionPane/TestJOptionHTMLTag.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 5074006
* @key headful
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @summary Swing JOptionPane shows <html> tag as a string after newline
* @run main/manual TestJOptionHTMLTag
*/
import javax.swing.JDialog;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
public class TestJOptionHTMLTag {
static String instructions
= """
INSTRUCTIONS:
A dialog will be shown.
If it does not contain </html> string, press Pass else press Fail.
""";
static PassFailJFrame passFailJFrame;
public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
try {
String message = "<html>" + "This is a test\n" + "</html>";
JOptionPane optionPane = new JOptionPane();
optionPane.setMessage(message);
optionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
JDialog dialog = new JDialog();
dialog.setContentPane(optionPane);
dialog.pack();
dialog.setVisible(true);
passFailJFrame = new PassFailJFrame(instructions);
PassFailJFrame.addTestWindow(dialog);
PassFailJFrame.positionTestWindow(dialog, PassFailJFrame.Position.HORIZONTAL);
} catch (Exception e) {
e.printStackTrace();
}
});
passFailJFrame.awaitAndCheck();
}
}