Author: akazakov Date: 2010-09-08 06:13:45 -0400 (Wed, 08 Sep 2010) New Revision: 24809 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java Log: https://jira.jboss.org/browse/JBIDE-2704 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2010-09-08 10:07:44 UTC (rev 24808) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2010-09-08 10:13:45 UTC (rev 24809) @@ -64,15 +64,17 @@ CDICoreNature nature = CDICorePlugin.getCDI(project, false); if(nature!=null) { ICDIProject cdiProject = nature.getDelegate(); - if(CLASS_ELEMENT.equals(parents[1])) { - if(ALTERNATIVES_ELEMENT.equals(parents[0])) { + int lastIndex = parents.length-1; + int firstIndex = parents.length-2; + if(CLASS_ELEMENT.equals(parents[lastIndex])) { + if(ALTERNATIVES_ELEMENT.equals(parents[firstIndex])) { return getAlternativeBeans(query, cdiProject); - } else if(DECORATORS_ELEMENT.equals(parents[0])) { + } else if(DECORATORS_ELEMENT.equals(parents[firstIndex])) { return getDecorators(query, cdiProject); - } else if(INTERCEPTOR_ELEMENT.equals(parents[0])) { + } else if(INTERCEPTOR_ELEMENT.equals(parents[firstIndex])) { return getInterceptors(query, cdiProject); } - } else if(STEREOTYPE_ELEMENT.equals(parents[1]) && ALTERNATIVES_ELEMENT.equals(parents[0])) { + } else if(STEREOTYPE_ELEMENT.equals(parents[lastIndex]) && ALTERNATIVES_ELEMENT.equals(parents[firstIndex])) { return getAlternativeStereotypes(query, cdiProject); } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java 2010-09-08 10:07:44 UTC (rev 24808) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java 2010-09-08 10:13:45 UTC (rev 24809) @@ -33,7 +33,7 @@ public void testEmptyList() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"alternatives", "class"}); + query.setParentTags(new String[]{"beans", "alternatives", "class"}); query.setValue(" test "); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); assertEquals("The list of proposals should be empty.", 0, proposals.length); @@ -41,7 +41,7 @@ public void testAllAlternativeBeans() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"alternatives", "class"}); + query.setParentTags(new String[]{"beans", "alternatives", "class"}); query.setValue(""); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -61,7 +61,7 @@ public void testSomeAlternativeBeans() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"alternatives", "class"}); + query.setParentTags(new String[]{"beans", "alternatives", "class"}); query.setValue("org.jboss.jsr299.tck.tests.jbt.ca."); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -71,7 +71,7 @@ public void testAllAlternativeStereotypes() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"alternatives", "stereotype"}); + query.setParentTags(new String[]{"beans", "alternatives", "stereotype"}); query.setValue(" "); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -91,7 +91,7 @@ public void testSomeAlternativeStereotypes() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"alternatives", "stereotype"}); + query.setParentTags(new String[]{"beans", "alternatives", "stereotype"}); query.setValue(" org.jboss.jsr299.tck.tests.jbt.ca."); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -101,7 +101,7 @@ public void testAllDecorators() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"decorators", "class"}); + query.setParentTags(new String[]{"beans", "decorators", "class"}); query.setValue(""); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -117,7 +117,7 @@ public void testSomeDecorators() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"decorators", "class"}); + query.setParentTags(new String[]{"beans", "decorators", "class"}); query.setValue("org.jboss.jsr299.tck.tests.jbt.ca."); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -127,7 +127,7 @@ public void testAllInterceptors() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"interceptors", "class"}); + query.setParentTags(new String[]{"beans", "interceptors", "class"}); query.setValue(""); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject); @@ -143,7 +143,7 @@ public void testSomeInterceptors() { KbQuery query = new KbQuery(); - query.setParentTags(new String[]{"interceptors", "class"}); + query.setParentTags(new String[]{"beans", "interceptors", "class"}); query.setValue("org.jboss.jsr299.tck.tests.jbt.ca."); TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(query, tckProject);