September 2011 - jbosstools-commits

JBoss Tools SVN: r34707 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 8 other directories.

by jbosstools-commits＠lists.jboss.org

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

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34706 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-09-13 19:51:32 -0400 (Tue, 13 Sep 2011) New Revision: 34706 Modified: trunk/build/pom.xml Log: added richfaces profile to be able to build all richfaces features Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-09-13 23:21:51 UTC (rev 34705) +++ trunk/build/pom.xml 2011-09-13 23:51:32 UTC (rev 34706) @@ -610,8 +610,22 @@ <module>../runtime</module> </modules> </profile> - + <profile> + <id>richfaces</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../vpe</module> + <module>../jsf</module> + </modules> + </profile> + + <profile> <id>usage</id> <activation> <activeByDefault>true</activeByDefault>

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34705 - trunk/documentation/guides/GettingStartedGuide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-09-13 19:21:51 -0400 (Tue, 13 Sep 2011) New Revision: 34705 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Revision_History.xml trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml Log: updated for TOOLSDOC-249 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Revision_History.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Revision_History.xml 2011-09-13 23:18:55 UTC (rev 34704) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Revision_History.xml 2011-09-13 23:21:51 UTC (rev 34705) @@ -6,6 +6,20 @@ <simpara> <revhistory> <revision> + <revnumber>1-4</revnumber> + <date>Wed Sep 14 2011</date> + <author> + <firstname>Isaac</firstname> + <surname>Rooskov</surname> + <email>irooskov(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Updated FAQ section with correct config file information</member> + </simplelist> + </revdescription> + </revision> + <revision> <revnumber>1-3</revnumber> <date>Mon Aug 01 2011</date> <author> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2011-09-13 23:18:55 UTC (rev 34704) +++ trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2011-09-13 23:21:51 UTC (rev 34705) @@ -48,7 +48,7 @@ </listitem> <listitem> - <para>Open the file <filename>eclipse.ini</filename>, which can be found in your Fedora Eclipse location and add the following line: </para> + <para>Open the file <filename>jbdevstudio.ini</filename>, which can be found in your JBoss Developer Studio location and add the following line: </para> <programlisting role="JAVA"><![CDATA[-Dswt.library.path=/usr/lib/eclipse]]></programlisting> <para>,where <code>/usr/lib/eclipse</code> is the path to your eclipse folder.</para> </listitem> @@ -165,7 +165,7 @@ <title>Is it possible to increase the performance of Eclipse after installing your product?</title> <para> - <property>JBoss Developer Studio</property> configures eclipse via the <filename>eclipse.ini</filename> file to allocate extra memory, but if you for some reason need more memory then by default, you can manually make adjustments in this file. For example:</para> + <property>JBoss Developer Studio</property> configures eclipse via the <filename>jbdevstudio.ini</filename> file to allocate extra memory, but if you for some reason need more memory then by default, you can manually make adjustments in this file. For example:</para> <programlisting role="XML"><![CDATA[-vmargs -Xms128m -Xmx512m -XX:MaxPermSize=128m]]></programlisting> </section>

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34704 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-09-13 19:18:55 -0400 (Tue, 13 Sep 2011) New Revision: 34704 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java Log: JBIDE-9287 https://issues.jboss.org/browse/JBIDE-9287 comment modified. Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-09-13 23:15:11 UTC (rev 34703) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-09-13 23:18:55 UTC (rev 34704) @@ -51,7 +51,6 @@ /** * This test just checks that SAXParser class is in class path. - * This test class should compile. */ public void testParser() throws Exception { Bundle bundle = Platform.getBundle("org.jboss.tools.cdi.seam.config.core");

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34703 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-09-13 19:15:11 -0400 (Tue, 13 Sep 2011) New Revision: 34703 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java Log: Exception handling clean up. JarAccess.java should not just report zip related exceptions, but include affected zip file name in the log message as well. Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2011-09-13 23:14:50 UTC (rev 34702) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2011-09-13 23:15:11 UTC (rev 34703) @@ -242,8 +242,8 @@ } return sb.toString(); } catch (IOException e) { - errors.add(e.getClass().getName() + ": " + e.getMessage()); - ModelPlugin.getPluginLog().logError(e); + errors.add(e.getClass().getName() + " occurs when reading " + jar.getName() + " : " + e.getMessage()); //$NON-NLS-1$//$NON-NLS-2$ + ModelPlugin.getPluginLog().logError("Exception occurs when reading " + jar.getName(), e); //$NON-NLS-1$ return ""; //$NON-NLS-1$ } finally { unlockJar();

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34702 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-09-13 19:14:50 -0400 (Tue, 13 Sep 2011) New Revision: 34702 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java Log: "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT https://issues.jboss.org/browse/JBIDE-9673 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-13 23:13:22 UTC (rev 34701) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-13 23:14:50 UTC (rev 34702) @@ -12,25 +12,27 @@ package org.jboss.tools.cdi.text.ext.hyperlink.xpl; import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.StyledCellLabelProvider; +import org.eclipse.jface.viewers.StyledString; +import org.eclipse.jface.viewers.StyledString.Styler; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.TextStyle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.SearchPattern; -import org.eclipse.ui.keys.KeySequence; -import org.eclipse.ui.keys.SWTKeySupport; import org.jboss.tools.cdi.text.ext.hyperlink.IInformationItem; /** @@ -44,38 +46,12 @@ private BeanTableLabelProvider fLabelProvider; private KeyAdapter fKeyAdapter; - private IHyperlink fFocus; // bean to filter for or null if type hierarchy - public HierarchyInformationControl(Shell parent, String title, int shellStyle, int tableStyle, IHyperlink[] hyperlinks) { super(parent, shellStyle, tableStyle, IJavaEditorActionDefinitionIds.OPEN_HIERARCHY, true); this.hyperlinks = hyperlinks; setTitleText(title); } - private KeyAdapter getKeyAdapter() { - if (fKeyAdapter == null) { - fKeyAdapter= new KeyAdapter() { - @Override - public void keyPressed(KeyEvent e) { - int accelerator = SWTKeySupport.convertEventToUnmodifiedAccelerator(e); - KeySequence keySequence = KeySequence.getInstance(SWTKeySupport.convertAcceleratorToKeyStroke(accelerator)); - KeySequence[] sequences= getInvokingCommandKeySequences(); - if (sequences == null) - return; - - for (int i= 0; i < sequences.length; i++) { - if (sequences[i].equals(keySequence)) { - e.doit= false; - toggleHierarchy(); - return; - } - } - } - }; - } - return fKeyAdapter; - } - /** * {@inheritDoc} */ @@ -84,15 +60,6 @@ return true; } - @Override - protected Text createFilterText(Composite parent) { - // text set later - Text text= super.createFilterText(parent); - text.addKeyListener(getKeyAdapter()); - return text; - } - - /* (non-Javadoc) * @see org.eclipse.jdt.internal.ui.text.JavaOutlineInformationControl#createTableViewer(org.eclipse.swt.widgets.Composite, int) */ @@ -108,32 +75,12 @@ tableViewer.addFilter(new BeanFilter()); fLabelProvider= new BeanTableLabelProvider(); - fLabelProvider.setFilter(new ViewerFilter() { - @Override - public boolean select(Viewer viewer, Object parentElement, Object element) { - return hasFocusBean((IHyperlink) element); - } - }); tableViewer.setLabelProvider(fLabelProvider); - tableViewer.getTable().addKeyListener(getKeyAdapter()); - return tableViewer; } - protected boolean hasFocusBean(IHyperlink hyperlink) { - if (fFocus == null) { - return true; - } - if (hyperlink.equals(fFocus)) { - return true; - } - - return false; - - } - /** * {@inheritDoc} */ @@ -153,24 +100,6 @@ inputChanged(hyperlinks, hyperlinks[0]); } - protected void toggleHierarchy() { - TableViewer tableViewer= getTableViewer(); - - tableViewer.getTable().setRedraw(false); - - // reveal selection - Object selectedElement= getSelectedElement(); - if (selectedElement != null) - getTableViewer().reveal(selectedElement); - else - selectFirstMatch(); - - tableViewer.getTable().setRedraw(true); - - updateStatusFieldText(); - } - - /** * {@inheritDoc} */ @@ -207,71 +136,89 @@ } - public static class BeanTableLabelProvider implements ILabelProvider{ - @Override - public void addListener(ILabelProviderListener listener) { + public class BeanFilter extends ViewerFilter { + SearchPattern patternMatcher = new SearchPattern(); + public boolean isConsistentItem(Object item) { + return true; } - public void setFilter(ViewerFilter viewerFilter) { + public boolean select(Viewer viewer, Object parentElement, + Object element) { + + if (element instanceof IInformationItem) { + String information = ((IInformationItem)element).getInformation(); + if(getFilterText().getText().isEmpty()){ + patternMatcher.setPattern("*"); + }else{ + patternMatcher.setPattern(getFilterText().getText()); + } + return patternMatcher.matches(information); + }else + return true; } + } + + static Color gray = new Color(null, 128, 128, 128); + static Color black = new Color(null, 0, 0, 0); - @Override - public void dispose() { - } + static Styler NAME_STYLE = new DefaultStyler(black, false); + static Styler PACKAGE_STYLE = new DefaultStyler(gray, false); + + private static class DefaultStyler extends Styler { + private final Color foreground; + private final boolean italic; - @Override - public boolean isLabelProperty(Object element, String property) { - return false; + public DefaultStyler(Color foreground, boolean italic) { + this.foreground = foreground; + this.italic = italic; } - @Override - public void removeListener(ILabelProviderListener listener) { + public void applyStyles(TextStyle textStyle) { + if (foreground != null) { + textStyle.foreground = foreground; + } + if(italic) { + textStyle.font = JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT); + } } + } + + class BeanTableLabelProvider extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider { + public void update(ViewerCell cell) { + Object element = cell.getElement(); + StyledString styledString = getStyledText(element); + cell.setText(styledString.getString()); + cell.setStyleRanges(styledString.getStyleRanges()); + cell.setImage(getImage(element)); - @Override - public Image getImage(Object element) { - if(element instanceof IInformationItem){ - return ((IInformationItem)element).getImage(); - } - return null; + super.update(cell); } - @Override public String getText(Object element) { + return getStyledText(element).getString(); + } + public StyledString getStyledText(Object element) { + StyledString sb = new StyledString(); if(element instanceof IHyperlink){ if(element instanceof IInformationItem){ String info = ((IInformationItem)element).getInformation(); String qualifiedName = ((IInformationItem)element).getFullyQualifiedName(); String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf(".")); - return info + " - " + packageName; + sb.append(info, NAME_STYLE); + sb.append(" - ", PACKAGE_STYLE).append(packageName, PACKAGE_STYLE); + }else{ + sb.append(((IHyperlink)element).getHyperlinkText(), NAME_STYLE); } - return ((IHyperlink)element).getHyperlinkText(); } - return ""; + return sb; } - - } - - public class BeanFilter extends ViewerFilter { - SearchPattern patternMatcher = new SearchPattern(); - public boolean isConsistentItem(Object item) { - return true; - } - public boolean select(Viewer viewer, Object parentElement, - Object element) { - - if (element instanceof IInformationItem) { - String information = ((IInformationItem)element).getInformation(); - if(getFilterText().getText().isEmpty()){ - patternMatcher.setPattern("*"); - }else{ - patternMatcher.setPattern(getFilterText().getText()); - } - return patternMatcher.matches(information); - }else - return true; - } + public Image getImage(Object element) { + if(element instanceof IInformationItem){ + return ((IInformationItem)element).getImage(); + } + return null; + } } }

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34701 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-09-13 19:13:22 -0400 (Tue, 13 Sep 2011) New Revision: 34701 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java Log: JBIDE-9287 https://issues.jboss.org/browse/JBIDE-9287 Test added. Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-09-13 22:50:51 UTC (rev 34700) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-09-13 23:13:22 UTC (rev 34701) @@ -17,8 +17,8 @@ import java.util.Map; import java.util.Set; -import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; @@ -28,10 +28,7 @@ import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IStereotype; -import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature; -import org.jboss.tools.cdi.internal.core.impl.BeanField; import org.jboss.tools.cdi.seam.config.core.CDISeamConfigConstants; -import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension; import org.jboss.tools.cdi.seam.config.core.ConfigDefinitionContext; import org.jboss.tools.cdi.seam.config.core.definition.SeamBeanDefinition; import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition; @@ -42,7 +39,7 @@ import org.jboss.tools.cdi.seam.config.core.xml.Location; import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants; import org.jboss.tools.common.java.IJavaAnnotation; -import org.jboss.tools.common.text.ITextSourceReference; +import org.osgi.framework.Bundle; /** * @@ -52,6 +49,16 @@ public class SeamDefinitionsTest extends SeamConfigTest { public SeamDefinitionsTest() {} + /** + * This test just checks that SAXParser class is in class path. + * This test class should compile. + */ + public void testParser() throws Exception { + Bundle bundle = Platform.getBundle("org.jboss.tools.cdi.seam.config.core"); + Class cls = bundle.loadClass("org.apache.xerces.parsers.SAXParser"); + assertNotNull(cls); + } + public void testLineNumber() { ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34700 - trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-09-13 18:50:51 -0400 (Tue, 13 Sep 2011) New Revision: 34700 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTemplate.java Log: https://issues.jboss.org/browse/JBIDE-9700 HTML tag attributes don't applied into visual part applied patch with minor changes Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTemplate.java 2011-09-13 22:34:20 UTC (rev 34699) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTemplate.java 2011-09-13 22:50:51 UTC (rev 34700) @@ -17,7 +17,9 @@ import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Attr; import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; public class HtmlTemplate extends VpeAbstractTemplate { @@ -29,13 +31,13 @@ /* * Set "xmlns" attribute to the generated by VPE html stub. */ - if (sourceElement.hasAttribute(HTML.ATTR_XMLNS)) { - String xmlnsAttr = sourceElement.getAttribute(HTML.ATTR_XMLNS); - nsIDOMNode htmlNode = visualDocument.getElementsByTagName(HTML.TAG_HTML).item(0); - nsIDOMElement htmlElement = (nsIDOMElement)htmlNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - htmlElement.setAttribute(HTML.ATTR_XMLNS, xmlnsAttr); + nsIDOMNode htmlNode = visualDocument.getElementsByTagName(HTML.TAG_HTML).item(0); + nsIDOMElement htmlElement = (nsIDOMElement)htmlNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + NamedNodeMap namedNodes = sourceElement.getAttributes(); + for(int i=0;i<namedNodes.getLength();i++){ + Attr sourceAttr = (Attr) namedNodes.item(i); + htmlElement.setAttribute(sourceAttr.getName(),sourceAttr.getValue()); } - nsIDOMNode divElement = visualDocument.createElement(HTML.TAG_DIV); - return new VpeCreationData(divElement); + return new VpeCreationData(visualDocument.createElement(HTML.TAG_DIV)); } }

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34699 - in trunk/cdi/plugins: org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-09-13 18:34:20 -0400 (Tue, 13 Sep 2011) New Revision: 34699 Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IFilterable.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties 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/AlternativeInjectedPointListHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.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/hyperlink/ObserverMethodHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties Log: "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT https://issues.jboss.org/browse/JBIDE-9673 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtMessages.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/CDISeamExtMessages.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -23,7 +23,7 @@ public static String CDI_SEAM_CONFIG_OPEN_TAG; public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_GENERIC_BEANS; - public static String CDI_SHOW_ALL_GENERIC_CONFIGURATION_POINTS_TITLE; + public static String CDI_SHOW_GENERIC_CONFIGURATION_POINTS_TITLE; public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_SEAM_CONFIG_BEANS; public static String OPEN_GENERIC_BEAN; public static String OPEN_GENERIC_PRODUCER_BEAN; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -17,10 +17,9 @@ import org.jboss.tools.cdi.core.IProducerField; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.seam.text.ext.CDISeamExtMessages; -import org.jboss.tools.cdi.text.ext.hyperlink.IFilterable; import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink; -public class GenericInjectedPointHyperlink extends InjectedPointHyperlink implements IFilterable{ +public class GenericInjectedPointHyperlink extends InjectedPointHyperlink{ public GenericInjectedPointHyperlink(IRegion region, IBean bean, IDocument document) { super(region, bean, document); @@ -30,16 +29,17 @@ public String getHyperlinkText() { String text=""; if (bean != null) { - String str = bean.getSimpleJavaName(); - String beanTypeName = bean.getBeanClass().getFullyQualifiedName(); - String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(".")); - return str+" - "+beanPackage; + String name = bean.getBeanClass().getElementName(); + if (bean instanceof IProducerField) { + name += "."+((IProducerField)bean).getField().getElementName(); + text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_PRODUCER_BEAN, name); + } else if (bean instanceof IProducerMethod) { + name += "."+((IProducerMethod)bean).getMethod().getElementName()+"()"; + text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_PRODUCER_BEAN, name); + } else { + text = NLS.bind(CDISeamExtMessages.OPEN_GENERIC_BEAN, name); + } } return text; } - - public String getFullyQualifiedName() { - return bean.getBeanClass().getFullyQualifiedName(); - } - } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.seam.text.ext.hyperlink; -import java.util.ArrayList; import java.util.List; import org.eclipse.jface.text.IDocument; @@ -21,7 +20,6 @@ import org.jboss.tools.cdi.seam.text.ext.CDISeamExtMessages; import org.jboss.tools.cdi.text.ext.hyperlink.AlternativeInjectedPointListHyperlink; import org.jboss.tools.cdi.text.ext.hyperlink.InformationControlManager; -import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink; public class GenericInjectedPointListHyperlink extends AlternativeInjectedPointListHyperlink { @@ -42,27 +40,27 @@ } protected void doHyperlink(IRegion region) { - List<IHyperlink> hyperlinks = new ArrayList<IHyperlink>(); + IHyperlink[] hyperlinks = new IHyperlink[beans.size()]; int index=0; for(IBean bean : beans){ - hyperlinks.add(createHyperlink(region, bean)); + hyperlinks[index++] = createHyperlink(region, bean); } - if(hyperlinks.size() == 0){ + if(hyperlinks.length == 0){ openFileFailed(); return; } - if(hyperlinks.size() == 1){ - hyperlinks.get(0).open(); + if(hyperlinks.length == 1){ + hyperlinks[0].open(); }else{ showHyperlinks(hyperlinks); } } - private void showHyperlinks(List<IHyperlink> hyperlinks){ - InformationControlManager.showHyperlinks(CDISeamExtMessages.CDI_SHOW_ALL_GENERIC_CONFIGURATION_POINTS_TITLE, viewer, hyperlinks); + private void showHyperlinks(IHyperlink[] hyperlinks){ + InformationControlManager.showHyperlinks(CDISeamExtMessages.CDI_SHOW_GENERIC_CONFIGURATION_POINTS_TITLE, viewer, hyperlinks); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties 2011-09-13 22:34:20 UTC (rev 34699) @@ -2,7 +2,7 @@ CDI_SEAM_RESOURCE_LOADING_HYPERLINK=Open Resource ''{0}'' CDI_SEAM_CONFIG_OPEN_TAG=Open Java Source Corresponding to ''{0}'' tag CDI_INJECTED_POINT_HYPERLINK_SHOW_GENERIC_BEANS=Show All Generic Configuration Points... -CDI_SHOW_ALL_GENERIC_CONFIGURATION_POINTS_TITLE=Show All Generic Configuration Points +CDI_SHOW_GENERIC_CONFIGURATION_POINTS_TITLE=Generic Configuration Points CDI_INJECTED_POINT_HYPERLINK_SHOW_SEAM_CONFIG_BEANS=Show All Seam Config Bean Definitions... OPEN_GENERIC_BEAN=Open Generic Configuration Point {0} OPEN_GENERIC_PRODUCER_BEAN=Open Generic Configuration Point {0} 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-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -29,11 +29,14 @@ 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; public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER; public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER; public static String CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS; + public static String CDI_OBSERVER_METHODS_TITLE; public static String CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS; + public static String CDI_EVENT_TITLE; public static String CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD; public static String CDI_EVENT_HYPERLINK_OPEN_EVENT; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -53,7 +53,7 @@ if(hyperlinks.length == 1){ ((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region); }else{ - MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks); + InformationControlManager.showHyperlinks(CDIExtensionsMessages.CDI_SHOW_ALL_ELIGIBLE_BEANS_TITLE, viewer, hyperlinks); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -17,6 +17,7 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.jboss.tools.cdi.core.ICDIElement; @@ -28,7 +29,7 @@ import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -public class EventHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{ +public class EventHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink, IInformationItem{ IInjectionPoint event; IRegion region; @@ -93,4 +94,26 @@ return null; } + public String getFullyQualifiedName() { + return event.getClassBean().getBeanClass().getFullyQualifiedName(); + } + + public String getInformation() { + String text = event.getClassBean().getBeanClass().getElementName(); + + if(event instanceof IInjectionPointField) { + text += "."+((IInjectionPointField)event).getField().getElementName(); + } else if(event instanceof IInjectionPointParameter) { + IInjectionPointParameter p = (IInjectionPointParameter)event; + text += "." + p.getBeanMethod().getMethod().getElementName(); + } + + return text; + } + + + public Image getImage() { + return null; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -54,7 +54,7 @@ if(hyperlinks.length == 1){ ((EventHyperlink)hyperlinks[0]).doHyperlink(region); }else{ - MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks); + InformationControlManager.showHyperlinks(CDIExtensionsMessages.CDI_EVENT_TITLE, viewer, hyperlinks); } } Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IFilterable.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IFilterable.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IFilterable.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -1,15 +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.cdi.text.ext.hyperlink; - -public interface IFilterable { - public String getFullyQualifiedName(); -} Copied: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java (from rev 34679, trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IFilterable.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.text.ext.hyperlink; + +import org.eclipse.swt.graphics.Image; + +public interface IInformationItem { + + /** + * Returns the simple name of item + * + * @return + */ + public String getInformation(); + + /** + * Returns the java element fully qualified name + * + * @return + */ + public String getFullyQualifiedName(); + + /** + * Returns the icon image + * + * @return + */ + public Image getImage(); +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/IInformationItem.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -10,8 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.text.ext.hyperlink; -import java.util.List; - import org.eclipse.jface.text.AbstractInformationControlManager; import org.eclipse.jface.text.IInformationControl; import org.eclipse.jface.text.IInformationControlCreator; @@ -23,15 +21,15 @@ import org.jboss.tools.cdi.text.ext.hyperlink.xpl.InformationPresenter; public class InformationControlManager { - public static void showHyperlinks(String title, ITextViewer viwer, List<IHyperlink> hyperlinks){ - InformationPresenter presenter= new InformationPresenter(viwer, getHierarchyPresenterControlCreator(title, hyperlinks)); + public static void showHyperlinks(String title, ITextViewer viewer, IHyperlink[] hyperlinks){ + InformationPresenter presenter= new InformationPresenter(viewer, getHierarchyPresenterControlCreator(title, hyperlinks)); presenter.setAnchor(AbstractInformationControlManager.ANCHOR_GLOBAL); presenter.setSizeConstraints(60, 10, true, false); - presenter.install(viwer.getTextWidget()); + presenter.install(viewer.getTextWidget()); presenter.showInformation(); } - private static IInformationControlCreator getHierarchyPresenterControlCreator(final String title, final List<IHyperlink> hyperlinks) { + private static IInformationControlCreator getHierarchyPresenterControlCreator(final String title, final IHyperlink[] hyperlinks) { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { int shellStyle= SWT.RESIZE; 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 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -17,6 +17,7 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.jboss.tools.cdi.core.IBean; @@ -29,7 +30,7 @@ import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -public class InjectedPointHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{ +public class InjectedPointHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink, IInformationItem{ protected IBean bean; IRegion region; boolean first = false; @@ -126,4 +127,16 @@ return null; } + public String getFullyQualifiedName() { + return bean.getBeanClass().getFullyQualifiedName(); + } + + public String getInformation() { + return bean.getSimpleJavaName(); + } + + public Image getImage() { + return null; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -17,6 +17,7 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.jboss.tools.cdi.core.ICDIElement; @@ -25,7 +26,7 @@ import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -public class ObserverMethodHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{ +public class ObserverMethodHyperlink extends AbstractHyperlink implements IInformationItem, ITestableCDIHyperlink{ IObserverMethod observerMethod; IRegion region; @@ -34,9 +35,7 @@ this.region = region; setDocument(document); } - - @Override protected IRegion doGetHyperlinkRegion(int offset) { return region; } @@ -76,4 +75,16 @@ return null; } + public String getFullyQualifiedName() { + return observerMethod.getClassBean().getBeanClass().getFullyQualifiedName(); + } + + public String getInformation() { + return observerMethod.getClassBean().getBeanClass().getElementName()+"."+observerMethod.getMethod().getElementName()+"()"; + } + + public Image getImage() { + return null; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -54,7 +54,7 @@ if(hyperlinks.length == 1){ ((ObserverMethodHyperlink)hyperlinks[0]).doHyperlink(region); }else{ - MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks); + InformationControlManager.showHyperlinks(CDIExtensionsMessages.CDI_OBSERVER_METHODS_TITLE, viewer, hyperlinks); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -447,13 +447,6 @@ protected void inputChanged(Object newInput, Object newSelection) { fFilterText.setText(""); //$NON-NLS-1$ fInitiallySelectedType= null; - if (newSelection instanceof IJavaElement) { - IJavaElement javaElement= ((IJavaElement)newSelection); - if (javaElement.getElementType() == IJavaElement.TYPE) - fInitiallySelectedType= (IType)javaElement; - else - fInitiallySelectedType= (IType)javaElement.getAncestor(IJavaElement.TYPE); - } fTableViewer.setInput(newInput); if (newSelection != null) fTableViewer.setSelection(new StructuredSelection(newSelection)); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-13 22:34:20 UTC (rev 34699) @@ -11,8 +11,6 @@ *******************************************************************************/ package org.jboss.tools.cdi.text.ext.hyperlink.xpl; -import java.util.List; - import org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.jface.viewers.ILabelProvider; @@ -33,7 +31,7 @@ import org.eclipse.ui.dialogs.SearchPattern; import org.eclipse.ui.keys.KeySequence; import org.eclipse.ui.keys.SWTKeySupport; -import org.jboss.tools.cdi.text.ext.hyperlink.IFilterable; +import org.jboss.tools.cdi.text.ext.hyperlink.IInformationItem; /** * Show hierarchy in light-weight control. @@ -41,14 +39,14 @@ * @since 3.0 */ public class HierarchyInformationControl extends AbstractInformationControl { - private List<IHyperlink> hyperlinks; + private IHyperlink[] hyperlinks; private BeanTableLabelProvider fLabelProvider; private KeyAdapter fKeyAdapter; private IHyperlink fFocus; // bean to filter for or null if type hierarchy - public HierarchyInformationControl(Shell parent, String title, int shellStyle, int tableStyle, List<IHyperlink> hyperlinks) { + public HierarchyInformationControl(Shell parent, String title, int shellStyle, int tableStyle, IHyperlink[] hyperlinks) { super(parent, shellStyle, tableStyle, IJavaEditorActionDefinitionIds.OPEN_HIERARCHY, true); this.hyperlinks = hyperlinks; setTitleText(title); @@ -120,7 +118,7 @@ tableViewer.setLabelProvider(fLabelProvider); tableViewer.getTable().addKeyListener(getKeyAdapter()); - + return tableViewer; } @@ -141,18 +139,18 @@ */ @Override public void setInput(Object information) { - if(!(information instanceof List)){ + if(!(information instanceof IHyperlink[])){ inputChanged(null, null); return; } - hyperlinks = (List<IHyperlink>)information; + hyperlinks = (IHyperlink[])information; BeanTableContentProvider contentProvider= new BeanTableContentProvider(hyperlinks); getTableViewer().setContentProvider(contentProvider); - inputChanged(hyperlinks, null); + inputChanged(hyperlinks, hyperlinks[0]); } protected void toggleHierarchy() { @@ -188,9 +186,9 @@ } public static class BeanTableContentProvider implements IStructuredContentProvider{ - private List<IHyperlink> hyperlinks; + private IHyperlink[] hyperlinks; - public BeanTableContentProvider(List<IHyperlink> beans){ + public BeanTableContentProvider(IHyperlink[] beans){ this.hyperlinks = beans; } @@ -204,7 +202,7 @@ @Override public Object[] getElements(Object inputElement) { - return hyperlinks.toArray(); + return hyperlinks; } } @@ -232,12 +230,21 @@ @Override public Image getImage(Object element) { + if(element instanceof IInformationItem){ + return ((IInformationItem)element).getImage(); + } return null; } @Override public String getText(Object element) { if(element instanceof IHyperlink){ + if(element instanceof IInformationItem){ + String info = ((IInformationItem)element).getInformation(); + String qualifiedName = ((IInformationItem)element).getFullyQualifiedName(); + String packageName = qualifiedName.substring(0, qualifiedName.lastIndexOf(".")); + return info + " - " + packageName; + } return ((IHyperlink)element).getHyperlinkText(); } return ""; @@ -254,25 +261,16 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { - if (element instanceof IFilterable) { - String beanTypeName = ((IFilterable)element).getFullyQualifiedName(); - if(getFilterText().getText().isEmpty()) + if (element instanceof IInformationItem) { + String information = ((IInformationItem)element).getInformation(); + if(getFilterText().getText().isEmpty()){ patternMatcher.setPattern("*"); - else + }else{ patternMatcher.setPattern(getFilterText().getText()); - boolean result = patternMatcher.matches(beanTypeName); - if (!result) { - String pattern = patternMatcher.getPattern(); - if (pattern.indexOf(".") < 0) { - int lastIndex = beanTypeName.lastIndexOf("."); - if (lastIndex >= 0 - && (lastIndex + 1) < beanTypeName.length()) - return patternMatcher.matches(beanTypeName.substring(lastIndex + 1)); - } } - return result; - } - return false; + return patternMatcher.matches(information); + }else + return true; } } } 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-13 21:25:24 UTC (rev 34698) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-13 22:34:20 UTC (rev 34699) @@ -8,11 +8,14 @@ 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... CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method -CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Open CDI Observer Methods -CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS=Open CDI Events +CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Show CDI Observer Methods +CDI_OBSERVER_METHODS_TITLE=CDI Observer Methods +CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS=Show CDI Events +CDI_EVENT_TITLE=CDI Events CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD=Open CDI Observer Method CDI_EVENT_HYPERLINK_OPEN_EVENT=Open CDI Event

14 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r34698 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-09-13 17:25:24 -0400 (Tue, 13 Sep 2011) New Revision: 34698 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/AssignableBeansHyperlink.java Log: JBIDE-9347 https://issues.jboss.org/browse/JBIDE-9347 Styles added. 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-13 21:24:04 UTC (rev 34697) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-13 21:25:24 UTC (rev 34698) @@ -18,10 +18,11 @@ import java.util.Set; import java.util.TreeMap; +import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IMethod; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.internal.text.TableOwnerDrawSupport; +import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; @@ -29,23 +30,24 @@ import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ICheckStateProvider; -import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.IFontProvider; +import org.eclipse.jface.viewers.IOpenListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.OpenEvent; import org.eclipse.jface.viewers.StyledCellLabelProvider; import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.jface.viewers.StyledString.Styler; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.TextStyle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -62,7 +64,9 @@ 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.internal.core.impl.AbstractBeanElement; import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.text.ITextSourceReference; public class AssignableBeansDialog extends TitleAreaDialog { IInjectionPoint injectionPoint; @@ -71,10 +75,12 @@ Set<IBean> resolvedBeans = new HashSet<IBean>(); CheckboxTreeViewer filterView; + TableViewer list; public AssignableBeansDialog(Shell parentShell) { super(parentShell); + setShellStyle(getShellStyle() | SWT.RESIZE); } public void setInjectionPoint(IInjectionPoint injectionPoint) { @@ -144,17 +150,16 @@ } void createListView(Composite parent) { - list = new TableViewer(parent); + list = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER/* | SWT.VIRTUAL*/); GridData g = new GridData(GridData.FILL_BOTH); list.getControl().setLayoutData(g); list.setContentProvider(new ListContent()); list.setLabelProvider(new LP()); - TableOwnerDrawSupport.install(list.getTable()); +// TableOwnerDrawSupport.install(list.getTable()); list.setInput(injectionPoint); - list.addDoubleClickListener(new IDoubleClickListener() { - + list.addOpenListener(new IOpenListener() { @Override - public void doubleClick(DoubleClickEvent event) { + public void open(OpenEvent event) { ISelection s = event.getSelection(); if(!s.isEmpty() && s instanceof IStructuredSelection) { Object o = ((IStructuredSelection)s).getFirstElement(); @@ -162,9 +167,14 @@ ((IBean)o).open(); } } - } }); + list.addDoubleClickListener(new IDoubleClickListener() { + @Override + public void doubleClick(DoubleClickEvent event) { + } + }); + list.refresh(); } void createFilterView(Composite parent) { @@ -189,8 +199,7 @@ list.refresh(); } }); - filterView.setCheckStateProvider(new ICheckStateProvider() { - + filterView.setCheckStateProvider(new ICheckStateProvider() { @Override public boolean isGrayed(Object element) { Checkbox c = (Checkbox)element; @@ -313,12 +322,17 @@ @Override public Object[] getElements(Object inputElement) { Set<IBean> bs = new HashSet<IBean>(beans); + Set<String> keys = new HashSet<String>(); LP p = new LP(); ROOT.filter(bs); Map<String, IBean> map = new TreeMap<String, IBean>(); for (IBean b: bs) { if(resolvedBeans.contains(b)) { - map.put(p.getText(b), b); + String key = p.getText(b); + if(!keys.contains(key)) { + map.put(key, b); + keys.add(key); + } } } List<IBean> sorted = new ArrayList<IBean>(); @@ -328,7 +342,11 @@ for (IBean b: bs) { if(eligibleBeans.contains(b)) { - map.put(p.getText(b), b); + String key = p.getText(b); + if(!keys.contains(key)) { + map.put(key, b); + keys.add(key); + } } } sorted.addAll(map.values()); @@ -336,7 +354,11 @@ map.clear(); for (IBean b: bs) { - map.put(p.getText(b), b); + String key = p.getText(b); + if(!keys.contains(key)) { + map.put(key, b); + keys.add(key); + } } sorted.addAll(map.values()); @@ -345,74 +367,94 @@ } - class LP extends StyledCellLabelProvider implements ITableLabelProvider, IFontProvider, IColorProvider, DelegatingStyledCellLabelProvider.IStyledLabelProvider { + static Color gray = new Color(null, 128, 128, 128); + static Color black = new Color(null, 0, 0, 0); + + static Styler ELIGIBLE_NAME = new DefaultStyler(black, false); + static Styler ELIGIBLE_QUALIFIER = new DefaultStyler(gray, true); + static Styler DISABLED = new DefaultStyler(gray, true); + + private static class DefaultStyler extends Styler { + private final Color foreground; + private final boolean italic; + + public DefaultStyler(Color foreground, boolean italic) { + this.foreground = foreground; + this.italic = italic; + } + + public void applyStyles(TextStyle textStyle) { +// ColorRegistry colorRegistry = JFaceResources.getColorRegistry(); + if (foreground != null) { + textStyle.foreground = foreground; + } + if(italic) { + textStyle.font = JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT); + } + } + } + + class LP extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider { + public void update(ViewerCell cell) { + ELIGIBLE_QUALIFIER = DISABLED; + Object element = cell.getElement(); + StyledString styledString = getStyledText(element); + cell.setText(styledString.getString()); + cell.setStyleRanges(styledString.getStyleRanges()); + cell.setImage(getImage(element)); + + super.update(cell); + } + public String getText(Object element) { return getStyledText(element).getString(); } public StyledString getStyledText(Object element) { IBean b = (IBean)element; + Styler nameStyler = eligibleBeans.contains(b) ? ELIGIBLE_NAME : DISABLED; StyledString sb = new StyledString(); if(b.isAlternative()) { - sb.append("@Alternative "); + sb.append("@Alternative ", nameStyler); } if(b.isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)) { - sb.append("@Decorator "); + sb.append("@Decorator ", nameStyler); } if(b.isAnnotationPresent(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)) { - sb.append("@Interceptor "); + sb.append("@Interceptor ", nameStyler); } if(b instanceof IProducer) { - sb.append("@Produces "); - sb.append(b.getBeanClass().getElementName()).append("."); + sb.append("@Produces ", nameStyler); + sb.append(b.getBeanClass().getElementName(), nameStyler).append(".", nameStyler); if(b instanceof IProducerField) { - sb.append(((IProducerField)b).getField().getElementName()); + sb.append(((IProducerField)b).getField().getElementName(), nameStyler); } else { - sb.append(((IProducerMethod)b).getMethod().getElementName()); + sb.append(((IProducerMethod)b).getMethod().getElementName(), nameStyler) + .append("()", nameStyler); } } else { - sb.append(b.getBeanClass().getElementName()); + sb.append(b.getBeanClass().getElementName(), nameStyler); } - String pkg = b.getBeanClass().getPackageFragment().getElementName(); - sb.append(" - ").append(pkg, StyledString.QUALIFIER_STYLER).append(" - "); - return sb; - } - @Override - public Font getFont(Object element) { - IBean b = (IBean)element; - if(eligibleBeans.contains(b)) { - return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT); + 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); + } } - return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT); + return sb; } - - Color gray = new Color(null, 128, 128, 128); - @Override - public Color getForeground(Object element) { - IBean b = (IBean)element; - if(!eligibleBeans.contains(b)) { - return gray; - } - return null; - } - - @Override - public Color getBackground(Object element) { - return null; - } - - @Override - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - @Override - public String getColumnText(Object element, int columnIndex) { - return getText(element); - } - @Override public Image getImage(Object element) { + //TODO return null; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-09-13 21:24:04 UTC (rev 34697) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-09-13 21:25:24 UTC (rev 34698) @@ -44,6 +44,7 @@ dialog.setInjectionPoint(injectionPoint); dialog.create(); dialog.getShell().setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE); + dialog.getShell().setSize(700, 400); dialog.open(); }

14 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2011