[jboss-cvs] JBossAS SVN: r75916 - in projects/jboss-deployers/trunk: deployers-impl/src/tests/org/jboss/test/deployers/annotations/support and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jul 16 07:11:13 EDT 2008


Author: adrian at jboss.org
Date: 2008-07-16 07:11:12 -0400 (Wed, 16 Jul 2008)
New Revision: 75916

Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/AbstractElement.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassElement.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java
   projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java
   projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java
   projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
   projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java
   projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractAnnotationDeployer.java
   projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractRealDeployerWithInput.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleVFSParsingDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/AliasMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarDeploymentMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java
Log:
Source code tidyup

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/AbstractElement.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/AbstractElement.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/AbstractElement.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -30,6 +30,8 @@
 /**
  * Abstract annotations element.
  *
+ * @param <A> the annotation type
+ * @param <M> the annotated element type
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public abstract class AbstractElement<A extends Annotation, M extends AnnotatedElement> extends WeakClassLoaderHolder implements Element<A, M>

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassElement.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassElement.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassElement.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -27,6 +27,8 @@
 /**
  * Class annotations element.
  *
+ * @param <A> the annotation type
+ * @param <M> the annotated element type
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public class ClassElement<A extends Annotation, M extends AnnotatedElement> extends AbstractElement<A, M>

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -145,6 +145,8 @@
    /**
     * Transform class names into classes.
     *
+    * @param <A> the annotation type
+    * @param <M> the annotated element type
     * @param type the annotation type
     * @param annClass the annotation class
     * @param aoClass the ao class
@@ -184,14 +186,16 @@
       return getCSPairs(annotation, ElementType.TYPE).isEmpty() == false;
    }
 
-   public <A extends Annotation> Set<Element<A, Class>> classIsAnnotatedWith(Class<A> annotation)
+   @SuppressWarnings("unchecked")
+   public <A extends Annotation> Set<Element<A, Class<?>>> classIsAnnotatedWith(Class<A> annotation)
    {
-      return transformToElements(ElementType.TYPE, annotation, Class.class);
+      return (Set) transformToElements(ElementType.TYPE, annotation, Class.class);
    }
 
-   public <A extends Annotation> Set<Element<A, Constructor>> classHasConstructorAnnotatedWith(Class<A> annotation)
+   @SuppressWarnings("unchecked")
+   public <A extends Annotation> Set<Element<A, Constructor<?>>> classHasConstructorAnnotatedWith(Class<A> annotation)
    {
-      return transformToElements(ElementType.CONSTRUCTOR, annotation, Constructor.class);
+      return (Set) transformToElements(ElementType.CONSTRUCTOR, annotation, Constructor.class);
    }
 
    public <A extends Annotation> Set<Element<A, Field>> classHasFieldAnnotatedWith(Class<A> annotation)
@@ -229,12 +233,12 @@
       return hasClassAnnotatedWith(getAnnotationClass(annotationName));
    }
 
-   public Set<Element<Annotation, Class>> classIsAnnotatedWith(String annotationName)
+   public Set<Element<Annotation, Class<?>>> classIsAnnotatedWith(String annotationName)
    {
       return classIsAnnotatedWith(getAnnotationClass(annotationName));
    }
 
-   public Set<Element<Annotation, Constructor>> classHasConstructorAnnotatedWith(String annotationName)
+   public Set<Element<Annotation, Constructor<?>>> classHasConstructorAnnotatedWith(String annotationName)
    {
       return classHasConstructorAnnotatedWith(getAnnotationClass(annotationName));
    }

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -35,6 +35,8 @@
 /**
  * Default annotations element.
  *
+ * @param <A> the annotation type
+ * @param <M> the annotated element type
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public class DefaultElement<A extends Annotation, M extends AnnotatedElement> extends AbstractElement<A, M>

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -34,6 +34,8 @@
 /**
  * Parameters annotations element.
  *
+ * @param <A> the annotation type
+ * @param <M> the annotated element type
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public class ParametersElement<A extends Annotation, M extends AnnotatedElement> extends DefaultElement<A, M>
@@ -52,7 +54,7 @@
          ConstructorParametersSignature cps = (ConstructorParametersSignature)signature;
          try
          {
-            Constructor constructor = clazz.getConstructor(signature.getParametersTypes(clazz));
+            Constructor<?> constructor = clazz.getConstructor(signature.getParametersTypes(clazz));
             annotations = constructor.getParameterAnnotations()[cps.getParam()];
          }
          catch (NoSuchMethodException ignored)

Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -28,6 +28,7 @@
 public class AnnotationsHolder
 {
    @TestAnnotation("field")
+   @SuppressWarnings("unused")
    private Object object;
 
    @TestAnnotation("constructor")

Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -80,18 +80,18 @@
          assertLoaded(unit, "org.jboss.test.deployers.annotations.support.TestAnnotation");
 
          AnnotationEnvironment env = getAnnotationEnvironment(unit);
-         Set<Element<TestAnnotation, Class>> classes = env.classIsAnnotatedWith(taClass);
+         Set<Element<TestAnnotation, Class<?>>> classes = env.classIsAnnotatedWith(taClass);
          assertNotNull(classes);
          assertEquals(1, classes.size());
          assertEquals(AnnotationsHolder.class.getName(), classes.iterator().next().getOwnerClassName());
          assertNotLoaded(unit, "org.jboss.test.deployers.annotations.support.AnnotationsHolder");
 
-         Element<TestAnnotation, Class> ecl = getSingleton(env.classIsAnnotatedWith(taClass));
+         Element<TestAnnotation, Class<?>> ecl = getSingleton(env.classIsAnnotatedWith(taClass));
          Annotation tacl = ecl.getAnnotation();
          assertNotNull(tacl);
          assertEquals("class", getValue(tacl));
 
-         Element<TestAnnotation, Constructor> ec = getSingleton(env.classHasConstructorAnnotatedWith(taClass));
+         Element<TestAnnotation, Constructor<?>> ec = getSingleton(env.classHasConstructorAnnotatedWith(taClass));
          Annotation ta = ec.getAnnotation();
          assertNotNull(ta);
          assertEquals("constructor", getValue(ta));
@@ -156,18 +156,18 @@
          assertLoaded(unit, "org.jboss.test.deployers.annotations.support.TestAnnotation");
 
          AnnotationEnvironment env = getAnnotationEnvironment(unit);
-         Set<Element<Annotation, Class>> classes = env.classIsAnnotatedWith(annotationName);
+         Set<Element<Annotation, Class<?>>> classes = env.classIsAnnotatedWith(annotationName);
          assertNotNull(classes);
          assertEquals(1, classes.size());
          assertEquals(AnnotationsHolder.class.getName(), classes.iterator().next().getOwnerClassName());
          assertNotLoaded(unit, "org.jboss.test.deployers.annotations.support.AnnotationsHolder");
 
-         Element<Annotation, Class> ecl = getSingleton(env.classIsAnnotatedWith(annotationName));
+         Element<Annotation, Class<?>> ecl = getSingleton(env.classIsAnnotatedWith(annotationName));
          Annotation tacl = ecl.getAnnotation();
          assertNotNull(tacl);
          assertEquals("class", getValue(tacl));
 
-         Element<Annotation, Constructor> ec = getSingleton(env.classHasConstructorAnnotatedWith(annotationName));
+         Element<Annotation, Constructor<?>> ec = getSingleton(env.classHasConstructorAnnotatedWith(annotationName));
          Annotation ta = ec.getAnnotation();
          assertNotNull(ta);
          assertEquals("constructor", getValue(ta));

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -76,10 +76,11 @@
    /**
     * Get all classes annotated with annotation param.
     *
+    * @param <A> the annotation type
     * @param annotation the annotation we're querying for
     * @return set of matching classes
     */
