[jboss-cvs] JBossAS SVN: r72449 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/kernel/plugins/dependency and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 18 11:48:10 EDT 2008
Author: adrian at jboss.org
Date: 2008-04-18 11:48:10 -0400 (Fri, 18 Apr 2008)
New Revision: 72449
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractBeanAnnotationAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractMetaDataAnnotationAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MetaDataAnnotationPlugin.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AllIoCAnnotations.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerScopingTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
Log:
Sourcecode tidyup
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractBeanAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractBeanAnnotationAdapter.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractBeanAnnotationAdapter.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class AbstractBeanAnnotationAdapter extends CommonAnnotationAdapter<AnnotationPlugin, MetaDataVisitor> implements BeanAnnotationAdapter
+public class AbstractBeanAnnotationAdapter extends CommonAnnotationAdapter<AnnotationPlugin<?, ?>, MetaDataVisitor> implements BeanAnnotationAdapter
{
public void applyAnnotations(MetaDataVisitor visitor) throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractMetaDataAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractMetaDataAnnotationAdapter.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/AbstractMetaDataAnnotationAdapter.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class AbstractMetaDataAnnotationAdapter extends CommonAnnotationAdapter<MetaDataAnnotationPlugin, BeanMetaData> implements BeanMetaDataAnnotationAdapter
+public class AbstractMetaDataAnnotationAdapter extends CommonAnnotationAdapter<MetaDataAnnotationPlugin<?, ?>, BeanMetaData> implements BeanMetaDataAnnotationAdapter
{
public void applyAnnotations(BeanInfo beanInfo, MetaData metaData, BeanMetaData beanMetaData) throws Throwable
{
@@ -45,7 +45,7 @@
plugin.applyAnnotation(info, retrieval, handle);
}
- protected void cleanPlugin(MetaDataAnnotationPlugin plugin, AnnotatedInfo info, MetaData retrieval, BeanMetaData handle) throws Throwable
+ protected void cleanPlugin(MetaDataAnnotationPlugin<?, ?> plugin, AnnotatedInfo info, MetaData retrieval, BeanMetaData handle) throws Throwable
{
throw new UnsupportedOperationException("Cleanup is not supported on metadata annotation adapter.");
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -49,7 +49,7 @@
* @param <U> exact handle type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class CommonAnnotationAdapter<T extends MetaDataAnnotationPlugin, U>
+public abstract class CommonAnnotationAdapter<T extends MetaDataAnnotationPlugin<?, ?>, U>
{
protected Logger log = Logger.getLogger(getClass());
@@ -116,7 +116,7 @@
if (plugin == null)
return;
- Set supported = plugin.getSupportedTypes();
+ Set<ElementType> supported = plugin.getSupportedTypes();
if (supported == null || supported.isEmpty())
throw new IllegalArgumentException("Null or empty support types: " + plugin);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MetaDataAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MetaDataAnnotationPlugin.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/MetaDataAnnotationPlugin.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -32,6 +32,8 @@
/**
* Annotation plugin based on bean metadata.
*
+ * @param <T> the annotated info
+ * @param <C> the annotation type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public interface MetaDataAnnotationPlugin<T extends AnnotatedInfo, C extends Annotation>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -55,7 +55,7 @@
*/
public class PreInstallAction extends InstallsAwareAction
{
- private Map<Class<? extends ScopeFactory<? extends Annotation>>, WeakReference<ScopeFactory>> factories = new WeakHashMap<Class<? extends ScopeFactory<? extends Annotation>>, WeakReference<ScopeFactory>>();
+ private Map<Class<? extends ScopeFactory<? extends Annotation>>, WeakReference<ScopeFactory<? extends Annotation>>> factories = new WeakHashMap<Class<? extends ScopeFactory<? extends Annotation>>, WeakReference<ScopeFactory<? extends Annotation>>>();
/**
* Get the scope factory.
@@ -64,10 +64,10 @@
* @return scope factory
* @throws Throwable for any error
*/
- protected ScopeFactory getScopeFactory(Class<? extends ScopeFactory<? extends Annotation>> clazz) throws Throwable
+ protected ScopeFactory<? extends Annotation> getScopeFactory(Class<? extends ScopeFactory<? extends Annotation>> clazz) throws Throwable
{
- ScopeFactory factory = null;
- WeakReference<ScopeFactory> weak = factories.get(clazz);
+ ScopeFactory<? extends Annotation> factory = null;
+ WeakReference<ScopeFactory<? extends Annotation>> weak = factories.get(clazz);
if (weak != null)
{
factory = weak.get();
@@ -77,7 +77,7 @@
if (factory == null)
{
factory = clazz.newInstance();
- factories.put(clazz, new WeakReference<ScopeFactory>(factory));
+ factories.put(clazz, new WeakReference<ScopeFactory<? extends Annotation>>(factory));
}
return factory;
}
@@ -133,7 +133,7 @@
if (annotation.annotationType().isAnnotationPresent(ScopeFactoryLookup.class))
{
ScopeFactoryLookup sfl = annotation.annotationType().getAnnotation(ScopeFactoryLookup.class);
- ScopeFactory<Annotation> scf = getScopeFactory(sfl.value());
+ ScopeFactory scf = getScopeFactory(sfl.value());
Scope scope = scf.create(annotation);
scopes.add(scope);
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AllIoCAnnotations.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AllIoCAnnotations.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/support/AllIoCAnnotations.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -56,6 +56,7 @@
public class AllIoCAnnotations
{
@Inject
+ @SuppressWarnings("unused")
private int time;
@Inject
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerScopingTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerScopingTestCase.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerScopingTestCase.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -51,7 +51,7 @@
List<Object> beans1 = sc1.createBeans("cf_base_1");
assertNotNull(beans1);
assertEquals(2, beans1.size());
- BaseContext bc1 = assertBean("cf_base_1$BeanContext", BaseContext.class);
+ BaseContext<?, ?> bc1 = assertBean("cf_base_1$BeanContext", BaseContext.class);
InstanceInterceptor ii1 = assertBean("cf_base_1$InstanceInterceptor", InstanceInterceptor.class);
assertNotNull(bc1.getInterceptors());
assertEquals(1, bc1.getInterceptors().size());
@@ -61,7 +61,7 @@
List<Object> beans2 = sc2.createBeans("cf_base_2");
assertNotNull(beans2);
assertEquals(2, beans2.size());
- BaseContext bc2 = assertBean("cf_base_2$BeanContext", BaseContext.class);
+ BaseContext<?, ?> bc2 = assertBean("cf_base_2$BeanContext", BaseContext.class);
InstanceInterceptor ii2 = assertBean("cf_base_2$InstanceInterceptor", InstanceInterceptor.class);
assertNotNull(bc2.getInterceptors());
assertEquals(1, bc2.getInterceptors().size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-18 15:27:57 UTC (rev 72448)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-04-18 15:48:10 UTC (rev 72449)
@@ -73,8 +73,8 @@
/**
* Test of the ComponentFactory usecase
*
- * @see {@link GenericComponentFactory}
- * @see {@link ComponentFactory}
+ * @see GenericComponentFactory
+ * @see ComponentFactory
* @throws Throwable
*/
@SuppressWarnings("unchecked")
More information about the jboss-cvs-commits
mailing list