[jboss-cvs] JBossAS SVN: r99406 - in projects/kernel/trunk: kernel/src/main/java/org/jboss/kernel/plugins/annotations and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 14 06:57:06 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-01-14 06:57:06 -0500 (Thu, 14 Jan 2010)
New Revision: 99406
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java
Log:
Tidy up
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -37,16 +37,14 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.ReflectiveAspectBinder;
import org.jboss.aop.advice.AspectDefinition;
+import org.jboss.aop.microcontainer.annotations.DisabledType;
import org.jboss.aop.microcontainer.beans.AspectManagerFactory;
import org.jboss.aop.microcontainer.beans.ManagedAspectDefinition;
-import org.jboss.aop.microcontainer.lifecycle.LifecycleCallbackDefinition;
-import org.jboss.aop.microcontainer.annotations.DisabledType;
import org.jboss.aop.proxy.container.ContainerCache;
import org.jboss.aop.util.Advisable;
import org.jboss.aop.util.ClassInfoMethodHashing;
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.metadata.api.annotations.Dependency;
-import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.DependencyBuilderListItem;
import org.jboss.kernel.spi.dependency.helpers.AbstractDependencyBuilder;
import org.jboss.metadata.spi.MetaData;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -27,7 +27,6 @@
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.kernel.spi.dependency.DependencyBuilderListItem;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.logging.Logger;
import org.jboss.metadata.spi.MetaData;
import org.jboss.reflect.spi.ClassInfo;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -378,7 +378,6 @@
private static void addQualifiersFromQualifierAnnotations(KernelControllerContext context) throws Exception
{
MetaData metaData = context.getKernel().getMetaDataRepository().getMetaDataRepository().getMetaData(context.getScopeInfo().getScope());
- Set<DependencyItem> replacedItems = null;
for (DependencyItem item : context.getDependencyInfo().getIDependOn(ContextualInjectionDependencyItem.class))
{
Set<Annotation> annotations = getQualifiersFromAnnotationsForInjectionPointParents(context, ((ContextualInjectionDependencyItem)item).getParents(), metaData);
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/qualifier/DefaultEqualsMatcher.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -14,7 +14,7 @@
*/
public class DefaultEqualsMatcher implements QualifierMatcher<Object>
{
- public static final QualifierMatcher SINGLETON = new DefaultEqualsMatcher();
+ public static final QualifierMatcher<Object> SINGLETON = new DefaultEqualsMatcher();
private DefaultEqualsMatcher()
{
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/registry/basic/BasicKernelRegistryFactory.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -21,7 +21,6 @@
*/
package org.jboss.kernel.plugins.registry.basic;
-import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/spi/qualifier/QualifierMatchers.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -43,7 +43,7 @@
private final static QualifierMatchers SINGLETON = new QualifierMatchers();
//Specify concurrency level = 1 since it is very unlikely more than one thread will be adding matchers at any time
- private ConcurrentMap<Class<?>, QualifierMatcher> matchers = new ConcurrentHashMap<Class<?>, QualifierMatcher>(3, .75f, 1);
+ private ConcurrentMap<Class<?>, QualifierMatcher<?>> matchers = new ConcurrentHashMap<Class<?>, QualifierMatcher<?>>(3, .75f, 1);
//Specify concurrency level = 1 since it is very unlikely more than one thread will be adding parsers at any time
private ConcurrentMap<QualifierContent, QualifierParser> parsers = new ConcurrentHashMap<QualifierContent, QualifierParser>(3, .75f, 1);
@@ -139,9 +139,9 @@
* @param matcher the matcher to add
* @throwa IllegalArgumentException if a matcher of a different type already exists for the handled qualifier type
*/
- public void addMatcher(QualifierMatcher matcher)
+ public void addMatcher(QualifierMatcher<?> matcher)
{
- QualifierMatcher old = matchers.putIfAbsent(matcher.getHandledType(), matcher);
+ QualifierMatcher<?> old = matchers.putIfAbsent(matcher.getHandledType(), matcher);
if (old != null && old.getClass() != matcher.getClass())
throw new IllegalArgumentException(old + " is already handling " + matcher.getHandledType());
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java 2010-01-14 11:03:40 UTC (rev 99405)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/deployment/xml/test/QualifierTestCase.java 2010-01-14 11:57:06 UTC (rev 99406)
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Set;
-import java.util.Stack;
import junit.framework.Test;
@@ -36,17 +35,11 @@
import org.jboss.beans.metadata.plugins.AbstractQualifierMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.InstallMetaData;
-import org.jboss.beans.metadata.spi.MetaDataVisitor;
-import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.RelatedClassMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.dependency.spi.CallbackItem;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.DependencyItem;
import org.jboss.kernel.plugins.dependency.QualifiersMdrUtil;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.qualifier.QualifierMatchers;
import org.jboss.kernel.spi.qualifier.QualifierParser;
More information about the jboss-cvs-commits
mailing list