Author: akazakov Date: 2011-09-13 20:13:43 -0400 (Tue, 13 Sep 2011) New Revision: 34707 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/ICDIElement.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/BeanField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.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/CDIElement.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/EventBean.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/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 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/MakeInjectedPointUnambiguousMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.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/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java Log: https://issues.jboss.org/browse/JBIDE-9673 "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -70,15 +70,6 @@ Set<IParametedType> getAllTypes(); /** - * Returns the text representation of this bean. - * If the bean is IClassBean then the method will return the simple name of the class of the bean. - * If the bean is IProducerField then the method will return the simple name of the type of the field. - * If the bean is IProducerMethod then the method will return the simple name of the return type of the producer method. - * @return the text representation of this bean. - */ - String getSimpleJavaName(); - - /** * Obtains all the type declarations of the bean class or producer method or * field (legal types as well as illegal ones). * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -56,4 +56,14 @@ * @return */ boolean exists(); + + /** + * Returns the text representation of this element. + * For instance if the element is a class then the method is supposed to return the simple name of the class. + * If the element is a field then the method will return "TypeName.fieldName". + * If the bean is a method then the method will return "TypeName.methodName()". + * For a method parameter, a name of the parameter will be return. + * @return the text representation of this bean. + */ + String getElementName(); } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -64,7 +63,7 @@ * @author Viacheslav Kabanovich * */ -public class AbstractBeanElement extends CDIElement implements IAnnotated { +public abstract class AbstractBeanElement extends CDIElement implements IAnnotated { protected AbstractMemberDefinition definition; public AbstractBeanElement() {} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -47,4 +47,12 @@ return getField(); } -} + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ICDIElement#getSimpleJavaName() + */ + @Override + public String getElementName() { + return getClassBean().getBeanClass().getElementName() + "." + getField().getElementName(); + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -20,7 +20,6 @@ import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.IInterceptorBinding; -import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; @@ -110,4 +109,13 @@ public Set<IInterceptorBinding> getInterceptorBindings() { return CDIUtil.getAllInterceptorBindings(this); } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ICDIElement#getSimpleJavaName() + */ + @Override + public String getElementName() { + return getClassBean().getBeanClass().getElementName() + "." + getMethod().getElementName() + "()"; //$NON-NLS-1$ + } } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIAnnotationElement.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -135,4 +135,13 @@ String type = getSourceType() == null ? "" : getSourceType().getFullyQualifiedName(); return super.toString() + " type=" + type; } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ICDIElement#getSimpleJavaName() + */ + @Override + public String getElementName() { + return definition.getType().getElementName(); + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -27,7 +27,7 @@ * @author Viacheslav Kabanovich * */ -public class CDIElement implements ICDIElement { +public abstract class CDIElement implements ICDIElement { protected CDIElement parent; protected IPath source; @@ -41,7 +41,6 @@ return parent != null ? parent.getDeclaringProject() : null; } - public CDIExtensionManager getExtensionManager() { CDIProject project = getCDIProject(); return project == null ? null : project.getNature().getExtensionManager(); 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -1412,4 +1412,13 @@ context.applyWorkingCopy(); return old.isEmpty() ? null : old.iterator().next(); } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ICDIElement#getSimpleJavaName() + */ + @Override + public String getElementName() { + return getNature().getProject().getName(); + } } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -576,7 +576,7 @@ * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName() */ @Override - public String getSimpleJavaName() { + public String getElementName() { return this.getBeanClass().getElementName(); } 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -175,7 +175,8 @@ * (non-Javadoc) * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName() */ - public String getSimpleJavaName() { + @Override + public String getElementName() { if(type!=null) { return type.getSimpleName(); } 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -101,4 +101,12 @@ return result; } + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ICDIElement#getSimpleJavaName() + */ + @Override + public String getElementName() { + return getName(); + } } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -187,12 +187,4 @@ // } return false; } - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName() - */ - public String getSimpleJavaName() { - return getBeanClass().getElementName() + "." + getField().getElementName(); - } } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -241,12 +241,4 @@ // } return false; } - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName() - */ - public String getSimpleJavaName() { - return getBeanClass().getElementName() + "." + getMethod().getElementName() + "()"; //$NON-NLS-1$ - } } \ No newline at end of file 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -598,11 +598,11 @@ if(beans.size()>1 && beans.contains(bean)) { ITextSourceReference reference = bean.getNameLocation(true); Set<String> names = new HashSet<String>(); - String bName = bean.getSimpleJavaName(); + String bName = bean.getElementName(); names.add(bName); StringBuffer sb = new StringBuffer(bName); for (IBean iBean : beans) { - bName = iBean.getSimpleJavaName(); + bName = iBean.getElementName(); if(bean!=iBean && !names.contains(bName)) { names.add(bName); sb.append(", ").append(bName); @@ -633,7 +633,7 @@ if(reference==null) { reference = CDIUtil.getNamedDeclaration(bean); } - addError(MessageFormat.format(CDIValidationMessages.UNRESOLVABLE_EL_NAME, name, yName, xNameAsString, xBeans.iterator().next().getSimpleJavaName()), CDIPreferences.AMBIGUOUS_EL_NAMES, reference, bean.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNRESOLVABLE_EL_NAME, name, yName, xNameAsString, xBeans.iterator().next().getElementName()), CDIPreferences.AMBIGUOUS_EL_NAMES, reference, bean.getResource()); break; } } @@ -834,11 +834,11 @@ IClassBean supperClassBean = (IClassBean)specializedBean; Set<? extends IClassBean> allSpecializingBeans = supperClassBean.getSpecializingBeans(); if(allSpecializingBeans.size()>1) { - StringBuffer sb = new StringBuffer(bean.getSimpleJavaName()); + StringBuffer sb = new StringBuffer(bean.getElementName()); boolean moreThanTwo = false; for (IClassBean specializingBean : allSpecializingBeans) { if(specializingBean!=bean && specializingBean.isEnabled()) { - sb.append(", ").append(specializingBean.getSimpleJavaName()); + sb.append(", ").append(specializingBean.getElementName()); moreThanTwo = true; if(shouldValidateType(specializingBean.getBeanClass())) { getValidationContext().addLinkedCoreResource(SHORT_ID, specializingBean.getResource().getFullPath().toOSString(), bean.getSourcePath(), false); @@ -848,7 +848,7 @@ } if(moreThanTwo && specializesDeclaration!=null) { addError(CDIValidationMessages.INCONSISTENT_SPECIALIZATION, CDIPreferences.INCONSISTENT_SPECIALIZATION, - new String[]{sb.toString(), supperClassBean.getSimpleJavaName()}, + new String[]{sb.toString(), supperClassBean.getElementName()}, specializesDeclaration, bean.getResource()); } } @@ -1579,15 +1579,15 @@ String typeSignature = injection.getType().getSignature(); int kind = Signature.getTypeSignatureKind(typeSignature); if(kind == Signature.ARRAY_TYPE_SIGNATURE) { - addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, injection.getType().getSimpleName(), bean.getElementName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); } else if(injection.getType().isPrimitive()) { // - Primitive types cannot be proxied by the container. - addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, injection.getType().getSimpleName(), bean.getElementName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); } else if(bean instanceof IClassBean) { try { if(Flags.isFinal(bean.getBeanClass().getFlags())) { // - Classes which are declared final cannot be proxied by the container. - addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, injection.getType().getSimpleName(), bean.getElementName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); } else { IMethod[] methods = bean.getBeanClass().getMethods(); boolean hasDefaultConstructor = false; @@ -1597,14 +1597,14 @@ hasDefaultConstructor = hasDefaultConstructor || (method.isConstructor() && !Flags.isPrivate(method.getFlags()) && method.getParameterNames().length==0); if(Flags.isFinal(method.getFlags())) { // - Classes which have final methods cannot be proxied by the container. - addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, injection.getType().getSimpleName(), bean.getElementName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); hasDefaultConstructor = true; break; } } if(!hasDefaultConstructor && hasConstructor) { // - Classes which don't have a non-private constructor with no parameters cannot be proxied by the container. - addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, injection.getType().getSimpleName(), bean.getElementName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource()); } } } catch (JavaModelException e) { @@ -1619,7 +1619,7 @@ // 8.3. Decorator resolution // - If a decorator matches a managed bean, and the managed bean class is declared final, the container automatically detects // the problem and treats it as a deployment problem. - addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_CLASS, bean.getSimpleJavaName()), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_CLASS, bean.getElementName()), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource()); } else { // 8.3. Decorator resolution // - If a decorator matches a managed bean with a non-static, non-private, final method, and the decorator also implements that method, @@ -1636,7 +1636,7 @@ int flags = beanMethod.getFlags(); if(!Flags.isPrivate(flags) && !Flags.isStatic(flags) && Flags.isFinal(flags)) { String methodName = Signature.toString(beanMethod.getSignature(), beanMethod.getElementName(), beanMethod.getParameterNames(), false, false); - addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_METHOD, bean.getSimpleJavaName(), methodName), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource()); + addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_METHOD, bean.getElementName(), methodName), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource()); reported = true; break; } @@ -1914,7 +1914,7 @@ } if(!passivatingCapable) { ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource()); - addError(MessageFormat.format(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, bean.getSimpleJavaName(), scope.getSourceType().getElementName()), CDIPreferences.NOT_PASSIVATION_CAPABLE_BEAN, reference, bean.getResource(), NOT_PASSIVATION_CAPABLE_BEAN_ID); + addError(MessageFormat.format(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, bean.getElementName(), scope.getSourceType().getElementName()), CDIPreferences.NOT_PASSIVATION_CAPABLE_BEAN, reference, bean.getResource(), NOT_PASSIVATION_CAPABLE_BEAN_ID); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -132,7 +132,7 @@ } public String getInformation() { - return bean.getSimpleJavaName(); + return bean.getElementName(); } public Image getImage() { 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -44,7 +44,7 @@ private IFile file; public MakeBeanScopedDependentMarkerResolution(IBean bean, IFile file){ - this.label = MessageFormat.format(CDIUIMessages.MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE, new Object[]{bean.getSimpleJavaName()}); + this.label = MessageFormat.format(CDIUIMessages.MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE, new Object[]{bean.getElementName()}); this.bean = bean; this.file = file; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -45,7 +45,7 @@ this.injectionPoint = injectionPoint; this.beans = beans; this.selectedBean = beans.get(index); - this.label = MessageFormat.format(CDIUIMessages.MAKE_INJECTED_POINT_UNAMBIGUOUS_TITLE, new Object[]{selectedBean.getSimpleJavaName()}); + this.label = MessageFormat.format(CDIUIMessages.MAKE_INJECTED_POINT_UNAMBIGUOUS_TITLE, new Object[]{selectedBean.getElementName()}); } public String getLabel() { @@ -105,7 +105,7 @@ ICDIProject cdiProject = selectedBean.getCDIProject(); IBean[] beans = cdiProject.getBeans(); for(IBean bean : beans){ - if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getSimpleJavaName().equals(selectedBean.getSimpleJavaName())){ + if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getElementName().equals(selectedBean.getElementName())){ selectedBean = bean; break; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -106,7 +106,7 @@ ICDIProject cdiProject = selectedBean.getCDIProject(); IBean[] beans = cdiProject.getBeans(); for(IBean bean : beans){ - if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getSimpleJavaName().equals(selectedBean.getSimpleJavaName())){ + if(bean.getBeanClass().getFullyQualifiedName().equals(selectedBean.getBeanClass().getFullyQualifiedName()) && bean.getElementName().equals(selectedBean.getElementName())){ selectedBean = bean; break; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -229,7 +229,7 @@ IBean bean = (IBean)element; String beanTypeName = bean.getBeanClass().getFullyQualifiedName(); String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT)); - String name = bean.getSimpleJavaName(); + String name = bean.getElementName(); return name+" - "+beanPackage; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -169,7 +169,7 @@ availableTableViewer.setInput(qualifiers); if(nLabel != null) nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE, - new Object[]{bean.getSimpleJavaName()})); + new Object[]{bean.getElementName()})); refresh(); } @@ -274,7 +274,7 @@ nLabel.setLayoutData(data); if(bean != null) nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE, - new Object[]{bean.getSimpleJavaName()})); + new Object[]{bean.getElementName()})); Label label = new Label(this, SWT.NONE); label.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_ENTER_QUALIFIER_NAME); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/ResolutionByTypeTest.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -131,7 +131,7 @@ Set<String> names = new HashSet<String>(); System.out.println(bs.size()); for (IBean b: bs) { - names.add(b.getSimpleJavaName()); + names.add(b.getElementName()); } names.contains("CurrentProject.getCurrent()"); names.contains("ProjectImpl"); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -68,7 +68,7 @@ Set<String> keys = new HashSet<String>(); for(IBean b: bs) { - keys.add(b.getSimpleJavaName()); + keys.add(b.getElementName()); } assertTrue(keys.contains("TestNamed.foo4")); assertTrue(keys.contains("TestNamed.foo4()")); 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -121,7 +121,7 @@ } @Override - public String getSimpleJavaName() { + public String getElementName() { return null; } 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-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -143,4 +143,9 @@ public boolean exists() { return false; } -} + + @Override + public String getElementName() { + return null; + } +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-09-13 23:51:32 UTC (rev 34706) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIQualifier.java 2011-09-14 00:13:43 UTC (rev 34707) @@ -90,4 +90,9 @@ public boolean isAnnotationPresent(String annotationTypeName) { return false; } + + @Override + public String getElementName() { + return null; + } } \ No newline at end of file