Author: dazarov Date: 2012-02-14 12:57:28 -0500 (Tue, 14 Feb 2012) New Revision: 38721 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/SelectBeanWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java Log: Wizard 'Specify CDI Bean for the Injection Point' does not compute correctly condition 'can finish' https://issues.jboss.org/browse/JBIDE-10637 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 2012-02-14 17:42:16 UTC (rev 38720) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2012-02-14 17:57:28 UTC (rev 38721) @@ -16,7 +16,6 @@ import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; @@ -46,9 +45,9 @@ return composite.getAvailableQualifiers(); } - public void init(IBean bean){ - composite.init(bean); - setTitle(NLS.bind(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_TITLE, bean.getElementName())); + public void init(){ + composite.init(); + setTitle(NLS.bind(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_TITLE, ((AddQualifiersToBeanProcessor)((ProcessorBasedRefactoring)getRefactoring()).getProcessor()).getSelectedBean().getElementName())); } public void deploy(ValuedQualifier qualifier){ 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 2012-02-14 17:42:16 UTC (rev 38720) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2012-02-14 17:57:28 UTC (rev 38721) @@ -75,8 +75,8 @@ return addQualifiersPage.getAvailableQualifiers(); } - public void init(IBean bean){ - addQualifiersPage.init(bean); + public void init(){ + addQualifiersPage.init(); } public void deploy(ValuedQualifier qualifier){ @@ -152,10 +152,10 @@ public void selectionChanged(SelectionChangedEvent event) { IBean bean = getSelection(); if(bean != null){ - setPageComplete(true); - addQualifiersPage.init(bean); setSelectedBean(bean); + addQualifiersPage.init(); addQualifiersPage.setDeployedQualifiers(addQualifiersPage.getDeployedQualifiers()); + setPageComplete(true); }else setPageComplete(false); } @@ -177,8 +177,8 @@ IBean defaultBean = (IBean)tableViewer.getTable().getItem(0).getData(); tableViewer.setSelection(new StructuredSelection(defaultBean)); tableViewer.getTable().select(0); - addQualifiersPage.init(defaultBean); setSelectedBean(defaultBean); + addQualifiersPage.init(); addQualifiersPage.setDeployedQualifiers(addQualifiersPage.getDeployedQualifiers()); setPageComplete(true); } 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 2012-02-14 17:42:16 UTC (rev 38720) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2012-02-14 17:57:28 UTC (rev 38721) @@ -87,7 +87,7 @@ public class AddQualifiersToBeanComposite extends Composite { private static Font font; private IInjectionPoint injectionPoint; - private IBean bean; + private IBean selectedBean; private java.util.List<IBean> beans; private AddQualifiersToBeanWizardPage page; private Text pattern; @@ -121,24 +121,24 @@ super(parent, SWT.NONE); this.page = page; this.injectionPoint = ((AbstractModifyInjectionPointWizard)page.getWizard()).getInjectionPoint(); - this.bean = ((AbstractModifyInjectionPointWizard)page.getWizard()).getSelectedBean(); + this.selectedBean = ((AbstractModifyInjectionPointWizard)page.getWizard()).getSelectedBean(); this.beans = ((AbstractModifyInjectionPointWizard)page.getWizard()).getBeans(); createControl(); - if(bean != null) - init(bean); + if(selectedBean != null) + init(); page.setDeployedQualifiers(getDeployedQualifiers()); } - public void init(IBean bean){ - this.bean = bean; - String beanName = CDIMarkerResolutionUtils.getELName(bean); + public void init(){ + this.selectedBean = ((AbstractModifyInjectionPointWizard)page.getWizard()).getSelectedBean(); + String beanName = CDIMarkerResolutionUtils.getELName(selectedBean); originalQualifiers.clear(); deployed.clear(); - for(IQualifier q : bean.getQualifiers()){ + for(IQualifier q : selectedBean.getQualifiers()){ - IQualifierDeclaration declaration = CDIMarkerResolutionUtils.findQualifierDeclaration(bean, q); + IQualifierDeclaration declaration = CDIMarkerResolutionUtils.findQualifierDeclaration(selectedBean, q); if(declaration != null){ //String value = CDIMarkerResolutionUtils.findQualifierValue(bean, declaration); ValuedQualifier vq = new ValuedQualifier(q, declaration); @@ -148,8 +148,8 @@ } } - defaultQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)); - namedQualifier = new ValuedQualifier(bean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)); + defaultQualifier = new ValuedQualifier(selectedBean.getCDIProject().getQualifier(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)); + namedQualifier = new ValuedQualifier(selectedBean.getCDIProject().getQualifier(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)); namedQualifier.setValue("value", beanName); for(ValuedQualifier q : originalQualifiers){ @@ -172,17 +172,17 @@ availableTableViewer.setInput(qualifiers); if(nLabel != null) nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE, - new Object[]{bean.getElementName(), injectionPoint.getElementName()})); + new Object[]{selectedBean.getElementName(), injectionPoint.getElementName()})); refresh(); } private ValuedQualifier loadAvailableQualifiers(){ - String beanName = CDIMarkerResolutionUtils.getELName(bean); + String beanName = CDIMarkerResolutionUtils.getELName(selectedBean); ValuedQualifier lastQualifier = null; - String beanTypeName = bean.getBeanClass().getFullyQualifiedName(); + String beanTypeName = selectedBean.getBeanClass().getFullyQualifiedName(); String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(CDIMarkerResolutionUtils.DOT)); - IJavaProject beanJavaProject = bean.getBeanClass().getJavaProject(); + IJavaProject beanJavaProject = selectedBean.getBeanClass().getJavaProject(); String injectionPointTypeName = injectionPoint.getClassBean().getBeanClass().getFullyQualifiedName(); String injectionPointPackage = injectionPointTypeName.substring(0,injectionPointTypeName.lastIndexOf(CDIMarkerResolutionUtils.DOT)); @@ -190,7 +190,7 @@ boolean samePackage = beanPackage.equals(injectionPointPackage); - IQualifier[] qs = bean.getCDIProject().getQualifiers(); + IQualifier[] qs = selectedBean.getCDIProject().getQualifiers(); for(IQualifier q : qs){ ValuedQualifier vq = new ValuedQualifier(q); @@ -246,9 +246,9 @@ HashSet<ValuedQualifier> qfs = new HashSet<ValuedQualifier>(total); for(IBean b: beans){ - if(b.equals(bean)) + if(b.equals(selectedBean)) continue; - if(CDIMarkerResolutionUtils.checkValuedQualifiers(bean, b, qfs)) + if(CDIMarkerResolutionUtils.checkValuedQualifiers(selectedBean, b, qfs)) return false; } @@ -280,9 +280,9 @@ GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); data.horizontalSpan = 3; nLabel.setLayoutData(data); - if(bean != null) + if(selectedBean != null) nLabel.setText(MessageFormat.format(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_MESSAGE, - new Object[]{bean.getElementName(), injectionPoint.getElementName()})); + new Object[]{selectedBean.getElementName(), injectionPoint.getElementName()})); Label label = new Label(this, SWT.NONE); label.setText(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_ENTER_QUALIFIER_NAME); @@ -459,7 +459,7 @@ @Override public void run(){ NewQualifierCreationWizard wizard = new NewQualifierCreationWizard(); - StructuredSelection selection = new StructuredSelection(new Object[]{bean.getBeanClass()}); + StructuredSelection selection = new StructuredSelection(new Object[]{selectedBean.getBeanClass()}); wizard.init(PlatformUI.getWorkbench(), selection); WizardDialog dialog = new WizardDialog(getShell(), wizard); @@ -500,8 +500,6 @@ } }); - setEnablement(); - Dialog.applyDialogFont(this); } @@ -579,7 +577,7 @@ if(isComplete) page.setMessage(""); else - page.setMessage(NLS.bind(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_SET_IS_NOT_UNIQUE, bean.getElementName(), injectionPoint.getElementName()), IMessageProvider.ERROR); + page.setMessage(NLS.bind(CDIUIMessages.ADD_QUALIFIERS_TO_BEAN_WIZARD_SET_IS_NOT_UNIQUE, selectedBean.getElementName(), injectionPoint.getElementName()), IMessageProvider.ERROR); page.setPageComplete(isComplete); }