Author: scabanovich Date: 2011-05-18 20:44:51 -0400 (Wed, 18 May 2011) New Revision: 31362 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/definition/AbstractMemberDefinition.java Log: JBIDE-8674 https://issues.jboss.org/browse/JBIDE-8674 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-05-18 23:57:43 UTC (rev 31361) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-05-19 00:44:51 UTC (rev 31362) @@ -338,7 +338,7 @@ } } else { for (IQualifierDeclaration d: qs) { - if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(d.getType().getFullyQualifiedName())) { + if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(d.getTypeName())) { isNew = true; break; } @@ -504,7 +504,7 @@ beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); } else { for (IAnnotationDeclaration d: beanQualifiers) { - beanKeys.add(d.getType().getFullyQualifiedName()); + beanKeys.add(d.getTypeName()); } } if(beanKeys.size() == 1 && beanKeys.iterator().next().startsWith(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) { 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-05-18 23:57:43 UTC (rev 31361) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-05-19 00:44:51 UTC (rev 31362) @@ -157,8 +157,7 @@ Iterator<IAnnotationDeclaration> it = annotations.iterator(); while(it.hasNext()) { IAnnotationDeclaration a1 = it.next(); - IType t = a1.getType(); - if(t != null && typeName.equals(t.getFullyQualifiedName())) it.remove(); + if(typeName.equals(a1.getTypeName())) it.remove(); } //Make sure that a is non-specific annotation. addAnnotation(new AnnotationDeclaration(a), context);