Index: modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTextUI.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTextUI.java (revision 507389) +++ modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTextUI.java (working copy) @@ -87,6 +87,7 @@ import org.apache.harmony.awt.text.TextUtils; import org.apache.harmony.x.swing.StringConstants; import org.apache.harmony.x.swing.Utilities; +import org.apache.harmony.x.swing.internal.nls.Messages; public abstract class BasicTextUI extends TextUI implements ViewFactory { @@ -689,12 +690,12 @@ } public void installUI(final JComponent c) { + if (!(c instanceof JTextComponent)) { + throw new Error(Messages.getString("swing.05")); //$NON-NLS-1$ + } + super.installUI(c); - if (c == null || (!(c instanceof JTextComponent))) { - return; - } - setComponent((JTextComponent)c); installDefaults();