diff --git a/make/sun/Makefile b/make/sun/Makefile index 9d58d543b2f8ad9384fc35a2287a392be28a4717..12d546ee8b8cd191a431c80f283bc8e46424787d 100644 --- a/make/sun/Makefile +++ b/make/sun/Makefile @@ -87,7 +87,7 @@ else endif SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ - jawt font jpeg cmm $(DISPLAY_TOOLS) beans + jawt font jpeg cmm $(DISPLAY_TOOLS) SUBDIRS_management = management SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing SUBDIRS_tools = native2ascii serialver tools jconsole diff --git a/make/sun/beans/Makefile b/make/sun/beans/Makefile deleted file mode 100644 index b525eb4fa2448c6fdf31a53eaa5b019656d9ac79..0000000000000000000000000000000000000000 --- a/make/sun/beans/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 1997, 2005, 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. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# 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. -# - -# -# Makefile for building sun.beans.* -# - -BUILDDIR = ../.. -PACKAGE = sun.beans -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -AUTO_FILES_JAVA_DIRS = sun/beans - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk diff --git a/src/share/classes/sun/beans/editors/BooleanEditor.java b/src/share/classes/com/sun/beans/editors/BooleanEditor.java similarity index 96% rename from src/share/classes/sun/beans/editors/BooleanEditor.java rename to src/share/classes/com/sun/beans/editors/BooleanEditor.java index 60103f53aa99b9af84f3e4bf5b18dc275f8a946e..69aca3238c93327ce87774764d837d39246f9c90 100644 --- a/src/share/classes/sun/beans/editors/BooleanEditor.java +++ b/src/share/classes/com/sun/beans/editors/BooleanEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "boolean" type. diff --git a/src/share/classes/sun/beans/editors/ByteEditor.java b/src/share/classes/com/sun/beans/editors/ByteEditor.java similarity index 94% rename from src/share/classes/sun/beans/editors/ByteEditor.java rename to src/share/classes/com/sun/beans/editors/ByteEditor.java index fb31293e8cb83b32a41d10291b454d5dda1d105b..2f4f342774f44a4d2070fc33f78851dfb43289f1 100644 --- a/src/share/classes/sun/beans/editors/ByteEditor.java +++ b/src/share/classes/com/sun/beans/editors/ByteEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "byte" type. diff --git a/src/share/classes/sun/beans/editors/ColorEditor.java b/src/share/classes/com/sun/beans/editors/ColorEditor.java similarity index 98% rename from src/share/classes/sun/beans/editors/ColorEditor.java rename to src/share/classes/com/sun/beans/editors/ColorEditor.java index 82ff2d680eb4d809b231b95c49f87f4a88133e43..377af057bd9912a75a3aa58c8eff01e3abb56ef9 100644 --- a/src/share/classes/sun/beans/editors/ColorEditor.java +++ b/src/share/classes/com/sun/beans/editors/ColorEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; import java.awt.*; import java.beans.*; diff --git a/src/share/classes/sun/beans/editors/DoubleEditor.java b/src/share/classes/com/sun/beans/editors/DoubleEditor.java similarity index 93% rename from src/share/classes/sun/beans/editors/DoubleEditor.java rename to src/share/classes/com/sun/beans/editors/DoubleEditor.java index e99d46779aba437626f5f632281f2efc5dba7e3e..55d5a0528a445d96fc7d6e1028ae9c8570ffdfa6 100644 --- a/src/share/classes/sun/beans/editors/DoubleEditor.java +++ b/src/share/classes/com/sun/beans/editors/DoubleEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "double" type. diff --git a/src/share/classes/sun/beans/editors/EnumEditor.java b/src/share/classes/com/sun/beans/editors/EnumEditor.java similarity index 97% rename from src/share/classes/sun/beans/editors/EnumEditor.java rename to src/share/classes/com/sun/beans/editors/EnumEditor.java index 1da56fc1938d0ab66d94eecb2fc9a97b387331fc..6275977d34475247983132d6fe7c6a6164fe0130 100644 --- a/src/share/classes/sun/beans/editors/EnumEditor.java +++ b/src/share/classes/com/sun/beans/editors/EnumEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; import java.awt.Component; import java.awt.Graphics; diff --git a/src/share/classes/sun/beans/editors/FloatEditor.java b/src/share/classes/com/sun/beans/editors/FloatEditor.java similarity index 94% rename from src/share/classes/sun/beans/editors/FloatEditor.java rename to src/share/classes/com/sun/beans/editors/FloatEditor.java index 85da73d0158a5050d10ef9b8e1203941c0a3eb1f..4723c489cc0510623ffd8ab2d42e74cbe0ad6ac9 100644 --- a/src/share/classes/sun/beans/editors/FloatEditor.java +++ b/src/share/classes/com/sun/beans/editors/FloatEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "float" type. diff --git a/src/share/classes/sun/beans/editors/FontEditor.java b/src/share/classes/com/sun/beans/editors/FontEditor.java similarity index 98% rename from src/share/classes/sun/beans/editors/FontEditor.java rename to src/share/classes/com/sun/beans/editors/FontEditor.java index b6d6911bda158ab394c6396a56def512e7d0f034..108ac5e2e5b19848398c7ff6c03e363d82a19d86 100644 --- a/src/share/classes/sun/beans/editors/FontEditor.java +++ b/src/share/classes/com/sun/beans/editors/FontEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; import java.awt.*; import java.beans.*; diff --git a/src/share/classes/sun/beans/editors/IntegerEditor.java b/src/share/classes/com/sun/beans/editors/IntegerEditor.java similarity index 93% rename from src/share/classes/sun/beans/editors/IntegerEditor.java rename to src/share/classes/com/sun/beans/editors/IntegerEditor.java index 216596af452ce79f70df6f864e469327b99e0a00..066b7143ac603a307cf2c1dbd6f29b51a07caff1 100644 --- a/src/share/classes/sun/beans/editors/IntegerEditor.java +++ b/src/share/classes/com/sun/beans/editors/IntegerEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "int" type. diff --git a/src/share/classes/sun/beans/editors/LongEditor.java b/src/share/classes/com/sun/beans/editors/LongEditor.java similarity index 94% rename from src/share/classes/sun/beans/editors/LongEditor.java rename to src/share/classes/com/sun/beans/editors/LongEditor.java index 8d0ad3a795d3fd34db37942e439e821e90bf6155..3a8efbba53cfc99b8f68f0b71dd282bc5355dc88 100644 --- a/src/share/classes/sun/beans/editors/LongEditor.java +++ b/src/share/classes/com/sun/beans/editors/LongEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "long" type. diff --git a/src/share/classes/sun/beans/editors/NumberEditor.java b/src/share/classes/com/sun/beans/editors/NumberEditor.java similarity index 93% rename from src/share/classes/sun/beans/editors/NumberEditor.java rename to src/share/classes/com/sun/beans/editors/NumberEditor.java index 2325f97f2efc7f588d45b7bd3d3984b75bc33676..3941e2cf0bcb673048ae53d5b8d8fdec037be235 100644 --- a/src/share/classes/sun/beans/editors/NumberEditor.java +++ b/src/share/classes/com/sun/beans/editors/NumberEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Abstract Property editor for a java builtin number types. diff --git a/src/share/classes/sun/beans/editors/ShortEditor.java b/src/share/classes/com/sun/beans/editors/ShortEditor.java similarity index 94% rename from src/share/classes/sun/beans/editors/ShortEditor.java rename to src/share/classes/com/sun/beans/editors/ShortEditor.java index 8eee3f895040293d188f481935ad63c059c6b547..cf82eef215d6d8607adc44900c972e6c4ae14ec8 100644 --- a/src/share/classes/sun/beans/editors/ShortEditor.java +++ b/src/share/classes/com/sun/beans/editors/ShortEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -24,7 +24,7 @@ */ -package sun.beans.editors; +package com.sun.beans.editors; /** * Property editor for a java builtin "short" type. diff --git a/src/share/classes/sun/beans/editors/StringEditor.java b/src/share/classes/com/sun/beans/editors/StringEditor.java similarity index 96% rename from src/share/classes/sun/beans/editors/StringEditor.java rename to src/share/classes/com/sun/beans/editors/StringEditor.java index 23a8a72f1dc0ba6ec02320d12de0c2a540eeb010..2f1cde46ea0b5e3ed89689b9997c6a0826468eaf 100644 --- a/src/share/classes/sun/beans/editors/StringEditor.java +++ b/src/share/classes/com/sun/beans/editors/StringEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -24,7 +24,7 @@ */ -package sun.beans.editors; +package com.sun.beans.editors; import java.beans.*; diff --git a/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java b/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java index ec9d0df4df79552dc7130902c4705c4f55a0b4f7..28af1a4c1b25d0200200ffa7b6e9a6e746b07c8c 100644 --- a/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java +++ b/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012, 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 @@ -42,6 +42,7 @@ public final class BeanInfoFinder extends InstanceFinder { private static final String DEFAULT = "sun.beans.infos"; + private static final String DEFAULT_NEW = "com.sun.beans.infos"; public BeanInfoFinder() { super(BeanInfo.class, true, "BeanInfo", DEFAULT); @@ -53,10 +54,13 @@ public final class BeanInfoFinder @Override protected BeanInfo instantiate(Class type, String prefix, String name) { + if (DEFAULT.equals(prefix)) { + prefix = DEFAULT_NEW; + } // this optimization will only use the BeanInfo search path // if is has changed from the original // or trying to get the ComponentBeanInfo - BeanInfo info = !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name) + BeanInfo info = !DEFAULT_NEW.equals(prefix) || "ComponentBeanInfo".equals(name) ? super.instantiate(type, prefix, name) : null; diff --git a/src/share/classes/com/sun/beans/finder/ClassFinder.java b/src/share/classes/com/sun/beans/finder/ClassFinder.java index d5ba14839ba178256b9c2ade63ec6fea23d5c47a..9d53235a8da7853336c5ec78a395a5850df8619d 100644 --- a/src/share/classes/com/sun/beans/finder/ClassFinder.java +++ b/src/share/classes/com/sun/beans/finder/ClassFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -24,6 +24,8 @@ */ package com.sun.beans.finder; +import static sun.reflect.misc.ReflectUtil.checkPackageAccess; + /** * This is utility class that provides {@code static} methods * to find a class with the specified name using the specified class loader. @@ -54,6 +56,7 @@ public final class ClassFinder { * @see Thread#getContextClassLoader() */ public static Class findClass(String name) throws ClassNotFoundException { + checkPackageAccess(name); try { ClassLoader loader = Thread.currentThread().getContextClassLoader(); if (loader == null) { @@ -94,6 +97,7 @@ public final class ClassFinder { * @see Class#forName(String,boolean,ClassLoader) */ public static Class findClass(String name, ClassLoader loader) throws ClassNotFoundException { + checkPackageAccess(name); if (loader != null) { try { return Class.forName(name, false, loader); diff --git a/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java b/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java index 45c19da1cf3abb19dc2cec8a85082a48827bc4bb..c4097cc0575fdd20c7c68b677d3a946f915d4f40 100644 --- a/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java +++ b/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012, 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 @@ -28,14 +28,14 @@ import com.sun.beans.WeakCache; import java.beans.PropertyEditor; -import sun.beans.editors.BooleanEditor; -import sun.beans.editors.ByteEditor; -import sun.beans.editors.DoubleEditor; -import sun.beans.editors.EnumEditor; -import sun.beans.editors.FloatEditor; -import sun.beans.editors.IntegerEditor; -import sun.beans.editors.LongEditor; -import sun.beans.editors.ShortEditor; +import com.sun.beans.editors.BooleanEditor; +import com.sun.beans.editors.ByteEditor; +import com.sun.beans.editors.DoubleEditor; +import com.sun.beans.editors.EnumEditor; +import com.sun.beans.editors.FloatEditor; +import com.sun.beans.editors.IntegerEditor; +import com.sun.beans.editors.LongEditor; +import com.sun.beans.editors.ShortEditor; /** * This is utility class that provides functionality @@ -48,10 +48,13 @@ import sun.beans.editors.ShortEditor; public final class PropertyEditorFinder extends InstanceFinder { + private static final String DEFAULT = "sun.beans.editors"; + private static final String DEFAULT_NEW = "com.sun.beans.editors"; + private final WeakCache, Class> registry; public PropertyEditorFinder() { - super(PropertyEditor.class, false, "Editor", "sun.beans.editors"); + super(PropertyEditor.class, false, "Editor", DEFAULT); this.registry = new WeakCache, Class>(); this.registry.put(Byte.TYPE, ByteEditor.class); @@ -84,4 +87,9 @@ public final class PropertyEditorFinder } return editor; } + + @Override + protected PropertyEditor instantiate(Class type, String prefix, String name) { + return super.instantiate(type, DEFAULT.equals(prefix) ? DEFAULT_NEW : prefix, name); + } } diff --git a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java b/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java similarity index 96% rename from src/share/classes/sun/beans/infos/ComponentBeanInfo.java rename to src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java index ae6631f1f3149670292c099da4e96413b248ed4e..1514b0050747df028ac20f967c2e7aa482d8c1ac 100644 --- a/src/share/classes/sun/beans/infos/ComponentBeanInfo.java +++ b/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, 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 @@ -23,7 +23,7 @@ * questions. */ -package sun.beans.infos; +package com.sun.beans.infos; import java.beans.*; diff --git a/test/java/beans/Introspector/4520754/Test4520754.java b/test/java/beans/Introspector/4520754/Test4520754.java index e94a1667d53d22d3c0f5e59d0d17c690b1dff4e7..affb71257dcf1f857338d31df2f452f0fc4bbfa5 100644 --- a/test/java/beans/Introspector/4520754/Test4520754.java +++ b/test/java/beans/Introspector/4520754/Test4520754.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, 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 @@ -58,7 +58,7 @@ public class Test4520754 { public static void main(String[] args) { // ensure that 4168475 does not regress test4168475(Component.class); - // AWT classes (sun.beans.infos.ComponentBeanInfo) + // AWT classes (com.sun.beans.infos.ComponentBeanInfo) test(null, Button.class, Component.class, List.class, Menu.class, Panel.class); // Swing classes (dt.jar) test(null, JApplet.class, JButton.class, JCheckBox.class); diff --git a/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java b/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java index e07254a2d169163aff45f4226f58aefd575f9c35..0f110398badf9439b0f225fefe77439c386163b2 100644 --- a/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java +++ b/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2012, 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 @@ -36,17 +36,17 @@ import java.awt.Font; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; -import sun.beans.editors.BooleanEditor; -import sun.beans.editors.ByteEditor; -import sun.beans.editors.ColorEditor; -import sun.beans.editors.DoubleEditor; -import sun.beans.editors.EnumEditor; -import sun.beans.editors.FloatEditor; -import sun.beans.editors.FontEditor; -import sun.beans.editors.IntegerEditor; -import sun.beans.editors.LongEditor; -import sun.beans.editors.ShortEditor; -import sun.beans.editors.StringEditor; +import com.sun.beans.editors.BooleanEditor; +import com.sun.beans.editors.ByteEditor; +import com.sun.beans.editors.ColorEditor; +import com.sun.beans.editors.DoubleEditor; +import com.sun.beans.editors.EnumEditor; +import com.sun.beans.editors.FloatEditor; +import com.sun.beans.editors.FontEditor; +import com.sun.beans.editors.IntegerEditor; +import com.sun.beans.editors.LongEditor; +import com.sun.beans.editors.ShortEditor; +import com.sun.beans.editors.StringEditor; public class TestPropertyEditor implements Runnable { diff --git a/test/java/beans/PropertyEditor/Test6963811.java b/test/java/beans/PropertyEditor/Test6963811.java index a3e6c89169a1dc23bf25439386616eb9f94e3cee..345a6db6357250f39707de6500775e2d218424e6 100644 --- a/test/java/beans/PropertyEditor/Test6963811.java +++ b/test/java/beans/PropertyEditor/Test6963811.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, 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 @@ -29,7 +29,7 @@ */ import java.beans.PropertyEditorManager; -import sun.beans.editors.StringEditor; +import com.sun.beans.editors.StringEditor; public class Test6963811 implements Runnable { private final long time;