[jboss-cvs] JBossAS SVN: r69647 - in projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api: values and 1 other directory.

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

Author: alesj
Date: 2008-02-06 06:12:45 -0500 (Wed, 06 Feb 2008)
New Revision: 69647

Modified:
   projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java
   projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java
Log:
Simple fixes.

Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java	2008-02-06 07:21:34 UTC (rev 69646)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/types/MapCompositeMetaType.java	2008-02-06 11:12:45 UTC (rev 69647)
@@ -21,7 +21,6 @@
  */
 package org.jboss.metatype.api.types;
 
-import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.plugins.types.AbstractCompositeMetaType;
 
 /**
@@ -37,7 +36,7 @@
 
    /**
     * Create a MapCompositeMetaType with the given value metatype.
-    * @param valueType
+    * @param valueType the value meta type
     */
    public MapCompositeMetaType(MetaType valueType)
    {
@@ -47,10 +46,10 @@
 
    /**
     * Add a new key/item to the type
-    * @param itemName
+    * @param itemName the item name
     */
    public void addItem(String itemName)
    {
-      super.addItem(itemName, itemName, valueType);
+      addItem(itemName, itemName, valueType);
    }
 }

Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java	2008-02-06 07:21:34 UTC (rev 69646)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/api/values/MapCompositeValueSupport.java	2008-02-06 11:12:45 UTC (rev 69647)
@@ -24,15 +24,12 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.MapCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
-import org.jboss.metatype.api.types.SimpleMetaType;
-import org.jboss.metatype.api.values.AbstractMetaValue;
-import org.jboss.metatype.api.values.CompositeValue;
-import org.jboss.metatype.api.values.MetaValue;
 
 /**
  * A CompositeValue for Map<String,MetaValue> 
@@ -40,20 +37,21 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
-public class MapCompositeValueSupport extends AbstractMetaValue
-   implements CompositeValue
+public class MapCompositeValueSupport extends AbstractMetaValue implements CompositeValue
 {
    private static final long serialVersionUID = 1;
    private Map<String, MetaValue> map;
-   private MapCompositeMetaType mapType = new MapCompositeMetaType(SimpleMetaType.STRING);
+   private MapCompositeMetaType mapType;
 
    public MapCompositeValueSupport(MetaType valueType)
    {
       this(null, valueType);
    }
+
    public MapCompositeValueSupport(Map<String, MetaValue> map, MetaType valueType)
    {
-      this.map = new HashMap<String, MetaValue>();
+      this.map = createMap();
+      this.mapType = new MapCompositeMetaType(valueType);
       if(map != null)
       {
          for(Map.Entry<String, MetaValue> entry : map.entrySet())
@@ -61,6 +59,17 @@
       }
    }
 
+   /**
+    * Create map instance.
+    * Default is hash map.
+    *
+    * @return the map
+    */
+   protected Map<String, MetaValue> createMap()
+   {
+      return new HashMap<String, MetaValue>();
+   }
+
    public boolean containsKey(String key)
    {
       return map.containsKey(key);
@@ -75,6 +84,7 @@
    {
       return map.get(key);
    }
+
    public void put(String key, MetaValue value)
    {
       if(mapType.containsItem(key) == false)
@@ -84,7 +94,7 @@
 
    public MetaValue[] getAll(String[] keys)
    {
-      ArrayList<MetaValue> values = new ArrayList();
+      List<MetaValue> values = new ArrayList<MetaValue>();
       if(keys != null)
       {
          for(String key : keys)
@@ -93,7 +103,7 @@
             values.add(value);
          }
       }
-      MetaValue[] mvs = {};
+      MetaValue[] mvs = new MetaValue[values.size()];
       return values.toArray(mvs);
    }