[jboss-cvs] JBossAS SVN: r57133 - in projects/microcontainer/trunk: container/src/main/org/jboss/annotation/factory container/src/main/org/jboss/annotation/factory/javassist container/src/main/org/jboss/annotation/management container/src/main/org/jboss/beans/info/plugins container/src/main/org/jboss/beans/info/spi container/src/main/org/jboss/classadapter/plugins container/src/main/org/jboss/classadapter/plugins/dependency container/src/main/org/jboss/classadapter/spi container/src/main/org/jboss/classloading/spi container/src/main/org/jboss/metadata/annotation container/src/main/org/jboss/metadata/plugins/context container/src/main/org/jboss/metadata/plugins/loader container/src/main/org/jboss/metadata/plugins/loader/memory container/src/main/org/jboss/metadata/spi container/src/main/org/jboss/metadata/spi/context container/src/main/org/jboss/metadata/spi/loader container/src/main/org/jboss/metadata/spi/retrieval container/src/main/org/jboss/metadata/spi/retrieval/basic cont! ainer/src/main/org/jboss/metadata/spi/retrieval/helper container/src/main/org/jboss/metadata/spi/retrieval/simple container/src/main/org/jboss/metadata/spi/scope container/src/main/org/jboss/reflect/plugins container/src/main/org/jboss/reflect/plugins/introspection container/src/main/org/jboss/reflect/plugins/javassist container/src/main/org/jboss/reflect/spi container/src/main/org/jboss/virtual/classloading container/src/main/org/jboss/virtual/plugins/context/file container/src/tests/org/jboss/test/annotation/factory/test container/src/tests/org/jboss/test/memorytests container/src/tests/org/jboss/test/metadata dependency/src/main/org/jboss/dependency/plugins dependency/src/main/org/jboss/dependency/plugins/spi/action kernel/src/main/org/jboss/beans/metadata/plugins kernel/src/main/org/jboss/beans/metadata/spi kernel/src/main/org/jboss/kernel kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic kernel/src/main/org/jboss/kernel/plugins/config kernel/src/main/org/jboss/k! ernel/plugins/config/property kernel/src/main/org/jboss/kernel/plugins/dependency kernel/src/main/org/jboss/kernel/plugins/deployment kernel/src/main/org/jboss/kernel/plugins/deployment/xml kernel/src/main/org/jboss/kernel/spi/dependency kernel/src/main/org/jboss/test/kernel/junit kernel/src/tests/org/jboss/test/javabean/tes
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 25 07:10:59 EDT 2006
Author: adrian at jboss.org
Date: 2006-09-25 07:09:27 -0400 (Mon, 25 Sep 2006)
New Revision: 57133
Modified:
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
projects/microcontainer/trunk/container/src/main/org/jboss/annotation/management/ManagedPropertyRef.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractPropertyInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/annotation/AnnotationMatcher.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MutableMetaData.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/loader/MetaDataLoader.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/Item.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java
projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKey.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationHelper.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ConstructorInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/MethodInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectMethodInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistConstructorInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistFieldInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistMethodInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistParameterInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/FieldInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.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/tests/org/jboss/test/annotation/factory/test/AnnotationCreatorTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/NoJavassistAnnotationCreatorTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/spi/action/ControllerContextAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionType.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelController.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTest.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/TestUtil.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
Log:
Sourcecode tidyup, generification and javadoc fixes.
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationCreator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -65,7 +65,7 @@
boolean haveJavassist = false;
try
{
- Class clazz = Class.forName("javassist.CtClass");
+ Class.forName("javassist.CtClass");
haveJavassist = true;
}
catch(ClassNotFoundException ignore)
@@ -315,12 +315,13 @@
{
try
{
- ASTAnnotation node = (ASTAnnotation)AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws Exception{
+ ASTAnnotation node = 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;
}
});
@@ -329,14 +330,14 @@
}
catch (PrivilegedActionException e)
{
- throw new RuntimeException(e.getException());
+ throw new RuntimeException("Error getting root expression", e.getException());
}
}
public static Object createAnnotation(ASTAnnotation node, Class annotation, ClassLoader cl) throws Exception
{
- HashMap map = new HashMap();
+ HashMap<String, Object> map = new HashMap<String, Object>();
if (annotation == null)
{
ClassLoader loader = (cl != null) ? cl : Thread.currentThread().getContextClassLoader();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationProxy.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -80,6 +80,7 @@
return map.get(name);
}
+ @SuppressWarnings("unchecked")
private Object doEquals(Object proxy, Object obj)
{
if (obj == proxy) return Boolean.TRUE;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/AnnotationValidator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -39,5 +39,5 @@
* @param annotation The annotation type
* @throws AnnotationValidationException if some attributes were not filled in and no default value exists for that attribute
*/
- void validate(Map map, Class annotation);
+ void validate(Map<String, Object> map, Class annotation);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/SimpleAnnotationValidator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -39,7 +39,7 @@
public void validate(Map map, Class annotation)
{
- ArrayList notAssignedAttributes = null;
+ ArrayList<String> notAssignedAttributes = null;
Method[] methods = getDeclaredMethods(annotation);
for (int i = 0 ; i < methods.length ; i++)
{
@@ -47,7 +47,7 @@
{
if (notAssignedAttributes == null)
{
- notAssignedAttributes = new ArrayList();
+ notAssignedAttributes = new ArrayList<String>();
}
notAssignedAttributes.add(methods[i].getName());
}
@@ -61,8 +61,9 @@
private Method[] getDeclaredMethods(final Class clazz)
{
- return (Method[])AccessController.doPrivileged(new PrivilegedAction() {
- public Object run()
+ return AccessController.doPrivileged(new PrivilegedAction<Method[]>()
+ {
+ public Method[] run()
{
return clazz.getDeclaredMethods();
};
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/AnnotationProxy.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -46,7 +46,7 @@
public static Object createProxy(javassist.bytecode.annotation.Annotation info, Class annotation) throws Exception
{
- Map map = ProxyMapCreator.createProxyMap(annotation, info);
+ Map<String, Object> map = ProxyMapCreator.createProxyMap(annotation, info);
DefaultValueAnnotationValidator reader = new DefaultValueAnnotationValidator();
reader.validate(map, annotation);
AnnotationProxy proxyHandler = new AnnotationProxy(annotation, map);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/DefaultValueAnnotationValidator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -51,9 +51,9 @@
{
ScopedClassPoolRepository repository = ScopedClassPoolRepositoryImpl.getInstance();
- public void validate(Map map, Class annotation)
+ public void validate(Map<String, Object> map, Class annotation)
{
- ArrayList notAssignedAttributes = null;
+ ArrayList<String> notAssignedAttributes = null;
CtClass ctClass = null;
Method[] methods = getDeclaredMethods(annotation);
@@ -95,7 +95,7 @@
{
if (notAssignedAttributes == null)
{
- notAssignedAttributes = new ArrayList();
+ notAssignedAttributes = new ArrayList<String>();
}
notAssignedAttributes.add(methods[i].getName());
}
@@ -125,8 +125,9 @@
private Method[] getDeclaredMethods(final Class clazz)
{
- return (Method[])AccessController.doPrivileged(new PrivilegedAction() {
- public Object run()
+ return AccessController.doPrivileged(new PrivilegedAction<Method[]>()
+ {
+ public Method[] run()
{
return clazz.getDeclaredMethods();
};
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/MemberValueGetter.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -112,6 +112,7 @@
value = new Double(node.getValue());
}
+ @SuppressWarnings("unchecked")
public void visitEnumMemberValue(EnumMemberValue node)
{
value = Enum.valueOf(getAttributeType(), node.getValue());
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/factory/javassist/ProxyMapCreator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -232,10 +232,10 @@
throw new RuntimeException("unable to determine member type for annotation: " + annotation.getName() + "." + member);
}
- public static Map createProxyMap(Class annotation, javassist.bytecode.annotation.Annotation info)
+ public static Map<String, Object> createProxyMap(Class annotation, javassist.bytecode.annotation.Annotation info)
{
//TODO: Need to handle default values for annotations in jdk 1.5
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
if (info.getMemberNames() == null) return map;
Set members = info.getMemberNames();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/annotation/management/ManagedPropertyRef.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/annotation/management/ManagedPropertyRef.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/annotation/management/ManagedPropertyRef.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -38,22 +38,22 @@
/**
* A namespace context that maps the managed property onto a managed view
* context (e.g., /, /DataSource, /DataSource/Pool).
- * @return
*/
String context() default "/";
+
/**
* The DeploymentBean name which sources the property
- * @return
*/
String beanName();
+
/**
* The DeploymentBean property name
- * @return
*/
String propertyName();
+
/**
* An option management view description of the property
- * @return
+ * @return the description
*/
String description() default "";
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -130,7 +130,7 @@
return classAdapter.getClassInfo();
}
- public List getDependencies()
+ public List<Object> getDependencies()
{
return classAdapter.getDependencies();
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -155,6 +155,7 @@
* @param constructors the constructors
* @param methods the methods
* @param events the events
+ * @return the bean info
*/
protected BeanInfo createBeanInfo(ClassAdapter classAdapter, Set<PropertyInfo> properties, Set<ConstructorInfo> constructors, Set<MethodInfo> methods, Set<EventInfo> events)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractPropertyInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractPropertyInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractPropertyInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -76,6 +76,7 @@
* Create a new property info
*
* @param name the name
+ * @param upperName the upper case version of the name
* @param type the type
* @param getter the getter
* @param setter the setter
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -67,7 +67,7 @@
*
* @return the list of dependencies
*/
- List getDependencies();
+ List<Object> getDependencies();
/**
* Get the joinpoint factory
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -73,7 +73,7 @@
return clone;
}
- public List getDependencies()
+ public List<Object> getDependencies()
{
DependencyBuilder builder = classAdapterFactory.getConfiguration().getDependencyBuilder();
return builder.getDependencies(this);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/dependency/AbstractDependencyBuilder.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -34,7 +34,7 @@
*/
public class AbstractDependencyBuilder implements DependencyBuilder
{
- public List getDependencies(ClassAdapter classAdapter)
+ public List<Object> getDependencies(ClassAdapter classAdapter)
{
return null;
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapter.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -81,7 +81,7 @@
*
* @return the list of dependencies
*/
- List getDependencies();
+ List<Object> getDependencies();
/**
* Get the Joinpoint Factory for this adapter.
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/ClassAdapterFactory.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -58,7 +58,7 @@
/**
* Get a class adapter
*
- * @param type the type info
+ * @param typeInfo the type info
* @return the class adapter
*/
ClassAdapter getClassAdapter(TypeInfo typeInfo);
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilder.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -35,6 +35,7 @@
* Get the dependencies for this instance
*
* @param classAdapter the class adapter
+ * @return the dependencies
*/
- List getDependencies(ClassAdapter classAdapter);
+ List<Object> getDependencies(ClassAdapter classAdapter);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classloading/spi/DomainClassLoader.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -33,10 +33,6 @@
*/
public interface DomainClassLoader
{
- // Constants -----------------------------------------------------
-
- // Public --------------------------------------------------------
-
/**
* The domain of the classloader
*
@@ -47,15 +43,22 @@
/**
* Set the domain of the classloader
*
+ * @param domain the domain
*/
void setDomain(ClassLoadingDomain domain);
+ /**
+ * Get the classpath
+ *
+ * @return the classpath
+ */
public URL[] getClasspath();
/**
+ * Load a class
*
- * @param name
- * @return
+ * @param name the name
+ * @return the class
* @throws ClassNotFoundException
*/
Class loadClass(String name) throws ClassNotFoundException;
@@ -77,6 +80,14 @@
* @return the resource or null if not found
*/
URL loadResourceLocally(String name);
+
+ /**
+ * Find resources locally
+ *
+ * @param name the name of the resource
+ * @return the resources
+ * @throws IOException for any error
+ */
Enumeration<URL> findResourcesLocally(String name) throws IOException;
/**
@@ -100,12 +111,4 @@
* @return the package
*/
Package getPackage(String name);
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/annotation/AnnotationMatcher.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/annotation/AnnotationMatcher.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/annotation/AnnotationMatcher.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -36,6 +36,7 @@
/**
* Match an annotation
*
+ * @param <T> the annotation type
* @param annotations the annotations
* @param annotationType the annotation type
* @return the matched annotation or null if no match
@@ -58,6 +59,7 @@
/**
* Match an annotation item
*
+ * @param <T> the annotation type
* @param annotations the annotation items
* @param annotationType the annotation type
* @return the matched annotation item or null if no match
@@ -71,7 +73,7 @@
{
Annotation a = item.getAnnotation();
if (annotationType.equals(a.annotationType()))
- return (AnnotationItem<T>) item;
+ return item;
}
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/context/CachingMetaDataContext.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -118,7 +118,7 @@
if (annotations != null)
{
- AnnotationItem<T> result = (AnnotationItem<T>) annotations.get(annotationName);
+ AnnotationItem<T> result = annotations.get(annotationName);
if (result != null)
{
if (result.isValid())
@@ -165,7 +165,7 @@
if (metaDataByName != null)
{
- MetaDataItem<T> result = (MetaDataItem<T>) metaDataByName.get(name);
+ MetaDataItem<T> result = metaDataByName.get(name);
if (result != null)
{
if (result.isValid())
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -99,6 +99,8 @@
/**
* Check whether an object is retricted
+ *
+ * @param type the type
*/
public void checkRestricted(Class<?> type)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -85,7 +85,7 @@
/**
* Create a new MemoryMetaDataLoader.
*
- * @param key the scope key
+ * @param scope the scope key
*/
public MemoryMetaDataLoader(ScopeKey scope)
{
@@ -95,7 +95,7 @@
/**
* Create a new MemoryMetaDataLoader.
*
- * @param key the scope key
+ * @param scope the scope key
* @param cachable whether items produced should be cachable
* @param restricted whether restricted items are allowed
*/
@@ -155,7 +155,7 @@
T result = null;
Class<? extends Annotation> annotationType = annotation.annotationType();
- BasicAnnotationItem<T> old = (BasicAnnotationItem<T>) annotations.get(annotationType.getName());
+ BasicAnnotationItem<T> old = annotations.get(annotationType.getName());
if (old != null)
{
result = old.getAnnotation();
@@ -177,7 +177,7 @@
{
if (annotations == null)
return null;
- BasicAnnotationItem<T> annotation = (BasicAnnotationItem<T>) annotations.remove(annotationType.getName());
+ BasicAnnotationItem<T> annotation = annotations.remove(annotationType.getName());
if (annotation == null)
return null;
annotation.invalidate();
@@ -270,7 +270,7 @@
T result = null;
- BasicMetaDataItem<T> old = (BasicMetaDataItem<T>) metaDataByName.get(type.getName());
+ BasicMetaDataItem<T> old = metaDataByName.get(type.getName());
if (old != null)
{
result = old.getValue();
@@ -325,7 +325,7 @@
T result = null;
- BasicMetaDataItem<T> old = (BasicMetaDataItem<T>) metaDataByName.get(name);
+ BasicMetaDataItem<T> old = metaDataByName.get(name);
if (old != null)
{
result = old.getValue();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -47,6 +47,7 @@
/**
* Get annotation
*
+ * @param <T> the annotation type
* @param annotationType the annotation type
* @return the annotation or null if not present
*/
@@ -76,7 +77,8 @@
/**
* Get metadata
- *
+ *
+ * @param <T> the metadata type
* @param type the type
* @return the metadata or null if not present
*/
@@ -115,6 +117,7 @@
/**
* Get metadata
*
+ * @param <T> the metadata type
* @param name the name of the meta data
* @param type the expected type of the metadata
* @return the metadata or null if not present
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MutableMetaData.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MutableMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/MutableMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -34,6 +34,7 @@
/**
* Add an annotation
*
+ * @param <T> the annotation type
* @param annotation the annotation
* @param annotationType the annotation type
* @return any previous annotation
@@ -43,6 +44,7 @@
/**
* Remove an annotation
*
+ * @param <T> the annotation type
* @param annotationType the annotation type
* @return any previous annotation
*/
@@ -51,6 +53,7 @@
/**
* Add metaData
*
+ * @param <T> the metadata type
* @param metaData the meta data
* @param type the expected type
* @return any previous meta data
@@ -60,6 +63,7 @@
/**
* Remove metaData
*
+ * @param <T> the metadata type
* @param type the meta data type
* @return any previous meta data
*/
@@ -68,6 +72,7 @@
/**
* Add metaData
*
+ * @param <T> the metadata type
* @param name the name
* @param metaData the meta data
* @param type the expected type
@@ -78,6 +83,7 @@
/**
* Remove metadata
*
+ * @param <T> the metadata type
* @param name the name of the meta data
* @param type the expected type of the metadata
* @return the metadata or null if not present
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -35,6 +35,8 @@
{
/**
* Get the parent
+ *
+ * @return the parent context
*/
MetaDataContext getParent();
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/loader/MetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/loader/MetaDataLoader.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/loader/MetaDataLoader.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -35,6 +35,7 @@
/**
* Whether the item is cachable
*
+ * @param <T> the item type
* @param item the item
* @return true when cachable
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/AnnotationItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -29,6 +29,7 @@
* <p>For the purposes of retrieval, two annotations
* are equal if they have the same annotation type.
*
+ * @param <T> the annoation type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/Item.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/Item.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/Item.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -24,6 +24,7 @@
/**
* Retrieval Item.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -27,6 +27,7 @@
* <p>For the purposes of retrieval, two annotations
* are equal if they have the same name.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -64,6 +64,7 @@
/**
* Get annotation
*
+ * @param <T> the annotation type
* @param annotationType the annotation type
* @return the annotation or null if not present
*/
@@ -86,6 +87,7 @@
/**
* Get metadata
*
+ * @param <T> the metadata type
* @param type the type
* @return the metadata or null if not present
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicAnnotationItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -29,6 +29,7 @@
/**
* BasicAnnotationItem.
*
+ * @param <T> the annotation type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -29,6 +29,7 @@
/**
* BasicItem.
*
+ * @param <T> The item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/basic/BasicMetaDataItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -27,6 +27,7 @@
/**
* BasicMetaDataItem.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationToMetaDataBridge.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -27,6 +27,7 @@
/**
* AnnotationToMetaDataBridge.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/AnnotationsToMetaDatasBridge.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -39,7 +39,7 @@
/**
* Create a new AnnotationsToMetaDatasBridge.
*
- * @param annotation the annotation
+ * @param annotations the annotations
*/
public AnnotationsToMetaDatasBridge(AnnotationsItem annotations)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/helper/MetaDataToAnnotationBridge.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -29,6 +29,7 @@
/**
* MetaDataToAnnotationBridge.
*
+ * @param <T> the annotation type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleAnnotationItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -28,6 +28,7 @@
/**
* SimpleAnnotationItem.
*
+ * @param <T> the annotation type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -26,6 +26,7 @@
/**
* SimpleItem.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/retrieval/simple/SimpleMetaDataItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -26,6 +26,7 @@
/**
* SimpleMetaDataItem.
*
+ * @param <T> the item type
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKey.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKey.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/spi/scope/ScopeKey.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -244,7 +244,7 @@
/**
* Get a scope level
*
- * @param level the scope level
+ * @param scopeLevel the scope level
* @return the scope or null if there is no such level
*/
public Scope getScopeLevel(ScopeLevel scopeLevel)
@@ -258,7 +258,7 @@
/**
* Remove a scope level
*
- * @param level the scope level
+ * @param scopeLevel the scope level
* @return the scope or null if there is no such level
*/
public Scope removeScopeLevel(ScopeLevel scopeLevel)
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationHelper.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationHelper.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/AnnotationHelper.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -42,8 +42,9 @@
/**
* Create an annotation from the underlying implementation and its info type
- * @param The annotation info
+ * @param info the annotation info
* @param ann the underlying annotation
+ * @return the annotation value
*/
AnnotationValue createAnnotationValue(AnnotationInfo info, Object ann);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ConstructorInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ConstructorInfoImpl.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ConstructorInfoImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -74,6 +74,7 @@
*
* @param annotations the annotations
* @param parameterTypes the parameter types
+ * @param parameterAnnotations the parameter annotations
* @param exceptionTypes the exception types
* @param modifiers the modifiers
* @param declaring the declaring class
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/MethodInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/MethodInfoImpl.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/MethodInfoImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -81,6 +81,7 @@
* @param name the method name
* @param returnType the return type
* @param parameterTypes the parameter types
+ * @param parameterAnnotations the parameter annotations
* @param exceptionTypes the exception types
* @param modifiers the modifiers
* @param declaring the declaring class
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -40,7 +40,6 @@
import org.jboss.reflect.plugins.EnumInfoImpl;
import org.jboss.reflect.plugins.FieldInfoImpl;
import org.jboss.reflect.plugins.MethodInfoImpl;
-import org.jboss.reflect.spi.AnnotationAttribute;
import org.jboss.reflect.spi.AnnotationInfo;
import org.jboss.reflect.spi.AnnotationValue;
import org.jboss.reflect.spi.ClassInfo;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectConstructorInfoImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -55,6 +55,7 @@
*
* @param annotations the annotations
* @param parameterTypes the parameter types
+ * @param parameterAnnotations the parameter annotations
* @param exceptionTypes the exception types
* @param modifiers the modifiers
* @param declaring the declaring class
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectMethodInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectMethodInfoImpl.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/ReflectMethodInfoImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -57,6 +57,7 @@
* @param name the method name
* @param returnType the return type
* @param parameterTypes the parameter types
+ * @param parameterAnnotations the parameter annotations
* @param exceptionTypes the exception types
* @param modifiers the modifiers
* @param declaring the declaring class
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistAnnotatedParameterInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -22,7 +22,6 @@
package org.jboss.reflect.plugins.javassist;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
import org.jboss.reflect.plugins.AnnotationHelper;
import org.jboss.reflect.spi.AnnotationInfo;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -25,22 +25,23 @@
import org.jboss.reflect.spi.TypeInfo;
/**
+ * Javassist array info
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
public class JavassistArrayInfoImpl extends ArrayInfoImpl
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 9195834689976459024L;
public JavassistArrayInfoImpl()
{
- // FIXME JavassistArrayInfoImpl constructor
super();
}
public JavassistArrayInfoImpl(TypeInfo componentType)
{
- // FIXME JavassistArrayInfoImpl constructor
super(componentType);
}
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistConstructorInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistConstructorInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistConstructorInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -56,6 +56,7 @@
/**
* Create a new JavassistConstructor.
*
+ * @param annotationHelper the annotation helper
* @param typeInfo the type ifo
* @param ctConstructor the constructor
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistFieldInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistFieldInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistFieldInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -59,6 +59,7 @@
/**
* Create a new JavassistFieldInfo.
*
+ * @param annotationHelper the annotation helper
* @param typeInfo the type info
* @param ctField the field
*/
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistMethodInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistMethodInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistMethodInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -57,9 +57,10 @@
/**
* Create a new JavassistMethodInfo.
*
+ * @param annotationHelper the annotation helper
* @param typeInfo the type info
* @param key the key
- * @param method the method
+ * @param ctMethod the method
*/
public JavassistMethodInfo(AnnotationHelper annotationHelper, JavassistTypeInfo typeInfo, SignatureKey key, CtMethod ctMethod)
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistParameterInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistParameterInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistParameterInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -47,8 +47,9 @@
/**
* Create a new JavassistParameterInfo.
*
+ * @param annotationHelper the annotation helper
* @param annotated the annotated object
- * @param name the name
+ * @param index the index
* @param parameterType the type
*/
public JavassistParameterInfo(AnnotationHelper annotationHelper, JavassistAnnotatedParameterInfo annotated, int index, TypeInfo parameterType)
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistTypeInfoFactoryImpl.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -22,7 +22,6 @@
package org.jboss.reflect.plugins.javassist;
import java.lang.annotation.Annotation;
-import java.util.Arrays;
import javassist.ClassPool;
import javassist.CtClass;
@@ -33,8 +32,8 @@
import org.jboss.reflect.plugins.AnnotationAttributeImpl;
import org.jboss.reflect.plugins.AnnotationHelper;
+import org.jboss.reflect.plugins.AnnotationValueFactory;
import org.jboss.reflect.plugins.AnnotationValueImpl;
-import org.jboss.reflect.plugins.AnnotationValueFactory;
import org.jboss.reflect.spi.AnnotationInfo;
import org.jboss.reflect.spi.AnnotationValue;
import org.jboss.reflect.spi.PrimitiveInfo;
@@ -85,12 +84,12 @@
}
/**
- * Raise NoSuchMethodError for javassist not found
+ * Raise NoClassDefFoundError for javassist not found
*
* @param name the name
* @param e the not found error
* @return never
- * @throws NoSuchMethodError always
+ * @throws NoClassDefFoundError always
*/
public static NoClassDefFoundError raiseMethodNotFound(String name, NotFoundException e) throws NoClassDefFoundError
{
@@ -101,12 +100,12 @@
}
/**
- * Raise NoSuchFieldError for javassist not found
+ * Raise NoClassDefFoundError for javassist not found
*
* @param name the name
* @param e the not found error
* @return never
- * @throws NoSuchFieldError always
+ * @throws NoClassDefFoundError always
*/
public static NoClassDefFoundError raiseFieldNotFound(String name, NotFoundException e) throws NoClassDefFoundError
{
@@ -116,6 +115,7 @@
throw ex;
}
+ @SuppressWarnings("unchecked")
protected Object instantiate(Class clazz)
{
try
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/FieldInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/FieldInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/FieldInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -54,6 +54,7 @@
* Get the value of the field
*
* @param target the target
+ * @return the field value
* @throws Throwable for any error
*/
Object get(Object target) throws Throwable;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/spi/TypeInfo.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -49,7 +49,7 @@
*
* @param value the original value
* @return the converted value
- * @throws Throwble for any error
+ * @throws Throwable for any error
*/
Object convertValue(Object value) throws Throwable;
@@ -73,7 +73,7 @@
*
* @param size the size
* @return the converted value
- * @throws Throwble for any error
+ * @throws Throwable for any error
*/
Object[] newArrayInstance(int size) throws Throwable;
}
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/classloading/VFSClassLoader.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -309,12 +309,13 @@
/**
* Determine the protection domain. If we are a copy of the original
* deployment, use the original url as the codebase.
+ *
+ * @param classFile the virtual file for this class
* @return the protection domain
- * @throws MalformedURLException
+ * @throws Exception for any error
* TODO certificates and principles?
*/
- protected ProtectionDomain getProtectionDomain(VirtualFile classFile)
- throws Exception
+ protected ProtectionDomain getProtectionDomain(VirtualFile classFile) throws Exception
{
Certificate certs[] = null;
URL codesourceUrl = classFile.toURL();
@@ -332,9 +333,10 @@
*
* @param searchCtxs - input array of vfs paths relative to vfs
* @param vfs - the vfs to resolve the searchCtxs against
+ * @return the contexts
+ * @throws IOException for any error
*/
- protected String[] resolveSearchCtxs(String[] searchCtxs, VFS vfs)
- throws IOException
+ protected String[] resolveSearchCtxs(String[] searchCtxs, VFS vfs) throws IOException
{
ArrayList<String> tmp = new ArrayList<String>(searchCtxs.length);
for(String ctx : searchCtxs)
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/context/file/LinkHandler.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -104,6 +104,7 @@
* @param links the links
* @throws IOException for an error accessing the file system
* @throws IllegalArgumentException for a null context, url
+ * @throws URISyntaxException if the uri cannot be parsed
*/
public LinkHandler(FileSystemContext context, VirtualFileHandler parent, URI uri, String name,
List<LinkInfo> links)
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/AnnotationCreatorTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/AnnotationCreatorTest.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/AnnotationCreatorTest.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -83,7 +83,7 @@
try
{
String expr = "@org.jboss.test.annotation.factory.support.SimpleValue";
- Annotation annotation = (Annotation)AnnotationCreator.createAnnotation(expr, SimpleValue.class);
+ AnnotationCreator.createAnnotation(expr, SimpleValue.class);
fail("Should have picked up on missing attribute");
}
catch (AnnotationValidationException expected)
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/NoJavassistAnnotationCreatorTestCase.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/NoJavassistAnnotationCreatorTestCase.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/annotation/factory/test/NoJavassistAnnotationCreatorTestCase.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -21,14 +21,11 @@
*/
package org.jboss.test.annotation.factory.test;
-import java.lang.annotation.Annotation;
-
import junit.framework.Test;
import org.jboss.annotation.factory.AnnotationCreator;
import org.jboss.annotation.factory.AnnotationValidationException;
import org.jboss.test.annotation.factory.support.ComplexWithDefault;
-import org.jboss.test.annotation.factory.support.MyEnum;
/**
@@ -53,7 +50,7 @@
try
{
String expr = "@org.jboss.test.annotation.factory.support.ComplexWithDefault";
- Annotation annotation = (Annotation)AnnotationCreator.createAnnotation(expr, ComplexWithDefault.class);
+ AnnotationCreator.createAnnotation(expr, ComplexWithDefault.class);
fail("Should have had a validation exception");
}
catch (AnnotationValidationException expected)
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/memorytests/ClassInfoMemoryTestCase.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -98,8 +98,6 @@
simpleBeanInterface = null;
checkUnload( weakReferenceOnLoader,"org.jboss.test.classinfo.support.SimpleBean","./leak-report.html");
}
-
- /**clebert end**/
protected ClassInfo getClassInfo(ClassLoader loader,Class clazz)
{
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -97,6 +97,7 @@
/**
* Assert an annotation
*
+ * @param <T> the type
* @param metaData the meta data
* @param type the annotation type
* @throws Exception for any error
@@ -119,6 +120,7 @@
/**
* Assert an annotation
*
+ * @param <T> the type
* @param metaData the retrieval
* @param type the annotation type
* @throws Exception for any error
@@ -136,6 +138,7 @@
/**
* Assert meta data
*
+ * @param <T> the type
* @param metaData the meta data
* @param type the type
* @throws Exception for any error
@@ -156,6 +159,7 @@
/**
* Assert meta data
*
+ * @param <T> the type
* @param metaData the retrieval
* @param type the type
* @throws Exception for any error
@@ -172,6 +176,7 @@
/**
* Assert meta data
*
+ * @param <T> the type
* @param metaData the meta data
* @param name the name
* @param type the type
@@ -193,6 +198,7 @@
/**
* Assert meta data
*
+ * @param <T> the type
* @param metaData the retrieval
* @param name the name
* @param type the type
@@ -210,6 +216,7 @@
/**
* Assert an annotation is not present
*
+ * @param <T> the type
* @param metaData the meta data
* @param type the annotation type
* @throws Exception for any error
@@ -228,6 +235,7 @@
/**
* Assert an annotation is not present
*
+ * @param <T> the type
* @param metaData the retrieval
* @param type the annotation type
* @throws Exception for any error
@@ -245,6 +253,7 @@
/**
* Assert a metadata type is not present
*
+ * @param <T> the type
* @param metaData the meta data
* @param type the type
* @throws Exception for any error
@@ -262,6 +271,7 @@
/**
* Assert a metadata type is not present
*
+ * @param <T> the type
* @param metaData the meta data
* @param type the type
* @throws Exception for any error
@@ -278,6 +288,7 @@
/**
* Assert a metadata name is not present
*
+ * @param <T> the type
* @param metaData the meta data
* @param name the name
* @param type the type
@@ -296,6 +307,7 @@
/**
* Assert a metadata name is not present
*
+ * @param <T> the type
* @param metaData the retrieval
* @param name the name
* @param type the type
@@ -384,6 +396,7 @@
/**
* Check an annotation is added with no previous
*
+ * @param <T> the type
* @param mutable the meta data
* @param annotation the annotation
* @param expectedAnnotations the expected annotations
@@ -400,6 +413,7 @@
/**
* Check an annotation is added with no previous
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param annotation the annotation
@@ -434,6 +448,7 @@
/**
* Check an annotation is added with no previous
*
+ * @param <T> the type
* @param mutable the retrieval
* @param annotation the annotation
* @param expectedAnnotations the expected annotations
@@ -464,6 +479,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the meta data
* @param type the type
@@ -481,6 +497,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param object the object
@@ -513,6 +530,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the meta data
* @param type the type
@@ -541,6 +559,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the meta data
* @param name the name
@@ -559,6 +578,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param object the object
@@ -591,6 +611,7 @@
/**
* Check an meta data is added with no previous
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the meta data
* @param name the name
@@ -619,11 +640,11 @@
/**
* Check an annotation is added with a previous value
*
+ * @param <T> the type
* @param mutable the meta data
* @param annotation the annotation
- * @param expected the expected type
- * @param expectedAnnotations the expected annotations
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T extends Annotation> long assertAddAnnotationWithPrevious(MutableMetaData mutable, T annotation, long last) throws Exception
@@ -635,12 +656,12 @@
/**
* Check an annotation is added with a previous value
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param annotation the annotation
- * @param expected the expected type
- * @param expectedAnnotations the expected annotations
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T extends Annotation> long assertAddAnnotationWithPrevious(MetaData metaData, MutableMetaData mutable, T annotation, long last) throws Exception
@@ -669,11 +690,11 @@
/**
* Check an annotation is added with a previous value
*
+ * @param <T> the type
* @param mutable the retrieval
* @param annotation the annotation
- * @param expected the expected type
- * @param expectedAnnotations the expected annotations
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T extends Annotation> long assertAddAnnotationWithPrevious(MutableMetaDataLoader mutable, T annotation, long last) throws Exception
@@ -704,10 +725,10 @@
/**
* Check an annotation is added with a previous value
*
+ * @param <T> the type
* @param mutable the retrieval
* @param annotation the annotation
- * @param expected the expected type
- * @param expectedAnnotations the expected annotations
+ * @param last the last valid time
* @throws Exception for any error
*/
protected <T extends Annotation> void assertAddAnnotationWithPreviousSameObject(MutableMetaData mutable, T annotation, long last) throws Exception
@@ -734,11 +755,11 @@
/**
* Check an annotation is added with a previous value
- *
+ *
+ * @param <T> the type
* @param mutable the retrieval
* @param annotation the annotation
- * @param expected the expected type
- * @param expectedAnnotations the expected annotations
+ * @param last the last valid time
* @throws Exception for any error
*/
protected <T extends Annotation> void assertAddAnnotationWithPreviousSameObject(MutableMetaDataLoader mutable, T annotation, long last) throws Exception
@@ -769,10 +790,12 @@
/**
* Check metadata is added with a previous value
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MutableMetaData mutable, T object, Class<T> type, long last) throws Exception
@@ -784,11 +807,13 @@
/**
* Check metadata is added with a previous value
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param object the object
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MetaData metaData, MutableMetaData mutable, T object, Class<T> type, long last) throws Exception
@@ -815,10 +840,12 @@
/**
* Check metadata is added with a previous value
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MutableMetaDataLoader mutable, T object, Class<T> type, long last) throws Exception
@@ -841,11 +868,13 @@
/**
* Check metadata is added with a previous value
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param name the name
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MutableMetaData mutable, T object, String name, Class<T> type, long last) throws Exception
@@ -857,11 +886,14 @@
/**
* Check metadata is added with a previous value
*
- * @param mutable the meta data
+ * @param <T> the type
+ * @param metaData the meta data
+ * @param mutable the mutable
* @param object the object
* @param name the name
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MetaData metaData, MutableMetaData mutable, T object, String name, Class<T> type, long last) throws Exception
@@ -887,11 +919,13 @@
/**
* Check metadata is added with a previous value
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param name the name
* @param type the type
* @param last the last valid time
+ * @return the new last valid time
* @throws Exception for any error
*/
protected <T> long assertAddMetaDataWithPrevious(MutableMetaDataLoader mutable, T object, String name, Class<T> type, long last) throws Exception
@@ -913,6 +947,7 @@
/**
* Check metadata is added with a previous value the same object
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param type the type
@@ -942,6 +977,7 @@
/**
* Check metadata is added with a previous value the same object
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param type the type
@@ -968,6 +1004,7 @@
/**
* Check metadata is added with a previous value the same object
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param name the name
@@ -997,6 +1034,7 @@
/**
* Check metadata is added with a previous value the same object
*
+ * @param <T> the type
* @param mutable the meta data
* @param object the object
* @param name the name
@@ -1023,8 +1061,10 @@
/**
* Check an annotation is removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param expected the expected type
+ * @param expectedAnnotations the expected annotations
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1037,9 +1077,11 @@
/**
* Check an annotation is removed
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the meta data loader
* @param expected the expected type
+ * @param expectedAnnotations the expected annotations
* @param last the last valid time
* @param stillExpected whether it is still expected elsewhere
* @throws Exception for any error
@@ -1080,8 +1122,10 @@
/**
* Check an annotation is removed
*
+ * @param <T> the type
* @param mutable the retrieval
* @param expected the expected type
+ * @param expectedAnnotations the expected annotations
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1113,8 +1157,10 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1127,9 +1173,11 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @param stillExpected whether it is still expected elsewhere
* @throws Exception for any error
@@ -1167,8 +1215,10 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1192,9 +1242,11 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param name the name
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1207,10 +1259,12 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param metaData the meta data
* @param mutable the mutable
* @param name the name
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @param stillExpected whether it is still expected elsewhere
* @throws Exception for any error
@@ -1246,9 +1300,11 @@
/**
* Check meta data is removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param name the name
* @param type the type
+ * @param expected the expected meta data
* @param last the last valid time
* @throws Exception for any error
*/
@@ -1270,6 +1326,7 @@
/**
* Check an annotation is not removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param expected the expected type
* @param last the last valid time
@@ -1299,6 +1356,7 @@
/**
* Check an annotation is not removed
*
+ * @param <T> the type
* @param mutable the retrieval
* @param expected the expected type
* @param last the last valid time
@@ -1325,6 +1383,7 @@
/**
* Check meta data is not removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param type the type
* @param last the last valid time
@@ -1352,6 +1411,7 @@
/**
* Check meta data is not removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param type the type
* @param last the last valid time
@@ -1376,6 +1436,7 @@
/**
* Check meta data is not removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param name the name
* @param type the type
@@ -1403,6 +1464,7 @@
/**
* Check meta data is not removed
*
+ * @param <T> the type
* @param mutable the meta data
* @param name the name
* @param type the type
@@ -1461,7 +1523,6 @@
*
* @param metaData the meta data
* @param last the last valid time
- * @return the current valid time
*/
protected void assertValidTimeUnchanged(MetaData metaData, long last)
{
@@ -1476,7 +1537,6 @@
*
* @param metaData the retrieval
* @param last the last valid time
- * @return the current valid time
*/
protected void assertValidTimeUnchanged(MetaDataRetrieval metaData, long last)
{
@@ -1511,6 +1571,7 @@
*
* @param metaData the meta data
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAllAnnotations(MetaData metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1523,6 +1584,7 @@
* @param metaData the meta data
* @param expected the expected annotation classes
* @param local whether to test the local annotations
+ * @throws Exception for any error
*/
protected void assertAllAnnotations(MetaData metaData, ExpectedAnnotations expected, boolean local) throws Exception
{
@@ -1539,6 +1601,7 @@
*
* @param metaData the meta data
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAnnotations(MetaData metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1562,6 +1625,7 @@
*
* @param metaData the meta data
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertLocalAnnotations(MetaData metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1585,6 +1649,7 @@
*
* @param metaData the retrieval
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAllAnnotations(MetaDataRetrieval metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1597,6 +1662,7 @@
* @param metaData the retrieval
* @param expected the expected annotation classes
* @param local whether to test the local annotations
+ * @throws Exception for any error
*/
protected void assertAllAnnotations(MetaDataRetrieval metaData, ExpectedAnnotations expected, boolean local) throws Exception
{
@@ -1613,6 +1679,7 @@
*
* @param metaData the retrieval
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAnnotations(MetaDataRetrieval metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1640,6 +1707,7 @@
*
* @param metaData the retrieval
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertLocalAnnotations(MetaDataRetrieval metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1667,6 +1735,7 @@
*
* @param metaData the meta data
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertAllMetaData(MetaData metaData, ExpectedMetaData expected) throws Exception
{
@@ -1679,6 +1748,7 @@
* @param metaData the meta data
* @param expected the expected types
* @param local whether to include the local meta data
+ * @throws Exception for any error
*/
protected void assertAllMetaData(MetaData metaData, ExpectedMetaData expected, boolean local) throws Exception
{
@@ -1692,6 +1762,7 @@
*
* @param metaData the meta data
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertMetaData(MetaData metaData, ExpectedMetaData expected) throws Exception
{
@@ -1715,6 +1786,7 @@
*
* @param metaData the meta data
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertLocalMetaData(MetaData metaData, ExpectedMetaData expected) throws Exception
{
@@ -1738,6 +1810,7 @@
*
* @param metaData the retrieval
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertAllMetaData(MetaDataRetrieval metaData, ExpectedMetaData expected) throws Exception
{
@@ -1750,6 +1823,7 @@
* @param metaData the retrieval
* @param expected the expected types
* @param local whether to include the local meta data
+ * @throws Exception for any error
*/
protected void assertAllMetaData(MetaDataRetrieval metaData, ExpectedMetaData expected, boolean local) throws Exception
{
@@ -1763,6 +1837,7 @@
*
* @param metaData the retrieval
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertMetaData(MetaDataRetrieval metaData, ExpectedMetaData expected) throws Exception
{
@@ -1790,6 +1865,7 @@
*
* @param metaData the retrieval
* @param expected the expected types
+ * @throws Exception for any error
*/
protected void assertLocalMetaData(MetaDataRetrieval metaData, ExpectedMetaData expected) throws Exception
{
@@ -1832,6 +1908,7 @@
*
* @param metaData the meta data
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAnnotationMetaDatas(MetaData metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1857,6 +1934,7 @@
*
* @param metaData the meta data
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertLocalAnnotationMetaDatas(MetaData metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1882,6 +1960,7 @@
*
* @param metaData the retrieval
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertAnnotationMetaDatas(MetaDataRetrieval metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1911,6 +1990,7 @@
*
* @param metaData the retrieval
* @param expected the expected annotation classes
+ * @throws Exception for any error
*/
protected void assertLocalAnnotationMetaDatas(MetaDataRetrieval metaData, ExpectedAnnotations expected) throws Exception
{
@@ -1962,6 +2042,7 @@
/**
* Assert two collections are equal
*
+ * @param <T> the type
* @param context the context
* @param expected the expected
* @param actual the actual
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractDependencyItem.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -188,6 +188,7 @@
/**
* Register a dependency with another context
*
+ * @param controller the controller
* @param context the other context
*/
protected void addDependsOnMe(Controller controller, ControllerContext context)
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/spi/action/ControllerContextAction.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/spi/action/ControllerContextAction.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/spi/action/ControllerContextAction.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -43,7 +43,6 @@
* Uninstall a context
*
* @param context the context
- * @throws Throwable for any error
*/
void uninstall(ControllerContext context);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -492,6 +492,7 @@
return name;
}
+ @SuppressWarnings("unchecked")
public Object getValue(TypeInfo info, ClassLoader cl) throws Throwable
{
ControllerContext context = controller.getInstalledContext(name);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -108,9 +108,9 @@
*
* @param whenRequiredState the when required state or null if it uses current context state
*/
- public void setWhenRequiredState(ControllerState whenRequredState)
+ public void setWhenRequiredState(ControllerState whenRequiredState)
{
- this.whenRequiredState = whenRequredState;
+ this.whenRequiredState = whenRequiredState;
flushJBossObjectCache();
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -22,6 +22,7 @@
package org.jboss.beans.metadata.plugins;
import org.jboss.beans.metadata.spi.MetaDataVisitor;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.kernel.spi.dependency.KernelController;
@@ -141,7 +142,11 @@
{
KernelControllerContext context = visitor.getControllerContext();
controller = (KernelController) context.getController(); // set controller
- TypeProvider typeProvider = (TypeProvider) visitor.visitorNodeStack().pop();
+
+ // FIXME this popping and pushing looks broken, should be peek?
+ MetaDataVisitorNode node = visitor.visitorNodeStack().pop();
+ // FIXME Not typesafe
+ TypeProvider typeProvider = (TypeProvider) node;
try
{
DependencyItem item = new ClassContextDependencyItem(
@@ -154,9 +159,10 @@
catch (Throwable throwable)
{
throw new Error(throwable);
- } finally
+ }
+ finally
{
- visitor.visitorNodeStack().push(typeProvider);
+ visitor.visitorNodeStack().push(node);
}
}
else
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInstallMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -144,7 +144,6 @@
* Create a new InstallationDependencyItem.
*
* @param name the name
- * @param state the state
*/
public InstallationDependencyItem(Object name)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractParameterMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -172,15 +172,18 @@
}
else
{
- Stack visitorNodeStack = visitor.visitorNodeStack();
- TypeProvider typeProvider = (TypeProvider) visitorNodeStack.pop();
+ Stack<MetaDataVisitorNode> visitorNodeStack = visitor.visitorNodeStack();
+ // FIXME this popping and pushing looks broken, should be peek?
+ MetaDataVisitorNode node = visitor.visitorNodeStack().pop();
+ // FIXME Not typesafe
+ TypeProvider typeProvider = (TypeProvider) node;
try
{
return typeProvider.getType(visitor, this);
}
finally
{
- visitorNodeStack.push(typeProvider);
+ visitorNodeStack.push(node);
}
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractPropertyMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -95,6 +95,7 @@
*
* @param name the name
* @param value the string value
+ * @param type the type
*/
public AbstractPropertyMetaData(String name, String value, String type)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -23,6 +23,7 @@
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.MetaDataVisitor;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.joinpoint.spi.TargettedJoinpoint;
@@ -108,7 +109,7 @@
private void preparePreinstantiatedLookup(MetaDataVisitor visitor)
{
- Object parent = visitor.visitorNodeStack().pop();
+ MetaDataVisitorNode parent = visitor.visitorNodeStack().pop();
try
{
if (parent instanceof PropertyMetaData)
@@ -129,6 +130,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected Object preinstantiatedLookup(ClassLoader cl, Class expected)
{
Object result = null;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractValueMetaData.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -93,15 +93,18 @@
public Class getType(MetaDataVisitor visitor, MetaDataVisitorNode previous) throws Throwable
{
- Stack visitorNodeStack = visitor.visitorNodeStack();
- TypeProvider typeProvider = (TypeProvider) visitorNodeStack.pop();
+ Stack<MetaDataVisitorNode> visitorNodeStack = visitor.visitorNodeStack();
+ // FIXME this popping and pushing looks broken, should be peek?
+ MetaDataVisitorNode node = visitor.visitorNodeStack().pop();
+ // FIXME Not typesafe
+ TypeProvider typeProvider = (TypeProvider) node;
try
{
return typeProvider.getType(visitor, this);
}
finally
{
- visitorNodeStack.push(typeProvider);
+ visitorNodeStack.push(node);
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionType.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionType.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/InjectionType.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -41,7 +41,7 @@
/**
* Create a new state
*
- * @param modeString the string representation
+ * @param typeString the string representation
*/
public InjectionType(String typeString)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/MetaDataVisitor.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -82,6 +82,5 @@
*
* @return stack of meta data objects in this branch
*/
- Stack visitorNodeStack();
-
+ Stack<MetaDataVisitorNode> visitorNodeStack();
}
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/KernelPermission.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -67,6 +67,7 @@
* Create a new Permission
*
* @param name the target
+ * @param actions the actions
* @throws IllegalArgumentException for an invalid name or target
* @throws NullPointerException for null name
*/
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -176,6 +176,7 @@
* @param kernel the kernel
* @param name the name
* @param object the object
+ * @throws Throwable for any error
*/
protected void register(Kernel kernel, String name, Object object) throws Throwable
{
@@ -188,6 +189,7 @@
* @param kernel the kernel
* @param name the name
* @param object the object
+ * @throws Throwable for any error
*/
protected void register(Kernel kernel, Object name, Object object) throws Throwable
{
@@ -214,6 +216,7 @@
* @param kernel the kernel
* @param object the object
* @return the entry
+ * @throws Throwable for any error
*/
protected KernelRegistryEntry createKernelRegistryEntry(Kernel kernel, Object object) throws Throwable
{
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-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/Configurator.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -58,6 +58,7 @@
/**
* Instantiate and configure a bean
*
+ * @param config the confg
* @param info the bean info
* @param metaData the bean metadata
* @return the instantiated and configured object
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -143,7 +143,7 @@
* @param type the type
* @param defaultType the default implementation
* @return the implementation object
- * @throws Exception for any error
+ * @throws Throwable for any error
*/
protected Object getImplementation(String type, String defaultType) throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -278,6 +278,8 @@
*
* @param context context whose target is instance of clazz
* @param clazz current class to map context to
+ * @param addition whether this is an addition
+ * @param trace whether trace is enabled
*/
protected void traverseBean(KernelControllerContext context, Class clazz, boolean addition, boolean trace)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -34,7 +34,11 @@
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.dependency.plugins.AbstractControllerContext;
import org.jboss.dependency.plugins.AbstractDependencyInfo;
-import org.jboss.dependency.spi.*;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -222,12 +226,12 @@
/**
* Visited branch stack
*/
- protected Stack visitorNodeStack;
+ protected Stack<MetaDataVisitorNode> visitorNodeStack;
protected AbstractMetaDataVistor(BeanMetaData bmd)
{
this.bmd = bmd;
- this.visitorNodeStack = new Stack();
+ this.visitorNodeStack = new Stack<MetaDataVisitorNode>();
}
public void initialVisit(MetaDataVisitorNode node)
@@ -284,7 +288,7 @@
this.contextState = contextState;
}
- public Stack visitorNodeStack()
+ public Stack<MetaDataVisitorNode> visitorNodeStack()
{
return visitorNodeStack;
}
@@ -298,6 +302,8 @@
{
/**
* Create a new MetaDataVisitor.
+ *
+ * @param bmd the bean metadata
*/
public PreprocessMetaDataVisitor(BeanMetaData bmd)
{
@@ -354,6 +360,8 @@
{
/**
* Create a new MetaDataVisitor.
+ *
+ * @param bmd the bean meta data
*/
public DescribedMetaDataVisitor(BeanMetaData bmd)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -64,13 +64,12 @@
DependencyInfo depends = context.getDependencyInfo();
// add custom dependencies (e.g. AOP layer).
- List dependencies = info.getDependencies();
+ List<Object> dependencies = info.getDependencies();
if (dependencies != null)
{
- Iterator it = dependencies.iterator();
- while (it.hasNext())
+ for (Object dependencyName : dependencies)
{
- AbstractDependencyItem dependency = new AbstractDependencyItem(metaData.getName(), it.next(), ControllerState.INSTANTIATED, ControllerState.INSTALLED);
+ AbstractDependencyItem dependency = new AbstractDependencyItem(metaData.getName(), dependencyName, ControllerState.INSTANTIATED, ControllerState.INSTALLED);
depends.addIDependOn(dependency);
}
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployer.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -82,6 +82,8 @@
* Create a new kernel deployer
*
* @param kernel the kernel
+ * @param requiredState the required state
+ * @param mode the controller mode
*/
public AbstractKernelDeployer(final Kernel kernel, ControllerState requiredState, ControllerMode mode)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -79,7 +79,7 @@
/**
* Set the bean factories.
*
- * @param beans a List<BeanMetaDataFactory>.
+ * @param beanFactories a List<BeanMetaDataFactory>.
*/
public void setBeanFactories(List<BeanMetaDataFactory> beanFactories)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BasicXMLDeployer.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -116,6 +116,7 @@
* Deploy a url
*
* @param url the url to deploy
+ * @return the kernel deployment
* @throws Throwable for any error
*/
public KernelDeployment deploy(final URL url) throws Throwable
@@ -158,6 +159,8 @@
*
* @param deploymentName the deployment name
* @param stream the stream
+ * @return the kernel deployment
+ * @throws Throwable for any error
*/
public KernelDeployment deploy(String deploymentName, final InputStream stream) throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanSchemaBindingHelper.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -277,7 +277,7 @@
/**
* Initialize the handlers for the demands type
*
- * @param demandsType the demand type
+ * @param demandType the demand type
*/
public static void initDemandHandlers(TypeBinding demandType)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/BeanXMLDeployer.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -67,6 +67,7 @@
* Deploy a url
*
* @param url the url to deploy
+ * @return the kernel deployment
* @throws Throwable for any error
*/
public KernelDeployment deploy(final URL url) throws Throwable
@@ -108,6 +109,8 @@
*
* @param deploymentName the deployment name
* @param stream the stream
+ * @return the kernel deployment
+ * @throws Throwable for any error
*/
public KernelDeployment deploy(String deploymentName, final InputStream stream) throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelController.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelController.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -74,7 +74,10 @@
void removeSupplies(KernelControllerContext context);
/**
- * @return all instantiated contexts whose target is instance of this class clazz param
+ * Get all instantiated contexts of a type
+ *
+ * @param clazz the type
+ * @return the contexts
*/
Set<KernelControllerContext> getInstantiatedContexts(Class clazz);
@@ -82,6 +85,7 @@
* If zero or multiple instances match class clazz
* a warning is issued, but no throwable is thrown
*
+ * @param clazz the type
* @return context whose target is instance of this class clazz param or null if zero or multiple such instances
*/
KernelControllerContext getContextByClass(Class clazz);
@@ -89,12 +93,16 @@
/**
* add instantiated context into contextsByClass map
* look at all target's superclasses and interfaces
+ *
+ * @param context the context
*/
void addInstantiatedContext(KernelControllerContext context);
/**
* remove instantiated context from contextsByClass map
* look at all target's superclasses and interfaces
+ *
+ * @param context the context
*/
void removeInstantiatedContext(KernelControllerContext context);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/dependency/KernelControllerContext.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -79,7 +79,7 @@
/**
* Set the metadata context
*
- * @oparam mctx the metadata context
+ * @param mctx the metadata context
*/
void setMetaDataContext(MetaDataContext mctx);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTest.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTest.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -122,7 +122,7 @@
*
* @param url the deployment url
* @return the deployment
- * @throws Throwable for any error
+ * @throws Exception for any error
*/
protected KernelDeployment deploy(URL url) throws Exception
{
@@ -134,7 +134,7 @@
*
* @param resource the deployment resource
* @return the deployment
- * @throws Throwable for any error
+ * @throws Exception for any error
*/
protected KernelDeployment deploy(String resource) throws Exception
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/test/kernel/junit/MicrocontainerTestDelegate.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -103,6 +103,7 @@
* Get the kernel bootstrap
*
* @return the bootstrap
+ * @throws Exception for any error
*/
protected AbstractBootstrap getBootstrap() throws Exception
{
@@ -142,6 +143,8 @@
/**
* Validate
+ *
+ * @throws Exception for any error
*/
protected void validate() throws Exception
{
@@ -172,7 +175,7 @@
*
* @param url the deployment url
* @return the deployment
- * @throws Throwable for any error
+ * @throws Exception for any error
*/
protected KernelDeployment deploy(URL url) throws Exception
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/javabean/test/AbstractJavaBeanTest.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -50,7 +50,7 @@
* Unmarshal some xml
*
* @param name the name
- * @param class the expected type
+ * @param expected the expected type
* @return the unmarshalled object
* @throws Exception for any error
*/
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -23,16 +23,19 @@
import java.util.HashSet;
-import org.jboss.beans.metadata.plugins.*;
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.StringValueMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
-import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
-import junit.framework.Test;
-
/**
* Array Test Case.
*
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/TestUtil.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/TestUtil.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/support/TestUtil.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -88,6 +88,10 @@
/**
* Install a BeanMetaData
+ *
+ * @param beanMetaData the bean meta data
+ * @return the context
+ * @throws Throwable for any error
*/
public KernelControllerContext install(BeanMetaData beanMetaData) throws Throwable
{
@@ -96,14 +100,21 @@
/**
* Uninstall
+ *
+ * @param name the name
+ * @throws Throwable for any error
*/
- public void uninstall(String name1) throws Throwable
+ public void uninstall(String name) throws Throwable
{
- controller.uninstall(name1);
+ controller.uninstall(name);
}
/**
* Get a context
+ *
+ * @param name the name
+ * @return the context
+ * @throws Throwable for any error
*/
public ControllerContext getContext(String name) throws Throwable
{
@@ -112,6 +123,10 @@
/**
* Get installed context
+ *
+ * @param name the name
+ * @return the context
+ * @throws Throwable for any error
*/
public ControllerContext getInstalledContext(String name) throws Throwable
{
@@ -120,6 +135,9 @@
/**
* Deploy a url
+ *
+ * @param url the url
+ * @throws Throwable for any error
*/
public void deploy(URL url) throws Throwable
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java 2006-09-25 10:39:05 UTC (rev 57132)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InjectionTestCase.java 2006-09-25 11:09:27 UTC (rev 57133)
@@ -27,7 +27,6 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.dependency.spi.ControllerState;
More information about the jboss-cvs-commits
mailing list