diff --git a/jdk/src/share/classes/javax/swing/text/html/EditableView.java b/jdk/src/share/classes/javax/swing/text/html/EditableView.java index 3a5fa648efa..3ef2c655600 100644 --- a/jdk/src/share/classes/javax/swing/text/html/EditableView.java +++ b/jdk/src/share/classes/javax/swing/text/html/EditableView.java @@ -73,7 +73,7 @@ class EditableView extends ComponentView { Component c = getComponent(); Container host = getContainer(); - if (host != null && + if (host instanceof JTextComponent && isVisible != ((JTextComponent)host).isEditable()) { isVisible = ((JTextComponent)host).isEditable(); preferenceChanged(null, true, true); diff --git a/jdk/test/javax/swing/text/html/8034955/bug8034955.java b/jdk/test/javax/swing/text/html/8034955/bug8034955.java new file mode 100644 index 00000000000..3e7bba2130e --- /dev/null +++ b/jdk/test/javax/swing/text/html/8034955/bug8034955.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2014, 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. + */ + +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.SwingUtilities; + +/** + * @test + * @bug 8034955 + * @author Alexander Scherbatiy + * @summary JLabel/JToolTip throw ClassCastException for "a" + * @run main bug8034955 + */ +public class bug8034955 { + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + + @Override + public void run() { + JFrame frame = new JFrame(); + frame.getContentPane().add(new JLabel("<html>a<title>")); + frame.pack(); + frame.setVisible(true); + } + }); + } +}