8133108: [PIT] Container size is wrong in JEditorPane
Reviewed-by: alexsch, azvegint
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java Wed Sep 16 10:05:34 2015 +0300
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java Wed Sep 16 10:11:14 2015 +0300
@@ -97,7 +97,13 @@
String kind = elem.getName();
if (kind != null) {
if (kind.equals(AbstractDocument.ContentElementName)) {
- return new GlyphView(elem);
+ return new GlyphView(elem){
+ @Override
+ public float getMinimumSpan(int axis) {
+ // no wrap
+ return getPreferredSpan(axis);
+ }
+ };
} else if (kind.equals(AbstractDocument.ParagraphElementName)) {
return new I18nFieldView(elem);
}
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java Wed Sep 16 10:05:34 2015 +0300
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java Wed Sep 16 10:11:14 2015 +0300
@@ -550,11 +550,6 @@
*/
@Override
public float getMinimumSpan(int axis) {
- int w = getResizeWeight(axis);
- if (w == 0) {
- // can't resize
- return getPreferredSpan(axis);
- }
switch (axis) {
case View.X_AXIS:
if (minimumSpan < 0) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java Wed Sep 16 10:11:14 2015 +0300
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2015, 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 8133108
+ @summary [PIT] Container size is wrong in JEditorPane
+ @author Semyon Sadetsky
+ */
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.html.CSS;
+import java.awt.*;
+
+public class JTextPaneDocumentWrapping {
+
+ private static JFrame frame;
+ private static JTextPane jTextPane;
+ private static int position;
+
+ public static void main(String[] args) throws Exception{
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame = new JFrame();
+ frame.setUndecorated(true);
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ frame.setSize(200, 200);
+ jTextPane = new JTextPane();
+ jTextPane.setContentType("text/html");
+ jTextPane.setText(
+ "<html><body><b id='test'>Test Test Test Test Test Test " +
+ "Test Test Test Test Test Test Test Test Test Test " +
+ "Test Test Test Test Test Test Test Test Test Test" +
+ "</b></body></html>");
+ frame.getContentPane().add(jTextPane);
+ frame.setVisible(true);
+ }
+ });
+ Robot robot = new Robot();
+ robot.waitForIdle();
+ robot.delay(200);
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ position = jTextPane.modelToView(100).y;
+ SimpleAttributeSet wrap = new SimpleAttributeSet();
+ wrap.addAttribute(CSS.Attribute.WHITE_SPACE, "nowrap");
+ jTextPane.getStyledDocument()
+ .setParagraphAttributes(0, 10, wrap, true);
+ } catch (BadLocationException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ if(position < 40) {
+ throw new RuntimeException("Text is not wrapped " + position);
+ }
+ robot.waitForIdle();
+ robot.delay(200);
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ position = jTextPane.modelToView(100).y;
+ } catch (BadLocationException e) {
+ e.printStackTrace();
+ }
+ frame.dispose();
+ }
+ });
+ if(position > 20) {
+ throw new RuntimeException("Text is wrapped " + position);
+ }
+ System.out.println("ok");
+
+ }
+}