[jboss-cvs] JBossAS SVN: r87720 - in projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values: mappers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-04-23 07:35:00 -0400 (Thu, 23 Apr 2009)
New Revision: 87720

Modified:
   projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
   projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java
Log:
Fix ON ctor usage everywhere.

Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2009-04-23 11:33:23 UTC (rev 87719)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2009-04-23 11:35:00 UTC (rev 87720)
@@ -41,9 +41,7 @@
 import java.util.SortedSet;
 import java.util.Stack;
 import java.util.WeakHashMap;
-import java.util.Enumeration;
 import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
 
 import org.jboss.beans.info.spi.BeanInfo;
 import org.jboss.beans.info.spi.PropertyInfo;
@@ -80,6 +78,7 @@
 import org.jboss.metatype.api.values.TableValue;
 import org.jboss.metatype.api.values.TableValueSupport;
 import org.jboss.metatype.plugins.types.DefaultMetaTypeFactory;
+import org.jboss.metatype.plugins.values.mappers.PropertiesObjectNameMetaMapper;
 import org.jboss.metatype.spi.values.MetaMapper;
 import org.jboss.metatype.spi.values.MetaValueBuilder;
 import org.jboss.reflect.plugins.introspection.ParameterizedClassInfo;
@@ -91,8 +90,8 @@
 /**
  * DefaultMetaValueFactory.
  * 
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision$
  */
 public class DefaultMetaValueFactory extends MetaValueFactory
@@ -734,35 +733,6 @@
       return newElement;
    }
 
-   /**
-    * Create object name from PropertiesMetaValue.
-    * Make it JDK 1.6 compatible.
-    *
-    * @param domainUnwrap the domain name
-    * @param props the props
-    * @return new ObjectName instance
-    * @throws MalformedObjectNameException for any error
-    */
-   protected ObjectName createObjectName(String domainUnwrap, PropertiesMetaValue props) throws MalformedObjectNameException
-   {
-      if (props == null)
-         return new ObjectName(domainUnwrap);
-
-      Hashtable<String, String> table = new Hashtable<String, String>();
-      Enumeration<?> enumeration = props.propertyNames();
-      while (enumeration.hasMoreElements())
-      {
-         Object key = enumeration.nextElement();
-         if (key instanceof String)
-         {
-            String stringKey = (String)key;
-            String property = props.getProperty(stringKey);
-            table.put(stringKey, property);
-         }
-      }
-      return new ObjectName(domainUnwrap, table);
-   }
-
    protected Object unwrapProperties(PropertiesMetaValue propsValue, TypeInfo type)
    {
       Class<?> clazz = type.getType();
@@ -773,7 +743,7 @@
          ObjectName name;
          try
          {
-            name = createObjectName(domainUnwrap, propsValue);
+            name = PropertiesObjectNameMetaMapper.createObjectName(domainUnwrap, propsValue);
          }
          catch (Exception e)
          {
@@ -828,7 +798,7 @@
             if(keys instanceof PropertiesMetaValue)
                keysUnwrap = (PropertiesMetaValue) keys;
 
-            return createObjectName(domainUnwrap, keysUnwrap);
+            return PropertiesObjectNameMetaMapper.createObjectName(domainUnwrap, keysUnwrap);
          }
 
          Object bean = createNewInstance(beanInfo);

Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java	2009-04-23 11:33:23 UTC (rev 87719)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java	2009-04-23 11:35:00 UTC (rev 87720)
@@ -25,8 +25,11 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Hashtable;
+import java.util.Enumeration;
 
 import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
 
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.PropertiesMetaType;
@@ -35,8 +38,10 @@
 import org.jboss.metatype.spi.values.MetaMapper;
 
 /**
- * An ObjectName MetaMapper that maps to a PropertiesMetaType/PropertiesMetaValue
+ * An ObjectName MetaMapper that maps to a PropertiesMetaType/PropertiesMetaValue.
+ *
  * @author Scott.Stark at jboss.org
+ * @author Ales.Justin at jboss.org
  * @version $Revision$
  */
 public class PropertiesObjectNameMetaMapper extends MetaMapper<ObjectName>
@@ -94,11 +99,9 @@
    {
       PropertiesMetaValue map = (PropertiesMetaValue) metaValue;
       String domain = (String) map.remove("domain");
-
       try
       {
-         ObjectName name = new ObjectName(domain, map);
-         return name;
+         return createObjectName(domain, map);
       }
       catch(Exception e)
       {
@@ -106,4 +109,32 @@
       }
    }
 
+   /**
+    * Create object name from PropertiesMetaValue.
+    * Make it JDK 1.6 compatible.
+    *
+    * @param domain the domain name
+    * @param props the props
+    * @return new ObjectName instance
+    * @throws javax.management.MalformedObjectNameException for any error
+    */
+   public static ObjectName createObjectName(String domain, PropertiesMetaValue props) throws MalformedObjectNameException
+   {
+      if (props == null)
+         return new ObjectName(domain);
+
+      Hashtable<String, String> table = new Hashtable<String, String>();
+      Enumeration<?> enumeration = props.propertyNames();
+      while (enumeration.hasMoreElements())
+      {
+         Object key = enumeration.nextElement();
+         if (key instanceof String)
+         {
+            String stringKey = (String)key;
+            String property = props.getProperty(stringKey);
+            table.put(stringKey, property);
+         }
+      }
+      return new ObjectName(domain, table);
+   }
 }