fix up declaration names

weld · Aug 4, 2010 · 4911360 · 4911360
1 parent 50375af
commit 4911360
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 61 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java b/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
@@ -91,7 +91,7 @@ public TypeSafeBeanResolver(BeanManagerImpl beanManager, Iterable<T> beans)
    @Override
    protected boolean matches(Resolvable resolvable, T bean)
    {
-      return Reflections.matches(resolvable.getTypes(), bean.getTypes()) && Beans.containsAllBindings(resolvable.getQualifiers(), bean.getQualifiers(), beanManager);
+      return Reflections.matches(resolvable.getTypes(), bean.getTypes()) && Beans.containsAllQualifiers(resolvable.getQualifiers(), bean.getQualifiers(), beanManager);
    }
 
    /**

diff --git a/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java b/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDecoratorResolver.java
@@ -44,7 +44,7 @@ public TypeSafeDecoratorResolver(BeanManagerImpl manager, Iterable<Decorator<?>>
    protected boolean matches(Resolvable resolvable, Decorator<?> bean)
    {
       return Reflections.matches(Collections.singleton(bean.getDelegateType()), resolvable.getTypes())
-            && Beans.containsAllBindings(bean.getDelegateQualifiers(), resolvable.getQualifiers(), getBeanManager())
+            && Beans.containsAllQualifiers(bean.getDelegateQualifiers(), resolvable.getQualifiers(), getBeanManager())
             && getBeanManager().getEnabledClasses().getDecorators().contains(bean.getBeanClass());
    }
 

diff --git a/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java b/impl/src/main/java/org/jboss/weld/resolution/TypeSafeDisposerResolver.java
@@ -41,7 +41,7 @@ public TypeSafeDisposerResolver(BeanManagerImpl manager, Iterable<DisposalMethod
    @Override
    protected boolean matches(Resolvable resolvable, DisposalMethod<?, ?> disposer)
    {
-         return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypes()) && Beans.containsAllBindings(disposer.getQualifiers(), resolvable.getQualifiers(), manager);
+         return resolvable.getDeclaringBean().equals(disposer.getDeclaringBean()) && Reflections.isAssignableFrom(disposer.getType(), resolvable.getTypes()) && Beans.containsAllQualifiers(disposer.getQualifiers(), resolvable.getQualifiers(), manager);
    }
 
    /**

diff --git a/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java b/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java
@@ -42,7 +42,7 @@ public TypeSafeObserverResolver(BeanManagerImpl manager, Iterable<ObserverMethod
    @Override
    protected boolean matches(Resolvable resolvable, ObserverMethod<?> observer)
    {
-      return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypes()) && Beans.containsAllBindings(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager);
+      return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypes()) && Beans.containsAllQualifiers(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager);
    }
 
    /**