Author: scabanovich Date: 2011-09-29 17:23:50 -0400 (Thu, 29 Sep 2011) New Revision: 35175 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.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.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties Log: JBIDE-9800 https://issues.jboss.org/browse/JBIDE-9800 Created util method for string presentation of IBean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2011-09-29 21:21:32 UTC (rev 35174) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2011-09-29 21:23:50 UTC (rev 35175) @@ -21,13 +21,7 @@ public static String CDI_EXT_PLUGIN_NO_MESSAGE; public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN; public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE; - public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER; public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES; public static String CDI_SHOW_ALL_ELIGIBLE_BEANS_TITLE; public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-29 21:21:32 UTC (rev 35174) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-29 21:23:50 UTC (rev 35175) @@ -78,6 +78,7 @@ import org.jboss.tools.cdi.core.IProducerField; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.cdi.core.util.BeanPresentationUtil; import org.jboss.tools.cdi.internal.core.impl.AbstractBeanElement; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeanFilters.Checkbox; @@ -569,47 +570,18 @@ IBean b = (IBean)element; Styler nameStyler = eligibleBeans.contains(b) ? ELIGIBLE_NAME : DISABLED; StyledString sb = new StyledString(); - if(b.isAlternative()) { - sb.append("@Alternative ", nameStyler); + + //1.bean kind + String kind = BeanPresentationUtil.getBeanKind(b); + if(kind != null) { + sb.append(kind, nameStyler).append(' '); } - if(b.isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)) { - sb.append("@Decorator ", nameStyler); - } - if(b.isAnnotationPresent(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)) { - sb.append("@Interceptor ", nameStyler); - } - if(b instanceof IProducer) { - sb.append("@Produces ", nameStyler); - sb.append(b.getBeanClass().getElementName(), nameStyler).append(".", nameStyler); - if(b instanceof IProducerField) { - sb.append(((IProducerField)b).getField().getElementName(), nameStyler); - } else { - sb.append(((IProducerMethod)b).getMethod().getElementName(), nameStyler) - .append("()", nameStyler); - } - } else { - String name = b.getBeanClass().getElementName(); - if(name.length() == 0) { - name = b.getBeanClass().getFullyQualifiedName(); - } - sb.append(name, nameStyler); - } + //2. bean element name + sb.append(b.getElementName(), nameStyler); + //3. bean location Styler qualifierStyler = eligibleBeans.contains(b) ? ELIGIBLE_QUALIFIER : DISABLED; - - AbstractBeanElement e = (AbstractBeanElement)b; - ITextSourceReference origin = e.getDefinition().getOriginalDefinition(); - if(origin != null) { - //If toString() is not enough, another interface should be introduced. - sb.append(" - ", qualifierStyler).append(origin.toString(), qualifierStyler); - } else { - String pkg = b.getBeanClass().getPackageFragment().getElementName(); - sb.append(" - ", qualifierStyler).append(pkg, qualifierStyler).append(" - ", qualifierStyler); - IPath path = b.getBeanClass().getPackageFragment().getParent().getPath(); - if(path != null) { - sb.append(path.toString(), qualifierStyler); - } - } + sb.append(BeanPresentationUtil.getBeanLocation(b, false),qualifierStyler); return sb; } 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-29 21:21:32 UTC (rev 35174) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-29 21:23:50 UTC (rev 35175) @@ -27,6 +27,7 @@ import org.jboss.tools.cdi.core.IInterceptor; import org.jboss.tools.cdi.core.IProducerField; import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.core.util.BeanPresentationUtil; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; @@ -76,23 +77,19 @@ @Override public String getHyperlinkText() { - String text=""; + String text = ""; if(bean != null){ if(first){ - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+" "; + text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN + " "; }else{ - if(bean.isSelectedAlternative()) - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE+" "; - else if(bean.isAlternative()) - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE+" "; - else if(bean instanceof IProducerField || bean instanceof IProducerMethod) - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER+" "; - else if(bean instanceof IDecorator) - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR+" "; - else if(bean instanceof IInterceptor) - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR+" "; - else - text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN+" "; + text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN + " "; + String kind = BeanPresentationUtil.getBeanKind(bean); + if(kind != null) { + if(bean.isSelectedAlternative()) { + text += "*"; + } + text += kind + " "; + } } text += bean.getElementName(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-29 21:21:32 UTC (rev 35174) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-29 21:23:50 UTC (rev 35175) @@ -1,12 +1,6 @@ CDI_EXT_PLUGIN_NO_MESSAGE=No message CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN=Open -CDI_INJECTED_POINT_HYPERLINK_OPEN_DECORATOR=Open @Decorator -CDI_INJECTED_POINT_HYPERLINK_OPEN_INTERCEPTOR=Open @Interceptor -CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN=Open Injected Bean CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN=Open @Inject Bean -CDI_INJECTED_POINT_HYPERLINK_OPEN_SELECTED_ALTERNATIVE=Open *@Alternative -CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE=Open @Alternative -CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER=Open @Produces CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES=Show All Eligible Beans... CDI_SHOW_ALL_ELIGIBLE_BEANS_TITLE=All Eligible Beans CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE=Show All Assignable Beans...