Author: pete.muir(a)jboss.org Date: 2009-07-30 07:14:38 -0400 (Thu, 30 Jul 2009) New Revision: 3366 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java Log: Remove unneeded annotationStore from API Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-07-30 09:57:25 UTC (rev 3365) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-07-30 11:14:38 UTC (rev 3366) @@ -66,6 +66,6 @@ public static TransactionPhase getTransactionalPhase(WBMethod<?> observer) { WBParameter<?> parameter = observer.getAnnotatedParameters(Observes.class).iterator().next(); - return parameter.getAnnotationStore().getAnnotation(Observes.class).during(); + return parameter.getAnnotation(Observes.class).during(); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-07-30 09:57:25 UTC (rev 3365) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-07-30 11:14:38 UTC (rev 3366) @@ -68,7 +68,7 @@ public Set<Annotation> getBindings() { - return delegate().getAnnotationStore().getBindings(); + return delegate().getBindings(); } public void inject(Object declaringInstance, BeanManagerImpl manager, CreationalContext<?> creationalContext) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-07-30 09:57:25 UTC (rev 3365) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-07-30 11:14:38 UTC (rev 3366) @@ -110,11 +110,6 @@ protected abstract WBAnnotated<T, S> delegate(); - public AnnotationStore getAnnotationStore() - { - return delegate().getAnnotationStore(); - } - public boolean isDeclaredAnnotationPresent(Class<? extends Annotation> annotationType) { return delegate().isDeclaredAnnotationPresent(annotationType); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-07-30 09:57:25 UTC (rev 3365) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-07-30 11:14:38 UTC (rev 3366) @@ -185,8 +185,6 @@ */ public String getName(); - public AnnotationStore getAnnotationStore(); - public boolean isParameterizedType(); } \ No newline at end of file