Author: akazakov Date: 2010-09-06 12:58:16 -0400 (Mon, 06 Sep 2010) New Revision: 24746 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 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/CDICoreAllTests.java Log: https://jira.jboss.org/browse/JBIDE-2704 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-09-06 16:39:28 UTC (rev 24745) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-09-06 16:58:16 UTC (rev 24746) @@ -26,6 +26,7 @@ Bundle-Vendor: JBoss by Red Hat Export-Package: org.jboss.tools.cdi.core, org.jboss.tools.cdi.core.preferences, + org.jboss.tools.cdi.internal.core.ca, org.jboss.tools.cdi.internal.core.el, org.jboss.tools.cdi.internal.core.impl, org.jboss.tools.cdi.internal.core.impl.definition, 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-06 16:39:28 UTC (rev 24745) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2010-09-06 16:58:16 UTC (rev 24746) @@ -64,15 +64,15 @@ CDICoreNature nature = CDICorePlugin.getCDI(project, false); if(nature!=null) { ICDIProject cdiProject = nature.getDelegate(); - if(CLASS_ELEMENT.equals(parents[0])) { - if(ALTERNATIVES_ELEMENT.equals(parents[1])) { + if(CLASS_ELEMENT.equals(parents[1])) { + if(ALTERNATIVES_ELEMENT.equals(parents[0])) { return getAlternativeBeans(query, cdiProject); - } else if(DECORATORS_ELEMENT.equals(parents[1])) { + } else if(DECORATORS_ELEMENT.equals(parents[0])) { return getDecorators(query, cdiProject); - } else if(INTERCEPTOR_ELEMENT.equals(parents[1])) { + } else if(INTERCEPTOR_ELEMENT.equals(parents[0])) { return getInterceptors(query, cdiProject); } - } else if(STEREOTYPE_ELEMENT.equals(parents[0]) && ALTERNATIVES_ELEMENT.equals(parents[1])) { + } else if(STEREOTYPE_ELEMENT.equals(parents[1]) && ALTERNATIVES_ELEMENT.equals(parents[0])) { return getAlternativeStereotypes(query, cdiProject); } } @@ -87,7 +87,7 @@ for (IBean bean : alternatives) { if(bean instanceof IClassBean) { IType type = bean.getBeanClass(); - addMutchedType(type, value, proposals); + addMatchedType(type, value, proposals); } } return proposals.toArray(new TextProposal[0]); @@ -100,7 +100,7 @@ for (IStereotype stereotype : alternatives) { if(stereotype.isAlternative()) { IType type = stereotype.getSourceType(); - addMutchedType(type, value, proposals); + addMatchedType(type, value, proposals); } } return proposals.toArray(new TextProposal[0]); @@ -112,7 +112,7 @@ IDecorator[] decorators = cdiProject.getDecorators(); for (IDecorator bean : decorators) { IType type = bean.getBeanClass(); - addMutchedType(type, value, proposals); + addMatchedType(type, value, proposals); } return proposals.toArray(new TextProposal[0]); } @@ -123,12 +123,12 @@ IInterceptor[] interceptors = cdiProject.getInterceptors(); for (IInterceptor bean : interceptors) { IType type = bean.getBeanClass(); - addMutchedType(type, value, proposals); + addMatchedType(type, value, proposals); } return proposals.toArray(new TextProposal[0]); } - private void addMutchedType(IType type, String value, List<TextProposal> proposals) { + private void addMatchedType(IType type, String value, List<TextProposal> proposals) { String fullTypeName = type.getFullyQualifiedName(); if(fullTypeName.startsWith(value)) { TextProposal proposal = new TextProposal(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-06 16:39:28 UTC (rev 24745) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-06 16:58:16 UTC (rev 24746) @@ -14,6 +14,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.jboss.tools.cdi.core.test.ca.BeansXmlCATest; import org.jboss.tools.cdi.core.test.tck.AssignabilityOfRawAndParameterizedTypesTest; import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest; import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest; @@ -75,6 +76,7 @@ suite.addTestSuite(InterceptorDefinitionTest.class); suite.addTestSuite(DecoratorDefinitionTest.class); suite.addTestSuite(ObserverMethodResolutionTest.class); + suite.addTestSuite(BeansXmlCATest.class); suite.addTestSuite(DefenitionErrorsValidationTest.class); suite.addTestSuite(DeploymentProblemsValidationTests.class); Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/ca/BeansXmlCATest.java 2010-09-06 16:58:16 UTC (rev 24746) @@ -0,0 +1,42 @@ +/******************************************************************************* + * 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.ca; + +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.internal.core.ca.BeansXmlProcessor; +import org.jboss.tools.jst.web.kb.KbQuery; + +/** + * @author Alexey Kazakov + */ +public class BeansXmlCATest extends TCKTest { + + public void testAlternativeBeans() { + KbQuery query = new KbQuery(); + query.setParentTags(new String[]{"alternatives", "class"}); + query.setValue(""); + + BeansXmlProcessor.getInstance().getProposals(query, tckProject); + } + + public void testAlternativeStereotypes() { + + } + + public void testDecorators() { + + } + + public void testInterceptors() { + + } +} \ 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/ca/BeansXmlCATest.java ___________________________________________________________________ Name: svn:mime-type + text/plain