[jboss-cvs] JBossAS SVN: r70086 - in projects/microcontainer/trunk: kernel/src/tests/org/jboss/test/kernel/annotations/test and 2 other directories.

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

Author: adrian at jboss.org
Date: 2008-02-26 06:41:48 -0500 (Tue, 26 Feb 2008)
New Revision: 70086

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/AbstractRunAnnotationsTest.java
   projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java
   projects/microcontainer/trunk/osgi-int/src/tests/org/jboss/test/bundle/BundleImplTestCase.java
Log:
Source code tidyup

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java	2008-02-26 11:38:07 UTC (rev 70085)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/SubInstallationAnnotationTester.java	2008-02-26 11:41:48 UTC (rev 70086)
@@ -21,9 +21,6 @@
 */
 package org.jboss.test.kernel.annotations.support;
 
-import org.jboss.beans.metadata.api.annotations.InstallMethod;
-import org.jboss.beans.metadata.api.annotations.UninstallMethod;
-
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/AbstractRunAnnotationsTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/AbstractRunAnnotationsTest.java	2008-02-26 11:38:07 UTC (rev 70085)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/AbstractRunAnnotationsTest.java	2008-02-26 11:41:48 UTC (rev 70086)
@@ -71,7 +71,7 @@
       runAnnotations(clazz, null);
    }
 
-   protected void runAnnotations(Class clazz, Object target) throws Throwable
+   protected void runAnnotations(Class<?> clazz, Object target) throws Throwable
    {
       KernelController controller = getController();
       String className = clazz.getName();

Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java	2008-02-26 11:38:07 UTC (rev 70085)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleImpl.java	2008-02-26 11:41:48 UTC (rev 70086)
@@ -283,7 +283,7 @@
       Set<? extends OSGiMetaData> metaDatas = unit.getAllMetaData(OSGiMetaData.class);
       if (metaDatas != null && metaDatas.isEmpty() == false)
       {
-         metaData = (OSGiMetaData) metaDatas.iterator().next();
+         metaData = metaDatas.iterator().next();
       }
       return metaData;
    }

Modified: projects/microcontainer/trunk/osgi-int/src/tests/org/jboss/test/bundle/BundleImplTestCase.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/tests/org/jboss/test/bundle/BundleImplTestCase.java	2008-02-26 11:38:07 UTC (rev 70085)
+++ projects/microcontainer/trunk/osgi-int/src/tests/org/jboss/test/bundle/BundleImplTestCase.java	2008-02-26 11:41:48 UTC (rev 70086)
@@ -4,7 +4,6 @@
 
 import junit.framework.Test;
 
-import org.jboss.dependency.plugins.AbstractController;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.plugins.deployers.DeployersImpl;
@@ -47,7 +46,7 @@
       
       DeploymentContext deploymentContext = new AbstractDeploymentContext("deployment", "/");
       deploymentUnit = new AbstractDeploymentUnit(deploymentContext);
-      controllerContext = new DeploymentControllerContext(deploymentContext, new DeployersImpl((AbstractController) bootstrap.getKernel().getController()));
+      controllerContext = new DeploymentControllerContext(deploymentContext, new DeployersImpl(bootstrap.getKernel().getController()));
       deploymentUnit.addAttachment(ControllerContext.class.getName(), controllerContext);
       bundle = new BundleImpl(deploymentUnit);