Author: dazarov Date: 2011-08-23 21:07:32 -0400 (Tue, 23 Aug 2011) New Revision: 34199 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 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/MarkerResolutionUtils.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/AddQualifiersToBeanWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.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.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java Log: https://issues.jboss.org/browse/JBIDE-9476 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-08-24 01:07:32 UTC (rev 34199) @@ -42,4 +42,5 @@ org.jboss.tools.cdi.ui.marker, org.jboss.tools.cdi.ui.preferences, org.jboss.tools.cdi.ui.search, - org.jboss.tools.cdi.ui.wizard + org.jboss.tools.cdi.ui.wizard, + org.jboss.tools.cdi.ui.wizard.xpl 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-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -30,6 +30,7 @@ import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite; +import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; /** * @author Daniel Azarov @@ -65,7 +66,7 @@ AddQualifiersToBeanWizard wizard = new AddQualifiersToBeanWizard(injectionPoint, beans, selectedBean); WizardDialog dialog = new WizardDialog(shell, wizard); - List<IQualifier> deployed; + List<ValuedQualifier> deployed; if(test){ dialog.setBlockOnOpen(false); @@ -78,7 +79,7 @@ for(IQualifier qualifier : qualifiers){ if(wizard.checkBeans()) break; - wizard.deploy(qualifier); + wizard.deploy(new ValuedQualifier(qualifier)); } deployed = wizard.getDeployedQualifiers(); wizard.performCancel(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -167,6 +167,38 @@ addAnnotation(qualifiedName, compilationUnit, element, ""); } + public static void updateAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ + IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); + if(workingCopyElement == null) + return; + + if(!(workingCopyElement instanceof IMember)) + return; + + IMember workingCopyMember = (IMember) workingCopyElement; + + IAnnotation annotation = findAnnotation(workingCopyMember, qualifiedName); + if(annotation == null || !annotation.exists()) + return; + + boolean duplicateShortName = addImport(qualifiedName, compilationUnit); + + IBuffer buffer = compilationUnit.getBuffer(); + String shortName = getShortName(qualifiedName); + + if(duplicateShortName) + shortName = qualifiedName; + + String str = AT+shortName+params; + + buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str); + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); if(workingCopyElement == null) @@ -241,11 +273,9 @@ IAnnotation annotation = findAnnotation(element, qualifiedName); if(annotation == null || !annotation.exists()) return; - + boolean duplicateShortName = addImport(qualifiedName, compilationUnit); - //String lineDelim = SPACE; - IBuffer buffer = compilationUnit.getBuffer(); String shortName = getShortName(qualifiedName); @@ -444,7 +474,7 @@ } } - public static void addQualifiersToBean(List<IQualifier> deployed, IBean bean){ + public static void addQualifiersToBean(List<ValuedQualifier> deployed, IBean bean){ IFile file = (IFile)bean.getBeanClass().getResource(); IJavaElement beanElement = null; if(bean instanceof IBeanField){ @@ -459,19 +489,24 @@ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); - for(IQualifierDeclaration declaration : bean.getQualifierDeclarations()){ IQualifier qualifier = declaration.getQualifier(); String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); - if(!deployed.contains(qualifier)){ + if(!isQualifierNeeded(deployed, qualifier)){ deleteAnnotation(qualifierName, compilationUnit, beanElement); } } - for(IQualifier qualifier : deployed){ - String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); + for(ValuedQualifier vq : deployed){ + String qualifierName = vq.getQualifier().getSourceType().getFullyQualifiedName(); + String value = vq.getValue(); + + if(!value.isEmpty()) + value = "(\""+value+"\")"; + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - MarkerResolutionUtils.addAnnotation(qualifierName, compilationUnit, beanElement); + MarkerResolutionUtils.addAnnotation(qualifierName, compilationUnit, beanElement, value); + MarkerResolutionUtils.updateAnnotation(qualifierName, compilationUnit, beanElement, value); } } @@ -483,6 +518,14 @@ } } + private static boolean isQualifierNeeded(List<ValuedQualifier> vQualifiers, IQualifier qualifier){ + for(ValuedQualifier vq : vQualifiers){ + if(vq.getQualifier().equals(qualifier)) + return true; + } + return false; + } + public static void addInterfaceToClass(ICompilationUnit compilationUnit, IType type, String qualifiedName) throws JavaModelException{ String shortName = getShortName(qualifiedName); @@ -652,9 +695,8 @@ Set<IQualifier> qualifiers = bean.getQualifiers(); for(IQualifier q : qualifiers){ - String value = findQualifierValue(bean, q); - if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName()) && - value.equals(valuedQualifier.getValue())) + //String value = findQualifierValue(bean, q); + if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName())) return true; } return false; 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-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -27,6 +27,7 @@ import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.SelectBeanWizard; +import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; /** * @author Daniel Azarov @@ -60,7 +61,7 @@ WizardDialog dialog = new WizardDialog(shell, wizard); IBean selectedBean = null; - List<IQualifier> deployed; + List<ValuedQualifier> deployed; if(test){ if(beans.isEmpty()) @@ -80,7 +81,7 @@ for(IQualifier qualifier : qualifiers){ if(wizard.checkBeans()) break; - wizard.deploy(qualifier); + wizard.deploy(new ValuedQualifier(qualifier)); } deployed = wizard.getDeployedQualifiers(); wizard.performCancel(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -16,6 +16,7 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; import org.jboss.tools.common.model.ui.ModelUIImages; public class AddQualifiersToBeanWizard extends AbstractModifyInjectionPointWizard{ @@ -38,7 +39,7 @@ return true; } - public List<IQualifier> getDeployedQualifiers(){ + public List<ValuedQualifier> getDeployedQualifiers(){ return page.getDeployedQualifiers(); } @@ -46,11 +47,11 @@ return page.getAvailableQualifiers(); } - public void deploy(IQualifier qualifier){ + public void deploy(ValuedQualifier qualifier){ page.deploy(qualifier); } - public void remove(IQualifier qualifier){ + public void remove(ValuedQualifier qualifier){ page.remove(qualifier); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -34,7 +34,7 @@ setControl(composite); } - public ArrayList<IQualifier> getDeployedQualifiers(){ + public ArrayList<ValuedQualifier> getDeployedQualifiers(){ return composite.getDeployedQualifiers(); } @@ -46,12 +46,12 @@ composite.init(bean); } - public void deploy(IQualifier qualifier){ - composite.deploy(new ValuedQualifier(qualifier)); + public void deploy(ValuedQualifier qualifier){ + composite.deploy(qualifier); } - public void remove(IQualifier qualifier){ - composite.remove(new ValuedQualifier(qualifier)); + public void remove(ValuedQualifier qualifier){ + composite.remove(qualifier); } public boolean checkBeans(){ 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-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -43,6 +43,7 @@ import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils; +import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; import org.jboss.tools.common.model.ui.ModelUIImages; public class SelectBeanWizard extends AbstractModifyInjectionPointWizard{ @@ -62,7 +63,7 @@ addPage(page); } - public java.util.List<IQualifier> getDeployedQualifiers(){ + public java.util.List<ValuedQualifier> getDeployedQualifiers(){ return page.getDeployedQualifiers(); } @@ -74,7 +75,7 @@ page.init(bean); } - public void deploy(IQualifier qualifier){ + public void deploy(ValuedQualifier qualifier){ page.deploy(qualifier); } 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-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -23,9 +23,11 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IColorProvider; @@ -59,6 +61,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; @@ -487,6 +490,14 @@ editQualifierValue.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_EDIT_QUALIFIER_VALUE); editQualifierValue.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + ValuedQualifier[] vq = getDeployedSelection(); + ValueDialog d = new ValueDialog(getShell(), vq[0].getValue()); + int result = d.open(); + if(result == MessageDialog.OK){ + vq[0].setValue(d.getValue()); + } + } }); setEnablement(); @@ -555,7 +566,7 @@ } remove.setEnabled(enabled); - if(enabled && ms.length == 1){ + if(enabled && ms.length == 1 && isEditEnabled(ms[0].qualifier)){ editQualifierValue.setEnabled(true); }else{ editQualifierValue.setEnabled(false); @@ -573,6 +584,20 @@ wizard.setPageComplete(isComplete); } + private boolean isEditEnabled(IQualifier qualifier){ + IMethod method = qualifier.getSourceType().getMethod("value", new String[]{}); + try{ + if(method.exists()){ + if(method.getReturnType().equals("Ljava.lang.String;")) + return true; + } + }catch(JavaModelException ex){ + CDIUIPlugin.getDefault().logError(ex); + } + + return false; + } + protected void add(boolean all) { if (all) { ValuedQualifier[] qualifiers2 = new ValuedQualifier[qualifiers.size()]; @@ -663,18 +688,12 @@ return isComplete; } - public ArrayList<IQualifier> getDeployedQualifiers(){ + public ArrayList<ValuedQualifier> getDeployedQualifiers(){ total.clear(); total.addAll(originalQualifiers); total.addAll(deployed); - ArrayList<IQualifier> result = new ArrayList<IQualifier>(); - - for(ValuedQualifier vq : total){ - result.add(vq.qualifier); - } - - return result; + return total; } public void deploy(ValuedQualifier qualifier){ @@ -808,6 +827,10 @@ public String getValue(){ return value; } + + public void setValue(String value){ + this.value = value; + } public boolean equals(Object obj) { if(obj instanceof ValuedQualifier) @@ -815,5 +838,47 @@ return false; } } + + static class ValueDialog extends MessageDialog{ + String value; + Text text; + public ValueDialog(Shell shell, String value) { + super(shell, "Edit Qualifier Annotation Value", null, "", + MessageDialog.NONE, new String[]{"Ok", "Cancel"}, 0); + this.value = value; + } + + protected Control createCustomArea(Composite parent) { + Composite composite = new Composite(parent, 0); + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + layout.marginHeight = 5; + layout.marginWidth = 5; + layout.horizontalSpacing = 5; + layout.verticalSpacing = 5; + composite.setLayout(layout); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + + Label label = new Label(composite, SWT.NONE); + label.setText("Qualifier annotation value:"); + + text = new Text(composite, SWT.BORDER); + GridData data = new GridData(GridData.FILL_HORIZONTAL); + text.setLayoutData(data); + text.setText(value); + text.addModifyListener(new ModifyListener(){ + public void modifyText(ModifyEvent e) { + value = text.getText(); + } + }); + + return composite; + } + + public String getValue(){ + return value; + } + } + } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2011-08-24 01:00:54 UTC (rev 34198) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2011-08-24 01:07:32 UTC (rev 34199) @@ -18,13 +18,15 @@ import org.jboss.tools.cdi.ui.test.testmodel.CDIInjectionPoint; import org.jboss.tools.cdi.ui.test.testmodel.CDIProject; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; +import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; public class AddQualifiersToBeanWizardTest extends TestCase{ private AddQualifiersToBeanWizard wizard; private WizardDialog dialog; private ICDIProject project; - private ArrayList<IQualifier> availableCheck, deployedCheck; + private ArrayList<ValuedQualifier> availableCheck; + private ArrayList<ValuedQualifier> deployedCheck; @Override protected void setUp() throws Exception { @@ -39,20 +41,20 @@ ArrayList<IBean> beans = new ArrayList<IBean>(); beans.add(bean); - availableCheck = new ArrayList<IQualifier>(); + availableCheck = new ArrayList<ValuedQualifier>(); - availableCheck.add(project.getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)); - availableCheck.add(project.getQualifier(CDIConstants.NEW_QUALIFIER_TYPE_NAME)); - availableCheck.add(project.getQualifier(CDIProject.QUALIFIER1)); - availableCheck.add(project.getQualifier(CDIProject.QUALIFIER2)); - availableCheck.add(project.getQualifier(CDIProject.QUALIFIER3)); - availableCheck.add(project.getQualifier(CDIProject.QUALIFIER4)); - availableCheck.add(project.getQualifier(CDIProject.QUALIFIER5)); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIConstants.NEW_QUALIFIER_TYPE_NAME))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER1))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER2))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER3))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER4))); + availableCheck.add(new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER5))); - deployedCheck = new ArrayList<IQualifier>(); + deployedCheck = new ArrayList<ValuedQualifier>(); - deployedCheck.add(project.getQualifier(CDIConstants.ANY_QUALIFIER_TYPE_NAME)); - deployedCheck.add(project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)); + deployedCheck.add(new ValuedQualifier(project.getQualifier(CDIConstants.ANY_QUALIFIER_TYPE_NAME))); + deployedCheck.add(new ValuedQualifier(project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME))); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); @@ -69,29 +71,40 @@ super.tearDown(); } - private void checkQualifierLists(List<IQualifier> checkQualifiers, List<IQualifier> actualQualifiers){ - for(IQualifier q : checkQualifiers){ - if(!actualQualifiers.contains(q)) - fail("Qualifier - "+q.getSourceType().getFullyQualifiedName()+" not found"); + private void checkQualifierLists(List<ValuedQualifier> checkQualifiers, List<IQualifier> actualQualifiers){ + for(ValuedQualifier vq : checkQualifiers){ + if(!actualQualifiers.contains(vq.getQualifier())) + fail("Qualifier - "+vq.getQualifier().getSourceType().getFullyQualifiedName()+" not found"); } for(IQualifier q : actualQualifiers){ - if(!checkQualifiers.contains(q)) + if(!checkQualifiers.contains(new ValuedQualifier(q))) fail("Wrong Qualifier - "+q.getSourceType().getFullyQualifiedName()+" found"); } } + + private void checkValuedQualifierLists(List<ValuedQualifier> checkQualifiers, List<ValuedQualifier> actualQualifiers){ + for(ValuedQualifier vq : checkQualifiers){ + if(!actualQualifiers.contains(vq)) + fail("Qualifier - "+vq.getQualifier().getSourceType().getFullyQualifiedName()+" not found"); + } + for(ValuedQualifier q : actualQualifiers){ + if(!checkQualifiers.contains(q)) + fail("Wrong Qualifier - "+q.getQualifier().getSourceType().getFullyQualifiedName()+" found"); + } + } public void testAddQualifier(){ List<IQualifier> available = wizard.getAvailableQualifiers(); checkQualifierLists(availableCheck, available); - List<IQualifier> deployed = wizard.getDeployedQualifiers(); + List<ValuedQualifier> deployed = wizard.getDeployedQualifiers(); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); // Deploy qualifier - IQualifier qualifier = project.getQualifier(CDIProject.QUALIFIER1); - IQualifier defaultQualifier = project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); + ValuedQualifier qualifier = new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER1)); + ValuedQualifier defaultQualifier = new ValuedQualifier(project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)); wizard.deploy(qualifier); @@ -105,7 +118,7 @@ deployedCheck.add(qualifier); deployedCheck.remove(defaultQualifier); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); } public void testAddAndRemoveQualifier(){ @@ -113,13 +126,13 @@ checkQualifierLists(availableCheck, available); - List<IQualifier> deployed = wizard.getDeployedQualifiers(); + List<ValuedQualifier> deployed = wizard.getDeployedQualifiers(); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); // Deploy qualifier - IQualifier qualifier = project.getQualifier(CDIProject.QUALIFIER2); - IQualifier defaultQualifier = project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME); + ValuedQualifier qualifier = new ValuedQualifier(project.getQualifier(CDIProject.QUALIFIER2)); + ValuedQualifier defaultQualifier = new ValuedQualifier(project.getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)); wizard.deploy(qualifier); @@ -133,7 +146,7 @@ deployedCheck.add(qualifier); deployedCheck.remove(defaultQualifier); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); // Remove qualifier wizard.remove(qualifier); @@ -148,7 +161,7 @@ deployedCheck.remove(qualifier); deployedCheck.add(defaultQualifier); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); } public void testAddNamedQualifier(){ @@ -156,12 +169,12 @@ checkQualifierLists(availableCheck, available); - List<IQualifier> deployed = wizard.getDeployedQualifiers(); + List<ValuedQualifier> deployed = wizard.getDeployedQualifiers(); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); // Deploy @Named qualifier - IQualifier named = project.getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + ValuedQualifier named = new ValuedQualifier(project.getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)); wizard.deploy(named); @@ -174,7 +187,7 @@ deployedCheck.add(named); - checkQualifierLists(deployedCheck, deployed); + checkValuedQualifierLists(deployedCheck, deployed); } }