[jboss-cvs] JBossAS SVN: r70564 - in projects/microcontainer/trunk/metatype/src: tests/org/jboss/test/metatype/types/factory/test and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-03-07 18:27:22 -0500 (Fri, 07 Mar 2008)
New Revision: 70564

Modified:
   projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
   projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java
   projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java
Log:
Sourcecode tidyup

Modified: projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2008-03-07 23:15:14 UTC (rev 70563)
+++ projects/microcontainer/trunk/metatype/src/main/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java	2008-03-07 23:27:22 UTC (rev 70564)
@@ -35,7 +35,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.Stack;
@@ -394,6 +393,7 @@
     * @param mapping the mapping
     * @return the composite value
     */
+   @SuppressWarnings("unchecked")
    public CompositeValue createCompositeValue(CompositeMetaType type, Object value, Map<Object, MetaValue> mapping)
    {
       if (value == null)
@@ -404,7 +404,7 @@
       {
          if((value instanceof Map) == false)
             throw new RuntimeException("Expected Map value for: " + type+", was: "+(value != null ? value.getClass() : "null"));
-         Map<String,?> map = (Map<String,?>) value;
+         Map<String,?> map = (Map) value;
          MapCompositeMetaType mapType = (MapCompositeMetaType) type;
          MetaType mapValueType = mapType.getValueType();
          MapCompositeValueSupport result = new MapCompositeValueSupport(mapValueType);

Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java	2008-03-07 23:15:14 UTC (rev 70563)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/types/factory/test/CompositeMetaTypeFactoryUnitTestCase.java	2008-03-07 23:27:22 UTC (rev 70564)
@@ -171,6 +171,8 @@
    /**
     * Illustrate the expected type when type does not contain the
     * generic parameter type information.
+    * 
+    * @throws Exception for any error
     */
    public void testMapWithStringKeyErasure()
       throws Exception

Modified: projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java	2008-03-07 23:15:14 UTC (rev 70563)
+++ projects/microcontainer/trunk/metatype/src/tests/org/jboss/test/metatype/values/factory/test/CompositeValueFactoryUnitTestCase.java	2008-03-07 23:27:22 UTC (rev 70564)
@@ -29,8 +29,8 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.jboss.metatype.api.types.CompositeMetaType;
-import org.jboss.metatype.api.types.MapCompositeMetaType;
+import junit.framework.Test;
+
 import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.CompositeValue;
 import org.jboss.metatype.api.values.CompositeValueSupport;
@@ -43,8 +43,6 @@
 import org.jboss.test.metatype.values.factory.support.TestRenamedCompositeItem;
 import org.jboss.test.metatype.values.factory.support.TestSimpleComposite;
 
-import junit.framework.Test;
-
 /**
  * CompositeValueFactoryUnitTestCase.
  *