changeset 9580:1f4842051d8a

8034955: JLabel/JToolTip throw ClassCastException for "<html>a<title>" Reviewed-by: malenkov, pchelko
author alexsch
date Tue, 04 Mar 2014 18:40:06 +0400
parents 838072fb8344
children dc8e3e7356c2
files src/share/classes/javax/swing/text/html/EditableView.java test/javax/swing/text/html/8034955/bug8034955.java
diffstat 2 files changed, 50 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/text/html/EditableView.java	Tue Mar 04 17:29:40 2014 +0400
+++ b/src/share/classes/javax/swing/text/html/EditableView.java	Tue Mar 04 18:40:06 2014 +0400
@@ -73,7 +73,7 @@
         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);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/text/html/8034955/bug8034955.java	Tue Mar 04 18:40:06 2014 +0400
@@ -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 "<html>a<title>"
+ * @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);
+            }
+        });
+    }
+}