-   <A extends Annotation> Set<Element<A, Class>> classIsAnnotatedWith(Class<A> annotation);
+   <A extends Annotation> Set<Element<A, Class<?>>> classIsAnnotatedWith(Class<A> annotation);
 
    /**
     * Get all classes annotated with annotation param.
@@ -87,15 +88,16 @@
     * @param annotationName the annotation name we're querying for
     * @return set of matching classes
     */
-   Set<Element<Annotation, Class>> classIsAnnotatedWith(String annotationName);
+   Set<Element<Annotation, Class<?>>> classIsAnnotatedWith(String annotationName);
 
    /**
     * Get all classes who have some constructor annotated with annotation param.
     *
+    * @param <A> the annotation type
     * @param annotation the annotation we're querying for
     * @return set of matching classes
     */
-   <A extends Annotation> Set<Element<A, Constructor>> classHasConstructorAnnotatedWith(Class<A> annotation);
+   <A extends Annotation> Set<Element<A, Constructor<?>>> classHasConstructorAnnotatedWith(Class<A> annotation);
 
    /**
     * Get all classes who have some constructor annotated with annotation param.
@@ -103,11 +105,12 @@
     * @param annotationName the annotation name we're querying for
     * @return set of matching classes
     */
-   Set<Element<Annotation, Constructor>> classHasConstructorAnnotatedWith(String annotationName);
+   Set<Element<Annotation, Constructor<?>>> classHasConstructorAnnotatedWith(String annotationName);
 
    /**
     * Get all classes who have some field annotated with annotation param.
     *
+    * @param <A> the annotation type
     * @param annotation the annotation we're querying for
     * @return set of matching classes
     */
@@ -124,6 +127,7 @@
    /**
     * Get all classes who have some method annotated with annotation param.
     *
+    * @param <A> the annotation type
     * @param annotation the annotation we're querying for
     * @return set of matching classes
     */
