the parameters of a method or constructor are a List!

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@271 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 7, 2008 · 679a337 · 679a337
1 parent 11e595e
commit 679a337
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Iterator;
-import java.util.Set;
+import java.util.List;
 
 import javax.webbeans.Current;
 import javax.webbeans.Observer;
@@ -15,7 +15,7 @@
 import org.jboss.webbeans.model.bean.BeanModel;
 
 import com.google.common.collect.ForwardingIterator;
-import com.google.common.collect.ForwardingSet;
+import com.google.common.collect.ForwardingList;
 
 /**
  * <p>
@@ -92,11 +92,11 @@ public void notify(final T event)
          {
 
             @Override
-            public Set<InjectableParameter<Object>> getParameters()
+            public List<InjectableParameter<Object>> getParameters()
             {
-               final Set<InjectableParameter<Object>>parameters = super.getParameters();
+               final List<InjectableParameter<Object>>parameters = super.getParameters();
 
-               return new ForwardingSet<InjectableParameter<Object>>()
+               return new ForwardingList<InjectableParameter<Object>>()
                {
 
                   @Override
@@ -143,7 +143,7 @@ protected Iterator<InjectableParameter<Object>> delegate()
                   }
 
                   @Override
-                  protected Set<InjectableParameter<Object>> delegate()
+                  protected List<InjectableParameter<Object>> delegate()
                   {
                      return parameters;
                   }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ForwardingInjectableMethod.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ForwardingInjectableMethod.java
@@ -1,6 +1,6 @@
 package org.jboss.webbeans.injectable;
 
-import java.util.Set;
+import java.util.List;
 
 import javax.webbeans.manager.Manager;
 
@@ -23,7 +23,7 @@ public AnnotatedMethod<T> getAnnotatedItem()
    }
 
    @Override
-   public Set<InjectableParameter<Object>> getParameters()
+   public List<InjectableParameter<Object>> getParameters()
    {
       return delegate().getParameters();
    }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Invokable.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Invokable.java
@@ -1,8 +1,8 @@
 package org.jboss.webbeans.injectable;
 
-import java.util.HashSet;
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Set;
+import java.util.List;
 
 import javax.webbeans.manager.Manager;
 
@@ -12,13 +12,13 @@
 public abstract class Invokable<T, S>
 {
 
-   private Set<InjectableParameter<Object>> parameters;
+   private List<InjectableParameter<Object>> parameters;
 
    protected Invokable() {}
 
-   public Invokable(Set<AnnotatedParameter<Object>> parameters)
+   public Invokable(List<AnnotatedParameter<Object>> parameters)
    {
-      this.parameters = new HashSet<InjectableParameter<Object>>();
+      this.parameters = new ArrayList<InjectableParameter<Object>>();
       for (AnnotatedParameter<Object> parameter : parameters)
       {
          this.parameters.add(new InjectableParameter<Object>(parameter));
@@ -38,7 +38,7 @@ protected Object[] getParameterValues(ManagerImpl manager)
       return parameterValues;
    }
 
-   public Set<InjectableParameter<Object>> getParameters()
+   public List<InjectableParameter<Object>> getParameters()
    {
       return parameters;
    }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
-import java.util.Set;
+import java.util.List;
 
 /**
  * AnnotatedType provides a uniform access to the annotations on an annotated
@@ -16,8 +16,8 @@ public interface AnnotatedConstructor<T> extends AnnotatedItem<T, Constructor<T>
 
    public Constructor<T> getAnnotatedConstructor();
 
-   public Set<AnnotatedParameter<Object>> getParameters();
+   public List<AnnotatedParameter<Object>> getParameters();
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
+   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
@@ -2,7 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.Set;
+import java.util.List;
 
 /**
  * AnnotatedType provides a uniform access to the annotations on an annotated
@@ -16,8 +16,8 @@ public interface AnnotatedMethod<T> extends AnnotatedItem<T, Method>
 
    public Method getAnnotatedMethod();
 
-   public Set<AnnotatedParameter<Object>> getParameters();
+   public List<AnnotatedParameter<Object>> getParameters();
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
+   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
 
 }
diff --git a/...ans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java b/...ans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java
@@ -3,10 +3,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.jboss.webbeans.introspector.AnnotatedConstructor;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
@@ -18,8 +18,8 @@ public class SimpleAnnotatedConstructor<T> extends AbstractAnnotatedMember<T, Co
 
    private Constructor<T> constructor;
 
-   private Set<AnnotatedParameter<Object>> parameters;
-   private Map<Class<? extends Annotation>, Set<AnnotatedParameter<Object>>> annotatedParameters;
+   private List<AnnotatedParameter<Object>> parameters;
+   private Map<Class<? extends Annotation>, List<AnnotatedParameter<Object>>> annotatedParameters;
 
    public SimpleAnnotatedConstructor(Constructor<T> constructor)
    {
@@ -47,7 +47,7 @@ public Type[] getActualTypeArguments()
       return actualTypeArguments;
    }
 
-   public Set<AnnotatedParameter<Object>> getParameters()
+   public List<AnnotatedParameter<Object>> getParameters()
    {
       if (parameters == null)
       {
@@ -58,7 +58,7 @@ public Set<AnnotatedParameter<Object>> getParameters()
 
    private void initParameters()
    {
-      this.parameters = new HashSet<AnnotatedParameter<Object>>();
+      this.parameters = new ArrayList<AnnotatedParameter<Object>>();
       for (int i = 0; i < constructor.getParameterTypes().length; i++)
       {
          if (constructor.getParameterAnnotations()[i].length > 0)
@@ -76,7 +76,7 @@ private void initParameters()
       }
    }
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
+   public List<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
    {
       if (annotatedParameters == null)
       {
@@ -85,7 +85,7 @@ public Set<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annot
 
       if (!annotatedParameters.containsKey(annotationType))
       {
-         return new HashSet<AnnotatedParameter<Object>>();
+         return new ArrayList<AnnotatedParameter<Object>>();
       }
       else
       {
@@ -99,29 +99,29 @@ private void initAnnotatedParameters()
       {
          initParameters();
       }
-      annotatedParameters = new HashMap<Class<? extends Annotation>, Set<AnnotatedParameter<Object>>>();
+      annotatedParameters = new HashMap<Class<? extends Annotation>, List<AnnotatedParameter<Object>>>();
       for (AnnotatedParameter<Object> parameter : parameters)
       {
          for (Annotation annotation : parameter.getAnnotations())
          {
             if (!annotatedParameters.containsKey(annotation))
             {
-               annotatedParameters.put(annotation.annotationType(), new HashSet<AnnotatedParameter<Object>>());
+               annotatedParameters.put(annotation.annotationType(), new ArrayList<AnnotatedParameter<Object>>());
             }
             annotatedParameters.get(annotation.annotationType()).add(parameter);
          }
       }
    }
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> annotationType)
+   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> annotationType)
    {
       if (annotatedParameters == null)
       {
          initAnnotatedParameters();
       }
       if (!annotatedParameters.containsKey(annotationType))
       {
-         return new HashSet<AnnotatedParameter<Object>>();
+         return new ArrayList<AnnotatedParameter<Object>>();
       }
       return annotatedParameters.get(annotationType);
    }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java
@@ -4,10 +4,10 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
@@ -19,8 +19,8 @@ public class SimpleAnnotatedMethod<T> extends AbstractAnnotatedMember<T, Method>
 
    private Method method;
 
-   private Set<AnnotatedParameter<Object>> parameters;
-   private Map<Class<? extends Annotation>, Set<AnnotatedParameter<Object>>> annotatedParameters;
+   private List<AnnotatedParameter<Object>> parameters;
+   private Map<Class<? extends Annotation>, List<AnnotatedParameter<Object>>> annotatedParameters;
 
    public SimpleAnnotatedMethod(Method method)
    {
@@ -52,7 +52,7 @@ public Type[] getActualTypeArguments()
       return actualTypeArgements;
    }
 
-   public Set<AnnotatedParameter<Object>> getParameters()
+   public List<AnnotatedParameter<Object>> getParameters()
    {
       if (parameters == null)
       {
@@ -63,7 +63,7 @@ public Set<AnnotatedParameter<Object>> getParameters()
 
    private void initParameters()
    {
-      this.parameters = new HashSet<AnnotatedParameter<Object>>();
+      this.parameters = new ArrayList<AnnotatedParameter<Object>>();
       for (int i = 0; i < method.getParameterTypes().length; i++)
       {
          if (method.getParameterAnnotations()[i].length > 0)
@@ -81,7 +81,7 @@ private void initParameters()
       }
    }
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
+   public List<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
    {
       if (annotatedParameters == null)
       {
@@ -90,7 +90,7 @@ public Set<AnnotatedParameter<Object>> getAnnotatedMethods(Class<? extends Annot
 
       if (!annotatedParameters.containsKey(annotationType))
       {
-         return new HashSet<AnnotatedParameter<Object>>();
+         return new ArrayList<AnnotatedParameter<Object>>();
       }
       else
       {
@@ -104,29 +104,29 @@ private void initAnnotatedParameters()
       {
          initParameters();
       }
-      annotatedParameters = new HashMap<Class<? extends Annotation>, Set<AnnotatedParameter<Object>>>();
+      annotatedParameters = new HashMap<Class<? extends Annotation>, List<AnnotatedParameter<Object>>>();
       for (AnnotatedParameter<Object> parameter : parameters)
       {
          for (Annotation annotation : parameter.getAnnotations())
          {
             if (!annotatedParameters.containsKey(annotation))
             {
-               annotatedParameters.put(annotation.annotationType(), new HashSet<AnnotatedParameter<Object>>());
+               annotatedParameters.put(annotation.annotationType(), new ArrayList<AnnotatedParameter<Object>>());
             }
             annotatedParameters.get(annotation.annotationType()).add(parameter);
          }
       }
    }
 
-   public Set<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> annotationType)
+   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> annotationType)
    {
       if (annotatedParameters == null)
       {
          initAnnotatedParameters();
       }
       if (!annotatedParameters.containsKey(annotationType))
       {
-         return new HashSet<AnnotatedParameter<Object>>();
+         return new ArrayList<AnnotatedParameter<Object>>();
       }
       return annotatedParameters.get(annotationType);
    }