[jbosstools-commits] JBoss Tools SVN: r30241 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-04-01 19:19:39 -0400 (Fri, 01 Apr 2011)
New Revision: 30241

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
JBIDE-8196
https://issues.jboss.org/browse/JBIDE-8196
JBIDE-8197
https://issues.jboss.org/browse/JBIDE-8197

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java	2011-04-01 23:18:12 UTC (rev 30240)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java	2011-04-01 23:19:39 UTC (rev 30241)
@@ -31,6 +31,7 @@
 import org.jboss.tools.cdi.core.CDIConstants;
 import org.jboss.tools.cdi.core.IBean;
 import org.jboss.tools.cdi.core.IScopeDeclaration;
+import org.jboss.tools.cdi.internal.core.impl.JavaAnnotation;
 import org.jboss.tools.cdi.ui.CDIUIMessages;
 import org.jboss.tools.cdi.ui.CDIUIPlugin;
 import org.jboss.tools.common.EclipseUtil;
@@ -116,7 +117,9 @@
 		Iterator<IScopeDeclaration> iter = scopDeclarations.iterator();
 		while(iter.hasNext()){
 			IScopeDeclaration declaration = iter.next();
-			return declaration.getDeclaration();
+			if(declaration instanceof JavaAnnotation) {
+				return ((JavaAnnotation)declaration).getAnnotation();
+			}
 		}
 		return null;
 	}