You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/04/18 12:10:03 UTC
svn commit: r394898 -
/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java
Author: mloenko
Date: Tue Apr 18 03:10:01 2006
New Revision: 394898
URL: http://svn.apache.org/viewcvs?rev=394898&view=rev
Log:
fix for HARMONY-322
Unable to create a PropertyEditor for classes located in the bootclasspath.
Now if classloader of a targetType is null then context classloader is used to loader the editor
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java?rev=394898&r1=394897&r2=394898&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java Tue Apr 18 03:10:01 2006
@@ -1,128 +1,132 @@
-/*
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.6.6.4 $
- */
-package java.beans;
-
-import java.util.HashMap;
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.6.6.4 $
- */
-
-public class PropertyEditorManager {
-
- private static String[] path = {"org.apache.harmony.beans.editors"};
- private static HashMap registeredEditors = new HashMap();
-
- /**
- */
- public PropertyEditorManager() {
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static void registerEditor(Class targetType, Class editorClass) {
- if (targetType != null) {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPropertiesAccess();
- }
- if (editorClass != null) {
- registeredEditors.put(targetType, editorClass);
- } else {
- registeredEditors.remove(targetType);
- }
- }
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized PropertyEditor findEditor(Class targetType) {
- Class editorClass = null;
- PropertyEditor editor = null;
-
- if (targetType != null) {
- editorClass = (Class) registeredEditors.get(targetType);
-
- if (editorClass == null) {
- String editorClassName = targetType.getName() + "Editor";
-
- try {
- editorClass = Class.forName(
- editorClassName, true, targetType.getClassLoader());
- } catch (ClassNotFoundException cnfe) {
- String shortEditorClassName = editorClassName.substring(
- editorClassName.lastIndexOf(".") + 1);
-
- if(targetType.isPrimitive()) {
- shortEditorClassName =
- shortEditorClassName.substring(0,1).toUpperCase()
- + shortEditorClassName.substring(1);
- }
-
- for (int i = 0; i < path.length; ++i) {
- editorClassName = path[i] + "." + shortEditorClassName;
-
- try {
- editorClass = Class.forName(editorClassName, true,
- targetType.getClassLoader());
- } catch (ClassNotFoundException cnfe2) {
- } catch (Exception e) {
- break;
- }
- }
- } catch (Exception e) {
- }
- }
-
- if (editorClass != null) {
- try {
- editor = (PropertyEditor) editorClass.newInstance();
- } catch (Exception e) {
- }
- }
-
- }
- return editor;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized void setEditorSearchPath(String[] apath) {
- SecurityManager sm = System.getSecurityManager();
-
- if (sm != null) {
- sm.checkPropertiesAccess();
- }
-
- path = apath;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized String[] getEditorSearchPath() {
- return path;
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.6.6.4 $
+ */
+package java.beans;
+
+import java.util.HashMap;
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.6.6.4 $
+ */
+
+public class PropertyEditorManager {
+
+ private static String[] path = {"org.apache.harmony.beans.editors"};
+ private static HashMap registeredEditors = new HashMap();
+
+ /**
+ */
+ public PropertyEditorManager() {
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static void registerEditor(Class targetType, Class editorClass) {
+ if (targetType != null) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPropertiesAccess();
+ }
+ if (editorClass != null) {
+ registeredEditors.put(targetType, editorClass);
+ } else {
+ registeredEditors.remove(targetType);
+ }
+ }
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized PropertyEditor findEditor(Class targetType) {
+ Class editorClass = null;
+ PropertyEditor editor = null;
+
+ if (targetType != null) {
+ editorClass = (Class) registeredEditors.get(targetType);
+
+ if (editorClass == null) {
+ String editorClassName = targetType.getName() + "Editor";
+ ClassLoader loader = targetType.getClassLoader();
+
+ if (loader == null) {
+ loader = Thread.currentThread().getContextClassLoader();
+ }
+
+ try {
+ editorClass = Class.forName(editorClassName, true, loader);
+ } catch (ClassNotFoundException cnfe) {
+ String shortEditorClassName = editorClassName.substring(
+ editorClassName.lastIndexOf(".") + 1);
+
+ if(targetType.isPrimitive()) {
+ shortEditorClassName =
+ shortEditorClassName.substring(0,1).toUpperCase()
+ + shortEditorClassName.substring(1);
+ }
+
+ for (int i = 0; i < path.length; ++i) {
+ editorClassName = path[i] + "." + shortEditorClassName;
+
+ try {
+ editorClass = Class.forName(editorClassName, true,
+ loader);
+ } catch (ClassNotFoundException cnfe2) {
+ } catch (Exception e) {
+ break;
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
+
+ if (editorClass != null) {
+ try {
+ editor = (PropertyEditor) editorClass.newInstance();
+ } catch (Exception e) {
+ }
+ }
+
+ }
+ return editor;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized void setEditorSearchPath(String[] apath) {
+ SecurityManager sm = System.getSecurityManager();
+
+ if (sm != null) {
+ sm.checkPropertiesAccess();
+ }
+
+ path = apath;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized String[] getEditorSearchPath() {
+ return path;
+ }
+}