Sat Sep 30 13:33:07 EDT 2006

Author: alesj
Date: 2006-09-30 13:32:29 -0400 (Sat, 30 Sep 2006)
New Revision: 57306

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
   projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
   projects/microcontainer/trunk/container/src/main/org/jboss/repository/plugins/AbstractKernelRepository.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/classloading/VFSClassLoader.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
   projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVirtualFileHandlerUnitTestCase.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/JARVirtualFileHandlerUnitTestCase.java
   projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java
   projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryKeyInterceptor.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryValueInterceptor.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
Log:
Code cleanup - removing redundant local variables, class casts (not all - some left for better info).

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================

--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -74,9 +74,7 @@
       params.setTarget(target);
       params.setContainerCache(cache);
 
-      Object proxy = proxyFactory.createAdvisedProxy(params);
-
-      return proxy;
+      return proxyFactory.createAdvisedProxy(params);
    }
 
    private Object createTarget(ContainerCache cache) throws Throwable

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -315,18 +315,16 @@
    {
       try
       {
-         ASTAnnotation node = AccessController.doPrivileged(new PrivilegedExceptionAction<ASTAnnotation>()
+
+         return AccessController.doPrivileged(new PrivilegedExceptionAction<ASTAnnotation>()
          {
            public ASTAnnotation run() throws Exception
            {
               AnnotationParser parser = new AnnotationParser(new StringReader(annotationExpr));
-              org.jboss.annotation.factory.ast.ASTStart start = parser.Start();
-              ASTAnnotation node = (ASTAnnotation) start.jjtGetChild(0);
-              return node;
+              ASTStart start = parser.Start();
+              return (ASTAnnotation) start.jjtGetChild(0);
            }
          });
-         
-         return node;
       }
       catch (PrivilegedActionException e)
       {

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationValueFactory.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -124,7 +124,7 @@
       else
       {
          Object[] ret = null;
-         String typeName = ((PrimitiveInfo)componentType).getName();
+         String typeName = componentType.getName();
 
          if (typeName.equals("boolean"))
          {

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -263,8 +263,7 @@
          AnnotationAttributeImpl[] atttributes = new AnnotationAttributeImpl[methods.length];
          for (int i = 0 ; i < methods.length ; i++)
          {
-            AnnotationAttributeImpl impl = new AnnotationAttributeImpl(methods[i].getName(), getTypeInfo(methods[i].getReturnType()), null);
-            atttributes[i] = impl;
+            atttributes[i] = new AnnotationAttributeImpl(methods[i].getName(), getTypeInfo(methods[i].getReturnType()), null);
          }
          ((AnnotationInfoImpl)result).setAttributes(atttributes);
       }
@@ -366,8 +365,7 @@
          {
             public Annotation[] run()
             {
-               Annotation[] annotations =  clazz.getAnnotations();
-               return annotations;
+               return clazz.getAnnotations();
             }
          };
          return AccessController.doPrivileged(action);

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -135,8 +135,7 @@
             AnnotationAttributeImpl[] atttributes = new AnnotationAttributeImpl[methods.length];
             for (int i = 0 ; i < methods.length ; i++)
             {
-               AnnotationAttributeImpl impl = new AnnotationAttributeImpl(methods[i].getName(), getTypeInfo(methods[i].getReturnType()), null);
-               atttributes[i] = impl;
+               atttributes[i] = new AnnotationAttributeImpl(methods[i].getName(), getTypeInfo(methods[i].getReturnType()), null);
             }
             result.setAttributes(atttributes);
             return result;

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/repository/plugins/AbstractKernelRepository.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/repository/plugins/AbstractKernelRepository.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/repository/plugins/AbstractKernelRepository.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -95,8 +95,7 @@
          levelData[n] = (MetaData) maps[n].get(tmpKey);
       }
 
-      Object value = combiner.combine(key, levelData);
-      return value;
+      return combiner.combine(key, levelData);
    }
 
    /**

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/VFSUtils.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -262,8 +262,7 @@
     */
    public static boolean isLink(String name)
    {
-      boolean isLink = name.indexOf(VFS_LINK_PREFIX) >= 0;
-      return isLink;
+      return name.indexOf(VFS_LINK_PREFIX) >= 0;
    }
 
    /**

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/classloading/VFSClassLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/classloading/VFSClassLoader.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/classloading/VFSClassLoader.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -181,8 +181,7 @@
          is.close();
          tmp = baos.toByteArray();
          ProtectionDomain pd = getProtectionDomain(classFile);
-         Class c = super.defineClass(name, tmp, 0, tmp.length, pd);
-         return c;
+         return super.defineClass(name, tmp, 0, tmp.length, pd);
       }
       catch (Exception e)
       {

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -78,8 +78,7 @@
 
       public VirtualFileHandler createChildHandler(String name) throws IOException
       {
-         VirtualFileHandler child = children.get(name);
-         return child;
+         return children.get(name);
       }
 
       public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException
@@ -185,8 +184,7 @@
 
    public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException
    {
-      List<VirtualFileHandler> result = new ArrayList<VirtualFileHandler>(linkTargets.values());
-      return result;
+      return new ArrayList<VirtualFileHandler>(linkTargets.values());
    }
 
    public VirtualFileHandler findChild(String path) throws IOException
@@ -217,8 +215,7 @@
       VFSContext context = factory.getVFS(linkURI);
       VirtualFileHandler rootHandler = context.getRoot();
       // Wrap the handler in a delegate so we can change the parent and name
-      DelegatingHandler handler = new DelegatingHandler(this.getVFSContext(), parent, name, rootHandler);
       // TODO: if the factory caches contexts the root handler may not point to the link
-      return handler;
+      return new DelegatingHandler(this.getVFSContext(), parent, name, rootHandler);
    }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/jar/NestedJarFromStream.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -68,8 +68,7 @@
    {
       if( inited == false )
          init();
-      VirtualFileHandler child = entries.get(name);
-      return child;
+      return entries.get(name);
    }
 
    public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException
@@ -119,8 +118,7 @@
    {
       if( inited == false )
          init();
-      JarEntryContents jec = entries.get(name);
-      return jec;
+      return entries.get(name);
    }
    public ZipEntry getJarEntry(String name)
       throws IOException
@@ -128,8 +126,7 @@
       if( inited == false )
          init();
       JarEntryContents jec = entries.get(name);
-      ZipEntry entry = (jec != null ? jec.getEntry() : null);
-      return entry;
+      return (jec != null ? jec.getEntry() : null);
    }
    public byte[] getContents(String name)
       throws IOException
@@ -137,8 +134,7 @@
       if( inited == false )
          init();
       JarEntryContents jec = entries.get(name);
-      byte[] contents = (jec != null ? jec.getContents() : null);
-      return contents;
+      return (jec != null ? jec.getContents() : null);
    }
 
    public String getName()

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -361,11 +361,11 @@
       PrimitiveValue val = (PrimitiveValue)value;
       TypeInfo type = val.getType();
       assertTrue(PrimitiveInfo.class.isAssignableFrom(type.getClass()));
-      assertTrue(((PrimitiveInfo)type).getName().equals(name));
+      assertTrue((type).getName().equals(name));
       Object obj = null;
       try
       {
-         obj = ((PrimitiveInfo)type).convertValue(val.getValue()); 
+         obj = type.convertValue(val.getValue()); 
       }
       catch (Throwable e)
       {

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -110,9 +110,8 @@
       }
       assertNotNull(info);
       assertTrue(info instanceof ClassInfo);
-      ClassInfo cinfo = (ClassInfo) info;
       //getLog().debug(cinfo);
-      return cinfo;
+      return (ClassInfo) info;
    }
    
    protected void checkTypeSet(HashSet<String> expected, TypeInfo[] typeInfos) throws Throwable

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVirtualFileHandlerUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVirtualFileHandlerUnitTestCase.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/FileVirtualFileHandlerUnitTestCase.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -58,8 +58,7 @@
       URL url = getRootResource(name);
       if (path != null)
          url = new URL(url, path);
-      File file = new File(url.getPath());
-      return file;
+      return new File(url.getPath());
    }
    
    protected VFSContext getVFSContext(String name) throws Exception

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/JARVirtualFileHandlerUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/JARVirtualFileHandlerUnitTestCase.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/JARVirtualFileHandlerUnitTestCase.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -63,8 +63,7 @@
    protected File getRealJarFile(String name) throws Exception
    {
       URL url = getRootResource(name);
-      File file = new File(url.getPath());
-      return file;
+      return new File(url.getPath());
    }
    
    protected JarEntry getRealJarEntry(String name, String path) throws Exception
@@ -73,8 +72,7 @@
       url = JarUtils.createJarURL(url);
       JarURLConnection c = (JarURLConnection) url.openConnection();
       JarFile jarFile = c.getJarFile();
-      JarEntry entry = jarFile.getJarEntry(path);
-      return entry;
+      return jarFile.getJarEntry(path);
    }
    
    protected VFSContext getVFSContext(String name) throws Exception

Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -248,8 +248,7 @@
    
    protected TestDelegate getDelegate1()
    {
-      TestDelegate result = new TestDelegate("Name1");
-      return result;
+      return new TestDelegate("Name1");
    }
    
    protected TestDelegate getDelegate2()

Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -249,8 +249,7 @@
    
    protected TestDelegate getDelegate1()
    {
-      TestDelegate result = new TestDelegate("Name1");
-      return result;
+      return new TestDelegate("Name1");
    }
    
    protected OtherDelegate getDelegate2()

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -119,8 +119,7 @@
       try
       {
          URI uri = file.toURI();
-         String name = uri.toString();
-         return name;
+         return uri.toString();
       }
       catch (Exception e)
       {

Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -75,7 +75,7 @@
       
       try
       {
-         mutable.addAttachment((String) null, "attachment", String.class);
+         mutable.addAttachment(null, "attachment", String.class);
          fail("Should not be here!");
       }
       catch (Throwable t)
@@ -246,7 +246,7 @@
       
       try
       {
-         mutable.removeAttachment((String) null, String.class);
+         mutable.removeAttachment(null, String.class);
          fail("Should not be here!");
       }
       catch (Throwable t)
@@ -400,7 +400,7 @@
       
       try
       {
-         attachments.getAttachment((String) null, String.class);
+         attachments.getAttachment(null, String.class);
          fail("Should not be here!");
       }
       catch (Throwable t)
@@ -445,7 +445,7 @@
       
       try
       {
-         attachments.isAttachmentPresent((String) null, String.class);
+         attachments.isAttachmentPresent(null, String.class);
          fail("Should not be here!");
       }
       catch (Throwable t)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ThisValueMetaData.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -53,8 +53,7 @@
       ControllerContext context = controller.getContext(value, ControllerState.INSTANTIATED);
       if (context == null)
          throw new Error("Could not deference this " + this);
-      Object result = context.getTarget();
-      return result;
+      return context.getTarget();
    }
 
    public void initialVisit(MetaDataVisitor visitor)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -202,7 +202,7 @@
       public Enumeration<Permission> elements()
       {
          final Iterator<Permission> iter = permissions.iterator();
-         Enumeration<Permission> enumerator = new Enumeration<Permission>()
+         return new Enumeration<Permission>()
          {
             public boolean hasMoreElements()
             {
@@ -214,7 +214,6 @@
                return iter.next();
             }
          };
-         return enumerator;
       }
    }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -787,8 +787,7 @@
       {
          ParameterMetaData pdata = (ParameterMetaData) i.next();
          ValueMetaData vmd = pdata.getValue();
-         Object param = vmd.getValue(pinfos[x], cl);
-         params[x++] = param;
+         params[x++] = vmd.getValue(pinfos[x], cl);
       }
       return params;
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBinding.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -1145,8 +1145,7 @@
          public void add(Object parent, Object child, QName name)
          {
             MapEntry entry = (MapEntry) parent;
-            ValueMetaData value = (ValueMetaData) child;
-            entry.key = value;
+            entry.key = (ValueMetaData) child;
          }
       });
 
@@ -1156,8 +1155,7 @@
          public void add(Object parent, Object child, QName name)
          {
             MapEntry entry = (MapEntry) parent;
-            ValueMetaData value = (ValueMetaData) child;
-            entry.value = value;
+            entry.value = (ValueMetaData) child;
          }
       });
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryKeyInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryKeyInterceptor.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryKeyInterceptor.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -40,7 +40,6 @@
    public void add(Object parent, Object child, QName name)
    {
       MapEntry entry = (MapEntry) parent;
-      ValueMetaData value = (ValueMetaData) child;
-      entry.key = value;
+      entry.key = (ValueMetaData) child;
    }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryValueInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryValueInterceptor.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/EntryValueInterceptor.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -40,7 +40,6 @@
    public void add(Object parent, Object child, QName name)
    {
       MapEntry entry = (MapEntry) parent;
-      ValueMetaData value = (ValueMetaData) child;
-      entry.value = value;
+      entry.value = (ValueMetaData) child;
    }
 }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java	2006-09-30 14:17:10 UTC (rev 57305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java	2006-09-30 17:32:29 UTC (rev 57306)
@@ -85,7 +85,7 @@
 
       synchronized (entries)
       {
-         entry = (KernelRegistryEntry) entries.remove(name);
+         entry = entries.remove(name);
          if (entry == null)
             throw new KernelRegistryEntryNotFoundException("Not found: " + name);
       }
@@ -101,6 +101,6 @@
       if (name == null)
          throw new IllegalArgumentException("Null name");
 
-      return (KernelRegistryEntry) entries.get(name);
+      return entries.get(name);
    }
 }


