JBoss Tools SVN: r20894 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-03-17 13:07:24 -0400 (Wed, 17 Mar 2010)
New Revision: 20894
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.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/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6073
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-17 17:03:31 UTC (rev 20893)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-17 17:07:24 UTC (rev 20894)
@@ -80,7 +80,7 @@
*
* @return the resulting set of beans
*/
- Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IParametedType beanType, IAnnotationDeclaration... qualifiers);
+ Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IParametedType beanType, IQualifierDeclaration... qualifiers);
/**
* Returns the set of beans which have the given required type and qualifier
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 2010-03-17 17:03:31 UTC (rev 20893)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-03-17 17:07:24 UTC (rev 20894)
@@ -126,7 +126,7 @@
IQualifier name = getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
Set<IQualifier> result = new HashSet<IQualifier>();
- Set<IQualifierDeclaration> ds = getQualifierDeclarations();
+ Set<IQualifierDeclaration> ds = getQualifierDeclarations(true);
for (IQualifierDeclaration d: ds) {
IQualifier q = d.getQualifier();
if(q != null) result.add(q);
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 2010-03-17 17:03:31 UTC (rev 20893)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-03-17 17:07:24 UTC (rev 20894)
@@ -34,6 +34,7 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanMember;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
@@ -44,8 +45,9 @@
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.BeansXMLDefinition;
-import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.INodeReference;
/**
@@ -167,21 +169,71 @@
synchronized (beans) {
result.addAll(beans);
}
- if(result.size() == 1 || !attemptToResolveAmbiguousNames) {
+ return getResolvedBeans(result, attemptToResolveAmbiguousNames);
+ }
+
+ public Set<IBean> getResolvedBeans(Set<IBean> result, boolean attemptToResolveAmbiguousness) {
+ if(result.size() < 2 || !attemptToResolveAmbiguousness) {
return result;
}
+
+ boolean containsAlternatives = false;
Iterator<IBean> it = result.iterator();
while(it.hasNext()) {
+ IBean b = it.next();
+ if(b.isAlternative()) {
+ //TODO check that alternative is enabled in beans.xml
+ // otherwise it should be excluded from result
+ containsAlternatives = true;
+ break;
+ }
+ }
+
+ if(!containsAlternatives) return result;
+
+ it = result.iterator();
+ while(it.hasNext()) {
IBean bean = it.next();
- if(!bean.isAlternative()) it.remove();
+ if(bean.isAlternative()) continue;
+ if(bean instanceof IProducer && bean instanceof IBeanMember) {
+ IBeanMember p = (IBeanMember)bean;
+ if(p.getClassBean() != null && p.getClassBean().isAlternative()) continue;
+ }
+ it.remove();
}
return result;
}
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
- IParametedType beanType, IAnnotationDeclaration... qualifiers) {
- // TODO
- return Collections.emptySet();
+ IParametedType beanType, IQualifierDeclaration... qualifiers) {
+ Set<IBean> result = new HashSet<IBean>();
+ IParametedType type = beanType;
+ if(type == null) {
+ return result;
+ }
+
+ Set<IQualifierDeclaration> qs = new HashSet<IQualifierDeclaration>();
+ if(qualifiers != null) for (IQualifierDeclaration d: qualifiers) qs.add(d);
+
+ Set<IBean> beans = new HashSet<IBean>();
+ synchronized(allBeans) {
+ beans.addAll(allBeans);
+ }
+ for (IBean b: beans) {
+ Set<IParametedType> types = b.getLegalTypes();
+ if(containsType(types, type)) {
+ try {
+ Set<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
+ if(areMatchingQualifiers(qsb, qs)) {
+ result.add(b);
+ }
+ } catch (CoreException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+ }
+
+ return getResolvedBeans(result, attemptToResolveAmbiguousDependency);
}
public Set<IBean> getBeans(IInjectionPoint injectionPoints) {
@@ -256,6 +308,48 @@
return true;
}
+ /**
+ * Simplified implementation that does not compare members.
+ * @param beanQualifiers
+ * @param injectionQualifiers
+ * @return
+ * @throws CoreException
+ */
+ public static boolean areMatchingQualifiers(Set<? extends IAnnotationDeclaration> beanQualifiers, IType... injectionQualifiers) throws CoreException {
+ if(beanQualifiers == null || beanQualifiers.isEmpty()) {
+ if(injectionQualifiers == null || injectionQualifiers.length == 0) {
+ return true;
+ }
+ }
+
+ TreeSet<String> injectionKeys = new TreeSet<String>();
+ if(injectionQualifiers != null) for (IType d: injectionQualifiers) {
+ injectionKeys.add(d.getFullyQualifiedName());
+ }
+
+ if(injectionKeys.contains(CDIConstants.ANY_QUALIFIER_TYPE_NAME)) {
+ return true;
+ }
+ if(injectionKeys.isEmpty()) {
+ injectionKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
+ }
+
+ TreeSet<String> beanKeys = new TreeSet<String>();
+ if(beanQualifiers == null || beanQualifiers.isEmpty()) {
+ beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
+ } else for (IAnnotationDeclaration d: beanQualifiers) {
+ beanKeys.add(d.getType().getFullyQualifiedName());
+ }
+ if(beanKeys.size() == 1 && beanKeys.iterator().next().startsWith(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) {
+ beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
+ }
+
+ for(String k: injectionKeys) {
+ if(!beanKeys.contains(k)) return false;
+ }
+ return true;
+ }
+
public static String getQualifierDeclarationKey(IAnnotationDeclaration d) throws CoreException {
IType type = d.getType();
IMethod[] ms = type.getMethods();
@@ -694,8 +788,31 @@
*/
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
IParametedType beanType, IType... qualifiers) {
- // TODO
- return Collections.emptySet();
+ Set<IBean> result = new HashSet<IBean>();
+ IParametedType type = beanType;
+ if(type == null) {
+ return result;
+ }
+
+ Set<IBean> beans = new HashSet<IBean>();
+ synchronized(allBeans) {
+ beans.addAll(allBeans);
+ }
+ for (IBean b: beans) {
+ Set<IParametedType> types = b.getLegalTypes();
+ if(containsType(types, type)) {
+ try {
+ Set<IQualifierDeclaration> qsb = b.getQualifierDeclarations(true);
+ if(areMatchingQualifiers(qsb, qualifiers)) {
+ result.add(b);
+ }
+ } catch (CoreException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+ }
+
+ return getResolvedBeans(result, attemptToResolveAmbiguousDependency);
}
/*
@@ -705,7 +822,26 @@
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
String fullyQualifiedBeanType,
String... fullyQualifiedQualifiersTypes) {
+ IType type = null;
+ try {
+ type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(getNature().getProject()), fullyQualifiedBeanType);
+ } catch (JavaModelException e) {
+ //ignore
+ }
+ if(type == null) {
+ return Collections.emptySet();
+ }
+ IParametedType beanType = getNature().getTypeFactory().newParametedType(type);
+ List<IType> qualifiers = new ArrayList<IType>();
+ if(fullyQualifiedQualifiersTypes != null) for (String s : fullyQualifiedQualifiersTypes) {
+ try {
+ type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(getNature().getProject()), s);
+ } catch (JavaModelException e) {
+ //ignore
+ }
+ if(type != null) qualifiers.add(type);
+ }
- return Collections.emptySet();
+ return getBeans(attemptToResolveAmbiguousDependency, beanType, qualifiers.toArray(new IType[0]));
}
}
\ 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 2010-03-17 17:03:31 UTC (rev 20893)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-03-17 17:07:24 UTC (rev 20894)
@@ -409,7 +409,7 @@
protected Set<IQualifierDeclaration> getInheritedQualifierDeclarations() {
if(superClassBean == null) return Collections.emptySet();
Set<IQualifierDeclaration> result = new HashSet<IQualifierDeclaration>();
- Set<IQualifierDeclaration> ds = superClassBean.getQualifierDeclarations();
+ Set<IQualifierDeclaration> ds = superClassBean.getQualifierDeclarations(true);
for (IQualifierDeclaration d: ds) {
if(d.getQualifier() != null && d.getQualifier().getInheritedDeclaration() != null) {
result.add(d);
16 years, 1 month
JBoss Tools SVN: r20893 - trunk/smooks/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-17 13:03:31 -0400 (Wed, 17 Mar 2010)
New Revision: 20893
Modified:
trunk/smooks/docs/reference/en-US/references.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-821 -the info about Auto Layout and other popup options was added to smooks-doc.</p>
</body></html>
Modified: trunk/smooks/docs/reference/en-US/references.xml
===================================================================
--- trunk/smooks/docs/reference/en-US/references.xml 2010-03-17 16:13:34 UTC (rev 20892)
+++ trunk/smooks/docs/reference/en-US/references.xml 2010-03-17 17:03:31 UTC (rev 20893)
@@ -348,7 +348,106 @@
</figure>
<para>This graphical editor allows you to perform drag&drop operation with the nodes of transformed data to map the source data to target data.
When you save the changes in the graphical editor the correct Smooks configuration file content will be generated. </para>
-
+ <para>Using the popup menu in the <emphasis>Selected Task Details</emphasis> section you
+ can manage the diagram elements on the canvas. </para>
+ <para>The descriptions of the popup menu options are in the following table.</para>
+ <table id="popup">
+ <title>Popup menu. Selected Task Details section.</title>
+ <tgroup cols="3">
+ <colspec colnum="1" align="left" colwidth="1*"/>
+ <colspec colnum="2" align="left" colwidth="3*"/>
+ <colspec colnum="3" align="left" colwidth="1*"/>
+
+ <thead>
+ <row>
+ <entry>Option</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Add</entry>
+ <entry>Select one of the following tasks:
+ <itemizedlist>
+ <listitem><para><emphasis>Java Class</emphasis> - adds bean context item to the config file.
+ This option is available when no elements are selected and a user right click the canvas.
+ </para></listitem>
+ <listitem><para><emphasis>Expession Binding</emphasis> - adds expression based
+ binding to selected java binding element.</para></listitem>
+ <listitem><para><emphasis>Value Binding</emphasis> - adds Value binding (<jb:value>)
+ to the selected java binding element.</para></listitem>
+ <listitem><para><emphasis>Bean Binding</emphasis> - adds Wiring binding (<jb:wiring>)
+ to the selected java binding element.</para></listitem>
+ </itemizedlist>
+ </entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>Undo</entry>
+ <entry>By this option you can revert the changes made at the previous step.
+ </entry>
+ <entry></entry>
+
+ </row>
+ <row>
+ <entry>Redo</entry>
+ <entry>By this option you can redo the changes made at the previous step.
+ </entry>
+ <entry></entry>
+
+ </row>
+ <row>
+ <entry>Delete</entry>
+ <entry>This option is available only if you select some element on the canvas.
+ Click this option if you want to delete the element from it.
+ </entry>
+ <entry></entry>
+
+ </row>
+ <row>
+ <entry>Auto Layout</entry>
+ <entry>Sets the default layout of the elements on the canvas.</entry>
+ <entry></entry>
+
+ </row>
+ <row>
+ <entry>Properties</entry>
+ <entry>Click this option if you want to add <emphasis>Properties view</emphasis>
+ to the current perspective.
+ The just opened <emphasis>Properties view</emphasis>
+ will automatically reflect the properties of the selected
+ diagram element.
+ </entry>
+ <entry></entry>
+ </row>
+
+ <row>
+ <entry>Input Methods</entry>
+ <entry>Choose one of the following methods:
+ <itemizedlist>
+ <listitem><para>System</para></listitem>
+ <listitem><para>Simple</para></listitem>
+ <listitem><para>Amharic(EZ+)</para></listitem>
+ <listitem><para>Cedilla</para></listitem>
+ <listitem><para>Cyrillic</para></listitem>
+ <listitem><para>Inuktitut</para></listitem>
+ <listitem><para>IPA</para></listitem>
+ <listitem><para>Multipress</para></listitem>
+ <listitem><para>SCIM Bridge Input Method</para></listitem>
+ <listitem><para>SCIM Input Method</para></listitem>
+ <listitem><para>Thai-Lio</para></listitem>
+ <listitem><para>Tigrigna-Eritrean(EZ+)</para></listitem>
+ <listitem><para>Tigrigna-Ethiopian(EZ+)</para></listitem>
+ <listitem><para>Vietnamese</para></listitem>
+ <listitem><para>X input Method</para></listitem>
+ </itemizedlist>
+ </entry>
+ <entry>System</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
</section>
<section><title>Selected Task Details section for Template Task.</title>
<para>Selected Task Details section for this task is presented by the graf,
@@ -362,6 +461,8 @@
</imageobject>
</mediaobject>
</figure>
+ <para>Popup menu similar to the one in <link linkend="popup">Selected Task Details section
+ for Java Mapping Task</link> is also available here.</para>
</section>
</section>
16 years, 1 month
JBoss Tools SVN: r20891 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/icons/images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-03-17 11:51:49 -0400 (Wed, 17 Mar 2010)
New Revision: 20891
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/generator.gif
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/primary_key.gif
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5813
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2010-03-17 14:52:42 UTC (rev 20890)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 2010-03-17 15:51:49 UTC (rev 20891)
@@ -130,5 +130,7 @@
public static final String PINDOWN = "PINDOWN"; //$NON-NLS-1$
public static final String PINDOWN_PATH = "images/pindown.png"; //$NON-NLS-1$
+ public static final String PRIMARY_KEY = "PRIMARY_KEY";//$NON-NLS-1$
+ public static final String GENERATOR = "GENERATOR";//$NON-NLS-1$
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2010-03-17 14:52:42 UTC (rev 20890)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 2010-03-17 15:51:49 UTC (rev 20891)
@@ -77,7 +77,8 @@
declareRegistryImage(ERROR, "images/error.gif"); //$NON-NLS-1$
declareRegistryImage(PINUP, PINUP_PATH);
declareRegistryImage(PINDOWN, PINDOWN_PATH);
-
+ declareRegistryImage(PRIMARY_KEY, "images/primary_key.gif"); //$NON-NLS-1$
+ declareRegistryImage(GENERATOR, "images/generator.gif"); //$NON-NLS-1$
}
protected abstract void declareRegistryImage(String key, String path);
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/generator.gif
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/generator.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/primary_key.gif
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/primary_key.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java 2010-03-17 14:52:42 UTC (rev 20890)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java 2010-03-17 15:51:49 UTC (rev 20891)
@@ -85,6 +85,10 @@
return EclipseImages.getImage(ImageConstants.COLUMN);
} else if(element instanceof IRevEngParameter) {
return EclipseImages.getImage(ImageConstants.PARAMETER);
+ } else if(element instanceof IRevEngPrimaryKey) {
+ return EclipseImages.getImage(ImageConstants.PRIMARY_KEY);
+ } else if (element instanceof IRevEngGenerator){
+ return EclipseImages.getImage(ImageConstants.GENERATOR);
}
return null;
}
16 years, 1 month
JBoss Tools SVN: r20890 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-17 10:52:42 -0400 (Wed, 17 Mar 2010)
New Revision: 20890
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2010-03-17 14:42:39 UTC (rev 20889)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2010-03-17 14:52:42 UTC (rev 20890)
@@ -13,9 +13,9 @@
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -30,7 +30,7 @@
*/
public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.BorderCollieLocal");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.BorderCollieLocal");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -46,7 +46,7 @@
*/
public void testQualifierNotDeclaredInheritedIsNotInherited() throws JavaModelException {
IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.TameSkinnyHairlessCatLocal");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.TameSkinnyHairlessCatLocal");
Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
assertTrue("Wrong number of beans.", beans.isEmpty());
}
@@ -57,7 +57,7 @@
*/
public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnglishBorderCollieLocal");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnglishBorderCollieLocal");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -73,7 +73,7 @@
*/
public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException {
IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.FamousCatLocal");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.FamousCatLocal");
Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
assertTrue("Wrong number of beans.", beans.isEmpty());
}
16 years, 1 month
JBoss Tools SVN: r20889 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-17 10:42:39 -0400 (Wed, 17 Mar 2010)
New Revision: 20889
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-17 14:28:17 UTC (rev 20888)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-17 14:42:39 UTC (rev 20889)
@@ -14,6 +14,7 @@
import junit.framework.TestSuite;
import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ValidationTest;
@@ -28,6 +29,7 @@
suite.addTestSuite(BeanDefinitionTest.class);
suite.addTestSuite(NameDefinitionTest.class);
suite.addTestSuite(QualifierDefinitionTest.class);
+ suite.addTestSuite(EnterpriseQualifierDefinitionTest.class);
suite.addTestSuite(ValidationTest.class);
return suite;
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java 2010-03-17 14:42:39 UTC (rev 20889)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class EnterpriseQualifierDefinitionTest extends TCKTest {
+
+ /**
+ * section 4.1 id)
+ * @throws CoreException
+ */
+ public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
+ IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
+ IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.BorderCollieLocal");
+ Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
+ assertContainsQualifier(bean, hairy);
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
+ }
+
+ /**
+ * section 4.1 ala)
+ * @throws JavaModelException
+ */
+ public void testQualifierNotDeclaredInheritedIsNotInherited() throws JavaModelException {
+ IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
+ IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.TameSkinnyHairlessCatLocal");
+ Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
+ assertTrue("Wrong number of beans.", beans.isEmpty());
+ }
+
+ /**
+ * section 4.1 ap)
+ * @throws CoreException
+ */
+ public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
+ IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Hairy");
+ IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnglishBorderCollieLocal");
+ Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
+ assertContainsQualifier(bean, hairy);
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
+ }
+
+ /**
+ * section 4.1 apa)
+ * @throws JavaModelException
+ */
+ public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException {
+ IQualifierDeclaration skinny = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.Skinny");
+ IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.FamousCatLocal");
+ Set<IBean> beans = cdiProject.getBeans(true, type, skinny);
+ assertTrue("Wrong number of beans.", beans.isEmpty());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/EnterpriseQualifierDefinitionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 1 month
JBoss Tools SVN: r20888 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-03-17 10:28:17 -0400 (Wed, 17 Mar 2010)
New Revision: 20888
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6073
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 14:27:32 UTC (rev 20887)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 14:28:17 UTC (rev 20888)
@@ -17,6 +17,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducerMethod;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -99,7 +100,7 @@
public void testMultipleQualifiers() throws JavaModelException {
IQualifierDeclaration chunky = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky");
IQualifierDeclaration whitefish = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod");
Set<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -146,7 +147,7 @@
*/
public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -178,7 +179,7 @@
*/
public void testQualifierDeclaredInheritedIsBlockedByIntermediateClass() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/ClippedBorderCollie.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
@@ -194,7 +195,7 @@
*/
public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
- IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie");
+ IParametedType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 14:27:32 UTC (rev 20887)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 14:28:17 UTC (rev 20888)
@@ -73,8 +73,9 @@
return tckProject;
}
- protected IType getType(String name) throws JavaModelException {
- return EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name);
+ protected IParametedType getType(String name) throws JavaModelException {
+ IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), name);
+ return type == null ? null : cdiProject.getNature().getTypeFactory().newParametedType(type);
}
public static IProject findTestProject() {
@@ -107,7 +108,7 @@
}
protected Set<IBean> getBeans(String typeName) throws JavaModelException {
- IType type = getType(typeName);
+ IParametedType type = getType(typeName);
assertNotNull("Can't find " + typeName + " type.", type);
Set<IBean> beans = cdiProject.getBeans(true, type, new IType[0]);
assertNotNull("There is no eny beans with " + typeName + " type", beans);
@@ -119,10 +120,10 @@
Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
IBean bean = beans.iterator().next();
Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
- IType type = getType(annotationTypeName);
+ IParametedType type = getType(annotationTypeName);
for (IQualifierDeclaration declaration : declarations) {
IAnnotation annotation = declaration.getDeclaration();
- if(type.getElementName().equals(annotation.getElementName())) {
+ if(type.getType().getElementName().equals(annotation.getElementName())) {
return declaration;
}
}
@@ -135,8 +136,8 @@
Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
IBean bean = beans.iterator().next();
final IType beanClass = bean.getBeanClass();
- final IType type = getType(annotationTypeName);
- final IAnnotation annotation = beanClass.getAnnotation(type.getElementName());
+ final IParametedType type = getType(annotationTypeName);
+ final IAnnotation annotation = beanClass.getAnnotation(type.getType().getElementName());
IAnnotationDeclaration annotationDeclaration = new IAnnotationDeclaration() {
public IAnnotation getDeclaration() {
return annotation;
@@ -147,7 +148,7 @@
}
public IType getType() {
- return type;
+ return type.getType();
}
public int getLength() {
16 years, 1 month
JBoss Tools SVN: r20887 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-03-17 10:27:32 -0400 (Wed, 17 Mar 2010)
New Revision: 20887
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.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/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/ParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6073
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -80,7 +80,7 @@
*
* @return the resulting set of beans
*/
- Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IType beanType, IAnnotationDeclaration... qualifiers);
+ Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IParametedType beanType, IAnnotationDeclaration... qualifiers);
/**
* Returns the set of beans which have the given required type and qualifier
@@ -102,7 +102,7 @@
*
* @return the resulting set of beans
*/
- Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IType beanType, IType... qualifiers);
+ Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IParametedType beanType, IType... qualifiers);
/**
* Returns the set of beans which have the given required type and qualifier
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 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -94,17 +95,31 @@
}
public Set<IQualifierDeclaration> getQualifierDeclarations(boolean includeInherited) {
- // TODO take into account includeInherited parameter.
Set<IQualifierDeclaration> result = new HashSet<IQualifierDeclaration>();
+ Set<IQualifier> qs = new HashSet<IQualifier>();
for(AnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
if(k == AnnotationDefinition.QUALIFIER) {
- result.add((IQualifierDeclaration)a);
+ IQualifierDeclaration q = (IQualifierDeclaration)a;
+ result.add(q);
+ if(q.getQualifier() != null) qs.add(q.getQualifier());
}
}
+ if(includeInherited) {
+ Set<IQualifierDeclaration> ds = getInheritedQualifierDeclarations();
+ for (IQualifierDeclaration d : ds) {
+ if (d.getQualifier() != null && !qs.contains(d.getQualifier())) {
+ result.add(d);
+ }
+ }
+ }
return result;
}
+ protected Set<IQualifierDeclaration> getInheritedQualifierDeclarations() {
+ return Collections.emptySet();
+ }
+
public Set<IQualifier> getQualifiers() {
IQualifier any = getCDIProject().getQualifier(CDIConstants.ANY_QUALIFIER_TYPE_NAME);
IQualifier def = getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
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 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -44,6 +44,7 @@
import org.jboss.tools.cdi.core.IStereotype;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.BeansXMLDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.common.text.INodeReference;
@@ -178,7 +179,7 @@
}
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
- IType beanType, IAnnotationDeclaration... qualifiers) {
+ IParametedType beanType, IAnnotationDeclaration... qualifiers) {
// TODO
return Collections.emptySet();
}
@@ -692,7 +693,7 @@
* @see org.jboss.tools.cdi.core.IBeanManager#getBeans(boolean, org.eclipse.jdt.core.IType, org.eclipse.jdt.core.IType[])
*/
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
- IType beanType, IType... qualifiers) {
+ IParametedType beanType, IType... qualifiers) {
// TODO
return Collections.emptySet();
}
@@ -704,7 +705,7 @@
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency,
String fullyQualifiedBeanType,
String... fullyQualifiedQualifiersTypes) {
- // TODO
+
return Collections.emptySet();
}
}
\ 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 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -12,8 +12,10 @@
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -32,6 +34,7 @@
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.core.IScopeDeclaration;
import org.jboss.tools.cdi.core.IStereotype;
@@ -402,4 +405,17 @@
scope = getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME);
}
}
+
+ protected Set<IQualifierDeclaration> getInheritedQualifierDeclarations() {
+ if(superClassBean == null) return Collections.emptySet();
+ Set<IQualifierDeclaration> result = new HashSet<IQualifierDeclaration>();
+ Set<IQualifierDeclaration> ds = superClassBean.getQualifierDeclarations();
+ for (IQualifierDeclaration d: ds) {
+ if(d.getQualifier() != null && d.getQualifier().getInheritedDeclaration() != null) {
+ result.add(d);
+ }
+ }
+ return result;
+ }
+
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -96,8 +96,19 @@
if(signature != null && signature.equals(other.signature)) {
return true;
}
- //TODO
- return false;
+ if(type == null || !type.equals(other.type)) {
+ return false;
+ }
+ if(parameterTypes.size() != other.parameterTypes.size()) {
+ return false;
+ }
+ for (int i = 0; i < parameterTypes.size(); i++) {
+ if(!parameterTypes.get(i).equals(other.parameterTypes.get(i))) {
+ return false;
+ }
+ }
+
+ return true;
}
void buildInheritance() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -61,17 +61,8 @@
this.type = contextType;
super.init(contextType, context);
qualifiedName = getType().getFullyQualifiedName();
- parametedType = new ParametedType();
+ parametedType = context.getProject().getDelegate().getNature().getTypeFactory().newParametedType(type);
if(type != null && !type.isBinary()) {
- ISourceRange r = type.getNameRange();
- if(r != null) {
- parametedType = new TypeDeclaration(parametedType, r.getOffset(), r.getLength());
- }
- }
- parametedType.setFactory(context.getProject().getDelegate().getNature().getTypeFactory());
- parametedType.setType(this.type);
- parametedType.setSignature("Q" + qualifiedName + ";");
- if(type != null && !type.isBinary()) {
parametedType.setPositionProvider(new PositionProviderImpl());
parametedType.getInheritedTypes();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-03-17 13:57:43 UTC (rev 20886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-03-17 14:27:32 UTC (rev 20887)
@@ -4,14 +4,36 @@
import java.util.Map;
import java.util.StringTokenizer;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
public class ParametedTypeFactory {
Map<String, ParametedType> cache = new HashMap<String, ParametedType>();
+ public ParametedType newParametedType(IType type) {
+ ParametedType parametedType = new ParametedType();
+ if(type != null && !type.isBinary()) {
+ ISourceRange r = null;
+ try {
+ r = type.getNameRange();
+ } catch (CoreException e) {
+ //ignore
+ }
+ if(r != null) {
+ parametedType = new TypeDeclaration(parametedType, r.getOffset(), r.getLength());
+ }
+ }
+ parametedType.setFactory(this);
+ parametedType.setType(type);
+ if(type != null) parametedType.setSignature("Q" + type.getFullyQualifiedName() + ";");
+ return parametedType;
+ }
+
public ParametedType getParametedType(IType context, String typeSignature) throws JavaModelException {
if(typeSignature == null) return null;
String key = context == null || context.isBinary() || "QObject;".equals(typeSignature) ? typeSignature : context.getFullyQualifiedName() + "+" + typeSignature;
16 years, 1 month
JBoss Tools SVN: r20886 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-17 09:57:43 -0400 (Wed, 17 Mar 2010)
New Revision: 20886
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 13:53:36 UTC (rev 20885)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 13:57:43 UTC (rev 20886)
@@ -203,4 +203,20 @@
assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
}
+
+ /**
+ * section 4.1 aga)
+ * @throws JavaModelException
+ */
+ public void testQualifierNotDeclaredInheritedIsNotIndirectlyInherited() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.MiniatureShetlandPony");
+ assertEquals("Wrong number of beans.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals(
+ "Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie type.",
+ 2, qualifiers.size());
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Default");
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
+ }
}
\ No newline at end of file
16 years, 1 month
JBoss Tools SVN: r20885 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-17 09:53:36 -0400 (Wed, 17 Mar 2010)
New Revision: 20885
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
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 2010-03-17 13:23:17 UTC (rev 20884)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-03-17 13:53:36 UTC (rev 20885)
@@ -255,7 +255,7 @@
return true;
}
- static String getQualifierDeclarationKey(IAnnotationDeclaration d) throws CoreException {
+ public static String getQualifierDeclarationKey(IAnnotationDeclaration d) throws CoreException {
IType type = d.getType();
IMethod[] ms = type.getMethods();
StringBuffer result = new StringBuffer();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 13:23:17 UTC (rev 20884)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-17 13:53:36 UTC (rev 20885)
@@ -12,9 +12,9 @@
import java.util.Set;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IProducerMethod;
@@ -76,14 +76,16 @@
/**
* section 2.3.3 a)
* section 3.1.3 be)
+ * @throws CoreException
*/
- public void testQualifiersDeclaredInJava() {
- Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Cat", "org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier");
- assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Cat type and org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier qualifier.", 1, beans.size());
+ public void testQualifiersDeclaredInJava() throws CoreException {
+ IQualifierDeclaration synchronous = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cat.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous");
+ Set<IBean> beans = cdiProject.getBeans(true, "org.jboss.jsr299.tck.tests.definition.qualifier.Cat", "org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous");
+ assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Cat type and org.jboss.jsr299.tck.tests.definition.qualifier.Synchronous qualifier.", 1, beans.size());
IBean bean = beans.iterator().next();
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers.", 2, qualifiers.size());
- assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.SynchronousQualifier");
+ assertContainsQualifier(bean, synchronous);
Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
assertEquals("Wrong number of qualifier declarations.", 1, declarations.size());
// TODO use correct start position instead of 0.
@@ -95,8 +97,8 @@
* @throws JavaModelException
*/
public void testMultipleQualifiers() throws JavaModelException {
- IAnnotationDeclaration chunky = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky");
- IAnnotationDeclaration whitefish = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish");
+ IQualifierDeclaration chunky = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Chunky");
+ IQualifierDeclaration whitefish = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/Cod.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Whitefish");
IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.Cod");
Set<IBean> beans = cdiProject.getBeans(true, type, chunky, whitefish);
assertEquals("Wrong number of beans.", 1, beans.size());
@@ -140,17 +142,17 @@
/**
* section 4.1 aa)
- * @throws JavaModelException
+ * @throws CoreException
*/
- public void testQualifierDeclaredInheritedIsInherited() throws JavaModelException {
- IAnnotationDeclaration hairy = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ public void testQualifierDeclaredInheritedIsInherited() throws CoreException {
+ IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BorderCollie type.", 2, qualifiers.size());
- assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
}
@@ -172,39 +174,33 @@
/**
* section 4.1 aa)
- * @throws JavaModelException
+ * @throws CoreException
*/
- public void testQualifierDeclaredInheritedIsBlockedByIntermediateClass() throws JavaModelException {
- IAnnotationDeclaration hairy = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/ClippedBorderCollie.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ public void testQualifierDeclaredInheritedIsBlockedByIntermediateClass() throws CoreException {
+ IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/ClippedBorderCollie.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.ClippedBorderCollie type.", 2, qualifiers.size());
- assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
}
/**
* section 4.1 ag)
- * @throws JavaModelException
+ * @throws CoreException
*/
- public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws JavaModelException {
- IAnnotationDeclaration hairy = getAnnotationDeclarationFromBean("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ public void testQualifierDeclaredInheritedIsIndirectlyInherited() throws CoreException {
+ IQualifierDeclaration hairy = getQualifierDeclarationFromBeanClass("JavaSource/org/jboss/jsr299/tck/tests/definition/qualifier/LongHairedDog.java", "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
IType type = getType("org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie");
Set<IBean> beans = cdiProject.getBeans(true, type, hairy);
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
Set<IQualifier> qualifiers = bean.getQualifiers();
assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.EnglishBorderCollie type.", 2, qualifiers.size());
- assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.Hairy");
+ assertContainsQualifier(bean, hairy);
assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
-
-// Set<? extends Annotation> bindings = getBeans(
-// EnglishBorderCollie.class, new HairyQualifier(false))
-// .iterator().next().getQualifiers();
-// assert bindings.size() == 2;
-// assert bindings.contains(new HairyQualifier(false));
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 13:23:17 UTC (rev 20884)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-17 13:53:36 UTC (rev 20885)
@@ -10,6 +10,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
@@ -23,6 +24,8 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -111,10 +114,26 @@
return beans;
}
- protected IAnnotationDeclaration getAnnotationDeclarationFromBean(String beanClassFilePath, String annotationTypeName) throws JavaModelException {
+ protected IQualifierDeclaration getQualifierDeclarationFromBeanClass(String beanClassFilePath, String annotationTypeName) throws JavaModelException {
IFile file = tckProject.getFile(beanClassFilePath);
Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
IBean bean = beans.iterator().next();
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations();
+ IType type = getType(annotationTypeName);
+ for (IQualifierDeclaration declaration : declarations) {
+ IAnnotation annotation = declaration.getDeclaration();
+ if(type.getElementName().equals(annotation.getElementName())) {
+ return declaration;
+ }
+ }
+ fail("Can't find " + annotationTypeName + " qualifier in " + beanClassFilePath + " bean.");
+ return null;
+ }
+
+ protected IAnnotationDeclaration createAnnotationDeclarationForAnnotation(String beanClassFilePath, String annotationTypeName) throws JavaModelException {
+ IFile file = tckProject.getFile(beanClassFilePath);
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ IBean bean = beans.iterator().next();
final IType beanClass = bean.getBeanClass();
final IType type = getType(annotationTypeName);
final IAnnotation annotation = beanClass.getAnnotation(type.getElementName());
@@ -195,6 +214,29 @@
fail(bean.getResource().getFullPath() + " bean " + allTypes.toString() + " should have " + typeName + " type.");
}
+ public static void assertContainsQualifier(IBean bean, IQualifierDeclaration declaration) throws CoreException {
+ String typeName = declaration.getQualifier().getSourceType().getFullyQualifiedName();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ StringBuffer allTypes = new StringBuffer("[");
+ boolean found = false;
+ for (IQualifier qualifier : qualifiers) {
+ allTypes.append(" ").append(qualifier.getSourceType().getFullyQualifiedName()).append(";");
+ if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName())) {
+ found = true;
+ break;
+ }
+ }
+ allTypes.append("]");
+ assertTrue(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier with " + typeName + " type.", found);
+ Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(true);
+ for (IQualifierDeclaration d : declarations) {
+ if(CDIProject.getQualifierDeclarationKey(d).equals(CDIProject.getQualifierDeclarationKey(declaration)) ) {
+ return;
+ }
+ }
+ fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier declaration with " + typeName + " type.");
+ }
+
public static void assertContainsQualifierType(IBean bean, String typeName) {
Set<IQualifier> qualifiers = bean.getQualifiers();
StringBuffer allTypes = new StringBuffer("[");
16 years, 1 month