@@ -140,6 +144,7 @@
    /**
     * Get all classes who have some method's/constructor's parameter annotated with annotation param.
     *
+    * @param <A> the annotation type
     * @param annotation the annotation we're querying for
     * @return set of matching classes
     */

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractAnnotationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractAnnotationDeployer.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractAnnotationDeployer.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -37,15 +37,15 @@
 public class AbstractAnnotationDeployer extends AbstractSimpleRealDeployer<AnnotationEnvironment>
 {
    /** The annotation processors */
-   private AnnotationProcessor[] processors;
+   private AnnotationProcessor<?, ?>[] processors;
 
-   public AbstractAnnotationDeployer(AnnotationProcessor... processors)
+   public AbstractAnnotationDeployer(AnnotationProcessor<?, ?>... processors)
    {
       super(AnnotationEnvironment.class);
       if (processors != null && processors.length > 0)
       {
          this.processors = processors;
-         for (AnnotationProcessor processor : processors)
+         for (AnnotationProcessor<?, ?> processor : processors)
          {
             addInput(processor.getAnnotation());
             addOutput(processor.getOutput());

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractRealDeployerWithInput.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractRealDeployerWithInput.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractRealDeployerWithInput.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -106,6 +106,7 @@
     * Deploy over visitor.
     * Unwind already deployed deployments on failure.
     *
+    * @param <U> the deployment type
     * @param unit the deployment unit
     * @param visitor the visitor
     * @throws DeploymentException for any error
@@ -145,6 +146,7 @@
    /**
     * Undeploy over visitor.
     *
+    * @param <U> the deployment type
     * @param unit the deployment unit
     * @param visitor the visitor
     */

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/AliasMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/AliasMetaData.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/AliasMetaData.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -35,7 +35,7 @@
 @XmlRootElement(name="aliases")
 public class AliasMetaData implements Serializable
 {
-   public static final long serialUIDVersion = 1l;
+   public static final long serialVersionUID = 1l;
 
    private String alias;
 

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -30,7 +30,7 @@
  */
 public class ConnectorMetaData implements Serializable
 {
-   public static final long serialUIDVersion = 1l;
+   public static final long serialVersionUID = 1l;
 
    private double version;
    private String attribute;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/JBossRarMetaData.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -33,5 +33,5 @@
 @XmlRootElement(name="jboss-connector")
 public class JBossRarMetaData extends ConnectorMetaData
 {
-   public static final long serialUIDVersion = 1l;
+   public static final long serialVersionUID = 1l;
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarDeploymentMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarDeploymentMetaData.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarDeploymentMetaData.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -29,7 +29,7 @@
  */
 public class RarDeploymentMetaData implements Serializable
 {
-   public static final long serialUIDVersion = 1l;
+   public static final long serialVersionUID = 1l;
 
    private Set<Object> aliases;
    private String attribute;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/RarMetaData.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -33,5 +33,5 @@
 @XmlRootElement(name="connector")
 public class RarMetaData extends ConnectorMetaData
 {
-   public static final long serialUIDVersion = 1l;
+   public static final long serialVersionUID = 1l;
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -61,7 +61,7 @@
       this.jbossClass = jbossClass;
    }
 
-   protected static Map<String, Class<?>> toMap(String specName, Class specClass, String jbossName, Class jbossClass)
+   protected static Map<String, Class<?>> toMap(String specName, Class<?> specClass, String jbossName, Class<?> jbossClass)
    {
       Map<String, Class<?>> map = new HashMap<String, Class<?>>();
       map.put(specName, specClass);

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossXBDeployerHelper.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -173,6 +173,7 @@
    /**
     * Parse the file to create metadata instance.
     *
+    * @param <U> the expect type
     * @param expectedType the expected type
     * @param file the file
     * @return new metadata instance
@@ -231,6 +232,7 @@
    /**
     * Parse the file using object model factory.
     *
+    * @param <U> the expect type
     * @param expectedType the expected type
     * @param file the file to parse
     * @param root the previous root

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleObjectModelFactoryDeployer.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -62,6 +62,7 @@
    /**
     * Get the object model factory
     *
+    * @param <U> the expect type
     * @param expectedType the expected class
     * @param file - the file we're about to parse
     * @param root - possibly null pre-existing root
@@ -75,6 +76,7 @@
    /**
     * Get the object model factory
     *
+    * @param <U> the expect type
     * @param expectedType the expected class
     * @param fileName - the fileName
     * @param root - possibly null pre-existing root

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleVFSParsingDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleVFSParsingDeployer.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleVFSParsingDeployer.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -137,6 +137,7 @@
     * Root doesn't have U signature, since it conflicts
     * with its usage in the parse(VFSDeployment unit, VirtualFile file, T root) method.
     *
+    * @param <U> the expect type
     * @param expectedType the expected class
     * @param file the file to parse
     * @param root the previous root
@@ -191,6 +192,7 @@
    /**
     * Get single metadata instance from metadata.
     *
+    * @param <S> the metadata type
     * @param metadata the metadatas map
     * @param clazz metadata class
     * @return matching metadata instance

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2008-07-16 11:06:46 UTC (rev 75915)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/UnmarshallerFactoryDeployer.java	2008-07-16 11:11:12 UTC (rev 75916)
@@ -28,6 +28,7 @@
  * Unmarshaller factory deployer.
  * Able to apply features to unmarshaller factory.
  *
+ * @param <T> the output type
  * @param <U> exact unmarshaller factory's flag type
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  */




More information about the jboss-cvs-commits mailing list