Author: scabanovich Date: 2011-06-29 18:39:14 -0400 (Wed, 29 Jun 2011) New Revision: 32473 Removed: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIAnnotation.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDINamedAnnotation.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifierDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScopeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ISessionBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/SessionBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: JBIDE-5046 https://issues.jboss.org/browse/JBIDE-5046 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -56,6 +56,9 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.cdi.internal.core.impl.ClassBean; import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.java.IAnnotated; +import org.jboss.tools.common.java.IAnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationType; import org.jboss.tools.common.java.IJavaMemberReference; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -363,7 +366,7 @@ public static IAnnotationDeclaration getAnnotationDeclaration(IAnnotated annotated, ICDIAnnotation annotation) { List<IAnnotationDeclaration> annotations = annotated.getAnnotations(); for (IAnnotationDeclaration annotationDeclaration : annotations) { - ICDIAnnotation annotationElement = annotationDeclaration.getAnnotation(); + IAnnotationType annotationElement = annotationDeclaration.getAnnotation(); if(annotationElement!=null && annotation.equals(annotationElement)) { return annotationDeclaration; } @@ -1006,7 +1009,7 @@ * @return * @throws JavaModelException */ - public static Boolean checkTargetAnnotation(ICDIAnnotation annotationType, String[][] variants) throws JavaModelException { + public static Boolean checkTargetAnnotation(IAnnotationType annotationType, String[][] variants) throws JavaModelException { IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME); return target == null?null:checkTargetAnnotation(target, variants); } Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotated.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core; - -import java.util.List; - -import org.jboss.tools.common.text.ITextSourceReference; - -/** - * Represents a CDI element that can be annotated. - * - * @author Alexey Kazakov - */ -public interface IAnnotated { - - /** - * Get all annotations of the element. - * - * @return all annotations of the element, or an empty list if no - * annotations are present - */ - List<IAnnotationDeclaration> getAnnotations(); - - /** - * Get element annotation of a certain annotation type. - * - * @param annotationTypeName - * the name of the annotation type - * @return the element annotation of the given annotation type, or a null - * value - */ - IAnnotationDeclaration getAnnotation(String annotationTypeName); - - /** - * This method is similar to getAnnotation(String annotationTypeName). But - * JDT doesn't have API for getting IAnnotation from method parameters so - * this method is preferable for method parameters. - * - * @param annotationTypeName - * the name of the annotation type - * @return the text source reference of the annotation of the given annotation type, or a null - * value - */ - ITextSourceReference getAnnotationPosition(String annotationTypeName); - - /** - * Determine if the element has an annotation of a certain annotation type. - * - * @param annotationTypeName - * the annotation type to check for - * @return true if the element has an annotation of the given annotation - * type, or false otherwise - */ - boolean isAnnotationPresent(String annotationTypeName); -} \ No newline at end of file Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IAnnotationDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -1,83 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.IMember; -import org.eclipse.jdt.core.IMemberValuePair; -import org.eclipse.jdt.core.IType; -import org.jboss.tools.common.text.ITextSourceReference; - -/** - * Represents an annotation declaration. For example a qualifier or a scope - * declaration of a bean/injection/produce method. - * - * @author Alexey Kazakov - */ -public interface IAnnotationDeclaration extends ITextSourceReference { - - /** - * Returns the member value pairs. - * - * @return the member value pairs - */ - IMemberValuePair[] getMemberValuePairs(); - - /** - * Convenience method that allows to get one member value without enumerating pairs. - * @param name - * @return - */ - Object getMemberValue(String name); - - /** - * Returns the member which is annotated by this declaration. - * - * @return the member which is annotated by this declaration - */ - IMember getParentMember(); - - /** - * Returns the corresponding type name of the annotation. - * - * @return the corresponding type name of the annotation - */ - String getTypeName(); - - /** - * Returns the corresponding IType of the annotation. May be null. - * - * @return the corresponding IType of the annotation - */ - IType getType(); - - /** - * Returns the corresponding annotation. May be null. - * - * @return the corresponding annotation - */ - ICDIAnnotation getAnnotation(); - - /** - * Returns underlying Java annotation if this declaration is based on Java source. - * Returns null if this declaration is based on xml source. - * - * @return underlying Java annotation if it exists - */ - IAnnotation getJavaAnnotation(); - - /** - * Returns resource which contains this declaration - * @return - */ - IResource getResource(); -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -14,6 +14,8 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.java.IAnnotated; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotated; import org.jboss.tools.common.java.IJavaSourceReference; import org.jboss.tools.common.java.IParametedType; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIAnnotation.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIAnnotation.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIAnnotation.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -1,10 +1,10 @@ package org.jboss.tools.cdi.core; -import java.util.List; import java.util.Set; import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IType; +import org.jboss.tools.common.java.IAnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationType; /** * Common interface for an annotation interface. @@ -12,16 +12,9 @@ * @author Viacheslav Kabanovich * */ -public interface ICDIAnnotation extends ICDIElement { +public interface ICDIAnnotation extends ICDIElement, IAnnotationType { /** - * Returns the corresponding IType of the annotation type. - * - * @return the corresponding IType - */ - IType getSourceType(); - - /** * Returns the declaration of @Inherited declaration of this annotation * type. If the interface doesn't have the @Inherited declaration then null * will be returned. @@ -31,23 +24,6 @@ IAnnotationDeclaration getInheritedDeclaration(); /** - * Returns all the available annotations which are declared for this - * interface. - * - * @return all the available annotations which are declared for this - * interface - */ - List<IAnnotationDeclaration> getAnnotationDeclarations(); - - /** - * Returns the annotations with given type name. - * - * @param typeName - * @return the annotations with given type name - */ - IAnnotationDeclaration getAnnotationDeclaration(String typeName); - - /** * Returns set of members annotated with @Nonbinding * * @return set of members annotated with @Nonbinding Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDINamedAnnotation.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDINamedAnnotation.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDINamedAnnotation.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * A common interface for an annotation interface with can have @Named * annotation. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -12,6 +12,7 @@ import java.util.Set; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -12,6 +12,7 @@ import java.util.Set; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.text.ITextSourceReference; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptor.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptor.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents an interceptor. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInterceptorBindingDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * @author Alexey Kazakov */ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducer.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducer.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IProducer.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a producer. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifierDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifierDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifierDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a qualifier declaration. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScopeDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScopeDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScopeDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a qualifier declaration. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ISessionBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ISessionBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ISessionBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a session bean. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotype.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotated; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a stereotype. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotypeDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.core; +import org.jboss.tools.common.java.IAnnotationDeclaration; + /** * Represents a stereotype declaration. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IStereotyped.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -12,6 +12,8 @@ import java.util.Set; +import org.jboss.tools.common.java.IAnnotated; + /** * Represents an element that can has stereotypes. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -26,8 +26,6 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotated; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInterceptorBinding; @@ -40,6 +38,8 @@ import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; +import org.jboss.tools.common.java.IAnnotated; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -16,9 +16,9 @@ import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDICoreNature; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.IJavaAnnotation; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -7,7 +7,6 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; @@ -15,6 +14,7 @@ import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotypeDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -17,10 +17,10 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationMemberDefinition; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -37,7 +37,6 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMember; import org.jboss.tools.cdi.core.IBeanMethod; @@ -64,6 +63,7 @@ import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.cdi.internal.core.scanner.ImplementationCollector; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.model.XModelObject; @@ -518,7 +518,7 @@ } public static String getAnnotationDeclarationKey(IAnnotationDeclaration d) throws CoreException { - ICDIAnnotation annotation = d.getAnnotation(); + ICDIAnnotation annotation = (ICDIAnnotation)d.getAnnotation(); Set<IMethod> nb = annotation == null ? new HashSet<IMethod>() : annotation.getNonBindingMethods(); return getAnnotationDeclarationKey(d, nb); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -24,7 +24,6 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; @@ -43,6 +42,7 @@ import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -16,8 +16,8 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IDecorator; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -7,7 +7,6 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; @@ -15,6 +14,7 @@ import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotypeDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -12,8 +12,8 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointMethod.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -11,9 +11,9 @@ package org.jboss.tools.cdi.internal.core.impl; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointMethod; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -14,9 +14,9 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,8 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInterceptor; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -7,13 +7,13 @@ import org.eclipse.jdt.core.ILocalVariable; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.ISourceReference; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; public class Parameter extends BeanMember implements IParameter { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -15,7 +15,6 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IProducerField; @@ -23,6 +22,7 @@ import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -15,7 +15,6 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducerMethod; @@ -25,6 +24,7 @@ import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/SessionBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/SessionBean.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/SessionBean.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -10,8 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.ISessionBean; +import org.jboss.tools.common.java.IAnnotationDeclaration; public class SessionBean extends ClassBean implements ISessionBean { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -16,13 +16,13 @@ import java.util.Set; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -27,8 +27,6 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotated; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IJavaAnnotation; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; @@ -37,6 +35,8 @@ import org.jboss.tools.cdi.internal.core.impl.QualifierDeclaration; import org.jboss.tools.cdi.internal.core.impl.ScopeDeclaration; import org.jboss.tools.cdi.internal.core.impl.StereotypeDeclaration; +import org.jboss.tools.common.java.IAnnotated; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -21,10 +21,10 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -21,13 +21,13 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; import org.jboss.tools.cdi.internal.core.impl.ClassBean; +import org.jboss.tools.common.java.IAnnotationDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -20,10 +20,10 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.ParametedType; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -18,7 +18,6 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; @@ -27,6 +26,8 @@ import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.preferences.CDIPreferences; +import org.jboss.tools.common.java.IAnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationType; /** * CDI annotation validator. @@ -141,7 +142,7 @@ if(target!=null) { if(CDIUtil.checkTargetAnnotation(target, TYPE__METHOD_VARIANTS)) { for (IInterceptorBindingDeclaration declaration : declarations) { - ICDIAnnotation superBinding = declaration.getAnnotation(); + IAnnotationType superBinding = declaration.getAnnotation(); Boolean result = CDIUtil.checkTargetAnnotation(superBinding, TYPE_VARIANTS); if(result!=null && result) { validator.addError(CDIValidationMessages.ILLEGAL_TARGET_IN_INTERCEPTOR_BINDING_TYPE, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, new String[]{superBinding.getSourceType().getElementName(), binding.getSourceType().getElementName()}, declaration, binding.getResource()); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 22:37:31 UTC (rev 32472) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 22:39:14 UTC (rev 32473) @@ -53,7 +53,6 @@ import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; -import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.ICDIAnnotation; @@ -85,6 +84,7 @@ import org.jboss.tools.cdi.internal.core.impl.CDIProject; import org.jboss.tools.cdi.internal.core.impl.SessionBean; import org.jboss.tools.cdi.internal.core.impl.definition.Dependencies; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType;