jdk-sandbox: comparison jdk/src/share/classes/java/beans/PropertyEditorManager.java

equal deleted inserted replaced

-:7603aea0ec0e
+:db0929bb4cd4
 /*
-* Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1996-2008 Sun Microsystems, Inc.  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.  Sun designates this
 * have any questions.
 */
 package java.beans;
+import com.sun.beans.WeakCache;
 import sun.beans.editors.*;
 /**
 * The PropertyEditorManager can be used to locate a property editor for
 * any given type name.  This property editor must support the
 */
 public class PropertyEditorManager {
 /**
-* Register an editor class to be used to edit values of
+* Registers an editor class to edit values of the given target class.
-* a given target class.
+* If the editor class is {@code null},
+* then any existing definition will be removed.
+* Thus this method can be used to cancel the registration.
+* The registration is canceled automatically
+* if either the target or editor class is unloaded.
+* <p>
+* If there is a security manager, its {@code checkPropertiesAccess}
+* method is called. This could result in a {@linkplain SecurityException}.
 *
-* <p>First, if there is a security manager, its <code>checkPropertiesAccess</code>
+* @param targetType   the class object of the type to be edited
-* method is called. This could result in a SecurityException.
+* @param editorClass  the class object of the editor class
+* @throws SecurityException  if a security manager exists and
+*                            its {@code checkPropertiesAccess} method
+*                            doesn't allow setting of system properties
 *
-* @param targetType the Class object of the type to be edited
-* @param editorClass the Class object of the editor class.  If
-*     this is null, then any existing definition will be removed.
-* @exception  SecurityException  if a security manager exists and its
-*             <code>checkPropertiesAccess</code> method doesn't allow setting
-*              of system properties.
 * @see SecurityManager#checkPropertiesAccess
 */
+public static synchronized void registerEditor(Class<?> targetType, Class<?> editorClass) {
-public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
 SecurityManager sm = System.getSecurityManager();
 if (sm != null) {
 sm.checkPropertiesAccess();
 }
-initialize();
+registry.put(targetType, editorClass);
-if (editorClass == null) {
-registry.remove(targetType);
-} else {
-registry.put(targetType, editorClass);
-}
 }
 /**
 * Locate a value editor for a given target type.
 *
 * @param targetType  The Class object for the type to be edited
 * @return An editor object for the given target class.
 * The result is null if no suitable editor can be found.
 */
 public static synchronized PropertyEditor findEditor(Class<?> targetType) {
-initialize();
+Class editorClass = registry.get(targetType);
-Class editorClass = (Class)registry.get(targetType);
 if (editorClass != null) {
 try {
 Object o = editorClass.newInstance();
 return (PropertyEditor)o;
 } catch (Exception ex) {
 *          order to find property editors.
 * <p>     The default value for this array is implementation-dependent,
 *         e.g. Sun implementation initially sets to  {"sun.beans.editors"}.
 */
 public static synchronized String[] getEditorSearchPath() {
-// Return a copy of the searchPath.
+return searchPath.clone();
-String result[] = new String[searchPath.length];
-System.arraycopy(searchPath, 0, result, 0, searchPath.length);
-return result;
 }
 /**
 * Change the list of package names that will be used for
 *          finding property editors.
 * @exception  SecurityException  if a security manager exists and its
 *             <code>checkPropertiesAccess</code> method doesn't allow setting
 *              of system properties.
 * @see SecurityManager#checkPropertiesAccess
 */
+public static synchronized void setEditorSearchPath(String[] path) {
-public static synchronized void setEditorSearchPath(String path[]) {
 SecurityManager sm = System.getSecurityManager();
 if (sm != null) {
 sm.checkPropertiesAccess();
 }
-if (path == null) {
+searchPath = (path != null)
-path = new String[0];
+? path.clone()
-}
+: EMPTY;
-searchPath = path;
 }
-private static synchronized void initialize() {
+private static String[] searchPath = { "sun.beans.editors" };
-if (registry != null) {
+private static final String[] EMPTY = {};
-return;
+private static final WeakCache<Class<?>, Class<?>> registry;
-}
-registry = new java.util.Hashtable();
+static {
+registry = new WeakCache<Class<?>, Class<?>>();
 registry.put(Byte.TYPE, ByteEditor.class);
 registry.put(Short.TYPE, ShortEditor.class);
 registry.put(Integer.TYPE, IntegerEditor.class);
 registry.put(Long.TYPE, LongEditor.class);
 registry.put(Boolean.TYPE, BooleanEditor.class);
 registry.put(Float.TYPE, FloatEditor.class);
 registry.put(Double.TYPE, DoubleEditor.class);
 }
-private static String[] searchPath = { "sun.beans.editors" };
-private static java.util.Hashtable registry;
 }

changeset 1308	db0929bb4cd4
parent 2	90ce3da70b43
child 3239	f675984c2349