[jboss-cvs] JBossAS SVN: r81456 - in projects/jboss-man/trunk: metatype/src/main/java/org/jboss/metatype/api/values and 1 other directories.

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

Author: alesj
Date: 2008-11-21 19:21:42 -0500 (Fri, 21 Nov 2008)
New Revision: 81456

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java
   projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/MetaValueFactory.java
   projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
Log:
Use map instead of ifs.

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java	2008-11-21 22:53:06 UTC (rev 81455)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractInstanceClassFactory.java	2008-11-22 00:21:42 UTC (rev 81456)
@@ -219,8 +219,7 @@
       MetaType propertyType = property.getMetaType();
       if (AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE == propertyType)
       {
-         GenericValue gvs = getManagedObjectValue(beanInfo, property, metaData, value);
-         return gvs;
+         return getManagedObjectValue(beanInfo, property, metaData, value);
       }
       else if (propertyType.isArray())
       {
@@ -380,9 +379,9 @@
       String name = getPropertyName(property);
       PropertyInfo propertyInfo = beanInfo.getProperty(name);
 
-      Object unwrapValue = metaValueFactory.unwrap(value, propertyInfo.getType());
-      return unwrapValue;
+      return metaValueFactory.unwrap(value, propertyInfo.getType());
    }
+
    protected void setValue(BeanInfo beanInfo, PropertyInfo propertyInfo, Object object, Object unwrapValue)
       throws Throwable
    {

Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/MetaValueFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/MetaValueFactory.java	2008-11-21 22:53:06 UTC (rev 81455)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/api/values/MetaValueFactory.java	2008-11-22 00:21:42 UTC (rev 81456)
@@ -31,6 +31,7 @@
  * MetaValueFactory.
  *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public abstract class MetaValueFactory

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	2008-11-21 22:53:06 UTC (rev 81455)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2008-11-22 00:21:42 UTC (rev 81456)
@@ -93,7 +93,23 @@
 {
    /** The metatype factory */
    private MetaTypeFactory metaTypeFactory = MetaTypeFactory.getInstance();
-   
+
+   /** The primitive default value map */
+   private static final Map<Class<?>, Object> primitiveDefaultValueMap;
+
+   static
+   {
+      primitiveDefaultValueMap = new HashMap<Class<?>, Object>();
+      primitiveDefaultValueMap.put(byte.class, (byte)0);
+      primitiveDefaultValueMap.put(boolean.class, false);
+      primitiveDefaultValueMap.put(char.class, '0');
+      primitiveDefaultValueMap.put(short.class, (short)0);
+      primitiveDefaultValueMap.put(int.class, 0);
+      primitiveDefaultValueMap.put(long.class, 0l);
+      primitiveDefaultValueMap.put(float.class, (float)0);
+      primitiveDefaultValueMap.put(double.class, (double)0);
+   }
+
    /** The configuration */
    private static Configuration configuration;
 
@@ -275,27 +291,16 @@
       return oa;      
    }
 
+   /**
+    *  Map null to primitive.
+    *
+    * @param type the type info
+    * @return default value
+    */
    @SuppressWarnings("deprecation")
    public static Object mapNullToPrimitive(TypeInfo type)
    {
-      Object zero = null;
-      if(type.getType() == byte.class)
-         zero = new Byte((byte)0);
-      else if(type.getType() == boolean.class)
-         zero = Boolean.FALSE;
-      else if(type.getType() == char.class)
-         zero = new Character('0');
-      else if(type.getType() == short.class)
-         zero = new Short((short)0);
-      else if(type.getType() == int.class)
-         zero = new Integer(0);
-      else if(type.getType() == long.class)
-         zero = new Long(0);
-      else if(type.getType() == float.class)
-         zero = new Float(0);
-      else if(type.getType() == double.class)
-         zero = new Double(0);
-      return zero;
+      return primitiveDefaultValueMap.get(type.getType());
    }
 
    /**