Author: akazakov Date: 2011-12-12 18:51:57 -0500 (Mon, 12 Dec 2011) New Revision: 37247 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java Removed: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.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/IClassBean.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/BeanMember.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/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java Log: https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings 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-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -63,7 +63,7 @@ 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.IJavaReference; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -1191,8 +1191,8 @@ } public static IJavaElement getJavaElement(ICDIElement cdiElement){ - if(cdiElement instanceof IJavaMemberReference) - return ((IJavaMemberReference)cdiElement).getSourceMember(); + if(cdiElement instanceof IJavaReference) + return ((IJavaReference)cdiElement).getSourceMember(); if(cdiElement instanceof IBean) return ((IBean)cdiElement).getBeanClass(); else if(cdiElement instanceof IInjectionPointParameter){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -12,14 +12,14 @@ import java.util.Set; -import org.jboss.tools.common.java.IJavaMemberReference; +import org.jboss.tools.common.java.IJavaReference; /** * Represents a class-based bean. * * @author Alexey Kazakov */ -public interface IClassBean extends IBean, IInterceptorBinded, IJavaMemberReference { +public interface IClassBean extends IBean, IInterceptorBinded, IJavaReference { /** * Returns a set of producers that are declared in this bean class. 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-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -50,7 +50,7 @@ import org.jboss.tools.common.editor.ObjectMultiPageEditor; import org.jboss.tools.common.java.IAnnotated; import org.jboss.tools.common.java.IAnnotationDeclaration; -import org.jboss.tools.common.java.IJavaMemberReference; +import org.jboss.tools.common.java.IJavaReference; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.ParametedType; @@ -396,8 +396,8 @@ if(part != null) { part.getEditorSite().getSelectionProvider().setSelection(new TextSelection(source.getStartPosition(), source.getLength())); } - } else if (this instanceof IJavaMemberReference) { - IMember member = ((IJavaMemberReference)this).getSourceMember(); + } else if (this instanceof IJavaReference) { + IMember member = ((IJavaReference)this).getSourceMember(); try { JavaUI.openInEditor(member); } catch (PartInitException e) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -40,6 +40,7 @@ public BeanMember() {} + @Override public BeanMemberDefinition getDefinition() { return (BeanMemberDefinition)definition; } @@ -48,6 +49,11 @@ typeDeclaration = getTypeDeclaration(getDefinition(), getCDIProject().getNature().getTypeFactory()); } + @Override + public IJavaElement getSourceElement() { + return (IJavaElement)getDefinition().getMember(); + } + public static TypeDeclaration getTypeDeclaration(AbstractMemberDefinition definition, ParametedTypeFactory typeFactory) { IJavaElement member = (IJavaElement)definition.getMember(); try { 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-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -70,7 +70,7 @@ 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.IJavaMemberReference; +import org.jboss.tools.common.java.IJavaReference; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.model.XModelObject; @@ -651,9 +651,9 @@ public synchronized Set<IBean> getBeans(IJavaElement element) { Set<IBean> result = new HashSet<IBean>(); for (IBean bean: allBeans) { - if(bean instanceof IJavaMemberReference) { - IMember m = ((IJavaMemberReference)bean).getSourceMember(); - if(((IJavaMemberReference)bean).getSourceMember().equals(element)) { + if(bean instanceof IJavaReference) { + IMember m = ((IJavaReference)bean).getSourceMember(); + if(((IJavaReference)bean).getSourceMember().equals(element)) { result.add(bean); } } 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-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Set; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -615,6 +616,15 @@ return getBeanClass(); } + /* + * (non-Javadoc) + * @see org.jboss.tools.common.java.IJavaReference#getSourceElement() + */ + @Override + public IJavaElement getSourceElement() { + return getSourceMember(); + } + public void cleanCache() { specializingClassBeans.clear(); scope = null; Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2011 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.test.tck.validation; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + * See https://issues.jboss.org/browse/JBIDE-10187 + */ +public class SuppressWarningsTests extends ValidationTest { + + public void testLegalTypesInTyped() throws Exception { + IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 25); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -6,6 +6,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; @@ -211,55 +212,46 @@ @Override public Set<IInterceptorBindingDeclaration> getInterceptorBindingDeclarations( boolean includeInherited) { - // TODO Auto-generated method stub return null; } @Override public Set<IInterceptorBinding> getInterceptorBindings() { - // TODO Auto-generated method stub return null; } @Override public Set<IProducer> getProducers() { - // TODO Auto-generated method stub return null; } @Override public Set<IBeanMethod> getDisposers() { - // TODO Auto-generated method stub return null; } @Override public Set<IBeanMethod> getBeanConstructors() { - // TODO Auto-generated method stub return null; } @Override public Set<IBeanMethod> getAllMethods() { - // TODO Auto-generated method stub return null; } @Override public Set<IObserverMethod> getObserverMethods() { - // TODO Auto-generated method stub return null; } @Override public Set<? extends IClassBean> getSpecializingBeans() { - // TODO Auto-generated method stub return null; } @Override public IClassBean getSuperClassBean() { - // TODO Auto-generated method stub return null; } @@ -270,7 +262,6 @@ @Override public ICDIProject getDeclaringProject() { - // TODO Auto-generated method stub return null; } @@ -281,13 +272,15 @@ @Override public void open() { - // TODO Auto-generated method stub - } @Override public Set<IInitializerMethod> getInitializers() { - // TODO Auto-generated method stub return null; } + + @Override + public IJavaElement getSourceElement() { + return getSourceMember(); + } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -37,13 +37,11 @@ @Override public IPath getSourcePath() { - // TODO Auto-generated method stub return null; } @Override public IResource getResource() { - // TODO Auto-generated method stub return null; } @@ -54,85 +52,71 @@ @Override public IParametedType getMemberType() { - // TODO Auto-generated method stub return null; } @Override public IMember getSourceMember() { - // TODO Auto-generated method stub return null; } @Override public int getStartPosition() { - // TODO Auto-generated method stub return 0; } @Override public int getLength() { - // TODO Auto-generated method stub return 0; } @Override public List<IAnnotationDeclaration> getAnnotations() { - // TODO Auto-generated method stub return null; } @Override public IAnnotationDeclaration getAnnotation(String annotationTypeName) { - // TODO Auto-generated method stub return null; } @Override public ITextSourceReference getAnnotationPosition(String annotationTypeName) { - // TODO Auto-generated method stub return null; } @Override public boolean isAnnotationPresent(String annotationTypeName) { - // TODO Auto-generated method stub return false; } @Override public IParametedType getType() { - // TODO Auto-generated method stub return null; } @Override public Set<IQualifierDeclaration> getQualifierDeclarations() { - // TODO Auto-generated method stub return null; } @Override public boolean hasDefaultQualifier() { - // TODO Auto-generated method stub return false; } @Override public boolean isDelegate() { - // TODO Auto-generated method stub return false; } @Override public ITextSourceReference getDelegateAnnotation() { - // TODO Auto-generated method stub return null; } @Override public IAnnotationDeclaration getInjectAnnotation() { - // TODO Auto-generated method stub return null; } @@ -160,4 +144,9 @@ public boolean isDeclaredFor(IJavaElement element) { return false; } + + @Override + public IJavaElement getSourceElement() { + return getSourceMember(); + } } \ No newline at end of file Deleted: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.common.java; - -import org.eclipse.jdt.core.IMember; - -/** - * @author Alexey Kazakov - */ -public interface IJavaMemberReference { - - IMember getSourceMember(); -} \ No newline at end of file Copied: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java (from rev 37198, trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaMemberReference.java) =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2011 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.common.java; + +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; + +/** + * @author Alexey Kazakov + */ +public interface IJavaReference { + + /** + * Returns the closest java member of this element. + * For example for local variable (method parameter) it will return the parent method. + * @return + */ + IMember getSourceMember(); + + /** + * Returns java element. For java members this method will return the same object as getSourceMember(); + * @return + */ + IJavaElement getSourceElement(); +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaReference.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IJavaSourceReference.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -15,6 +15,6 @@ /** * @author Alexey Kazakov */ -public interface IJavaSourceReference extends ITextSourceReference, IJavaMemberReference { +public interface IJavaSourceReference extends ITextSourceReference, IJavaReference { } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -176,4 +176,11 @@ public IMember getSourceMember() { return getParentMember(); } + + @Override + public IJavaElement getSourceElement() { + // Should we return the corresponding java element instead of member? + // If this is an annotation declared on local variable (method parameter) then the parent member and element are not the same object. + return getSourceMember(); + } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -229,9 +229,9 @@ * @return * @throws JavaModelException */ - public static IAnnotation findAnnotationByShortName(IMember member, String name, boolean checkParents) throws JavaModelException { - if(member instanceof IAnnotatable) { - IAnnotation[] annotations = ((IAnnotatable)member).getAnnotations(); + public static IAnnotation findAnnotationByShortName(IJavaElement element, String name, boolean checkParents) throws JavaModelException { + if(element instanceof IAnnotatable) { + IAnnotation[] annotations = ((IAnnotatable)element).getAnnotations(); for (IAnnotation annotation : annotations) { String aName = annotation.getElementName(); int i = aName.lastIndexOf('.'); @@ -244,7 +244,7 @@ } } if(checkParents) { - IJavaElement parent = member.getParent(); + IJavaElement parent = element.getParent(); if(parent!=null && parent instanceof IMember) { return findAnnotationByShortName((IMember)parent, name, true); } Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.text.BadLocationException; @@ -178,9 +178,9 @@ private static final String SUPPRESS_WARNINGS_ANNOTATION_FULL = "java.lang.SuppressWarnings"; private static final String ALL_WARNINGS = "all"; - private static IAnnotation getSuppressWarningsAnnotation(String preferenceKey, IMember member) throws JavaModelException { + private static IAnnotation getSuppressWarningsAnnotation(String preferenceKey, IJavaElement element) throws JavaModelException { // Does the element have @SuppressWarnings? Check it by the short name only. - IAnnotation annotation = EclipseJavaUtil.findAnnotationByShortName(member, SUPPRESS_WARNINGS_ANNOTATION_SHORT, true); + IAnnotation annotation = EclipseJavaUtil.findAnnotationByShortName(element, SUPPRESS_WARNINGS_ANNOTATION_SHORT, true); IAnnotation result = null; if(annotation!=null) { IMemberValuePair[] pairs = annotation.getMemberValuePairs(); @@ -211,8 +211,8 @@ private static boolean hasSuppressWarningsAnnotation(String preferenceKey, ITextSourceReference location) throws JavaModelException { boolean result = false; if(location instanceof IJavaSourceReference) { - IMember member = ((IJavaSourceReference) location).getSourceMember(); - result = getSuppressWarningsAnnotation(preferenceKey, member)!=null; + IJavaElement element = ((IJavaSourceReference) location).getSourceElement(); + result = getSuppressWarningsAnnotation(preferenceKey, element)!=null; } return result; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponentMethod.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -16,6 +16,7 @@ import java.util.Set; import org.eclipse.core.resources.IResource; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.common.model.project.ext.event.Change; @@ -149,4 +150,8 @@ } } -} + @Override + public IJavaElement getSourceElement() { + return getSourceMember(); + } +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -19,6 +19,7 @@ import java.util.Set; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -725,4 +726,8 @@ context.remove(SeamXMLConstants.ATTR_TYPE); } -} + @Override + public IJavaElement getSourceElement() { + return getSourceMember(); + } +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2011-12-12 22:55:46 UTC (rev 37246) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaContextVariable.java 2011-12-12 23:51:57 UTC (rev 37247) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; @@ -41,7 +42,11 @@ public IMember getSourceMember() { return javaSource; } - + + public IJavaElement getSourceElement() { + return getSourceMember(); + } + public void setSourceMember(IMember javaSource) { this.javaSource = javaSource; }