[jbosstools-commits] JBoss Tools SVN: r38522 - in trunk/cdi/plugins: org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard and 1 other directory.
Author: dazarov
Date: 2012-02-08 15:05:55 -0500 (Wed, 08 Feb 2012)
New Revision: 38522
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.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.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java 2012-02-08
18:45:50 UTC (rev 38521)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIMarkerResolutionUtils.java 2012-02-08
20:05:55 UTC (rev 38522)
@@ -361,7 +361,7 @@
}else{
vq = new ValuedQualifier(q);
}
- if(vq.equals(valuedQualifier)){
+ if(vq.fullyEquals(valuedQualifier)){
return true;
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-08
18:45:50 UTC (rev 38521)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-08
20:05:55 UTC (rev 38522)
@@ -165,6 +165,13 @@
@Override
public boolean equals(Object obj) {
if(obj instanceof ValuedQualifier &&
getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName())){
+ return true;
+ }
+ return false;
+ }
+
+ public boolean fullyEquals(Object obj) {
+ if(obj instanceof ValuedQualifier &&
getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName())){
for(Pair pair : ((ValuedQualifier)obj).getValuePairs()){
if(!pair.value.equals(getValue(pair.name)) || pair.value == null){
return false;
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-08
18:45:50 UTC (rev 38521)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2012-02-08
20:05:55 UTC (rev 38522)
@@ -26,7 +26,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
@@ -175,7 +174,7 @@
public void setDefaultSelection(){
if(getBeans().size() > 0){
- IBean defaultBean = getBeans().get(0);
+ IBean defaultBean = (IBean)tableViewer.getTable().getItem(0).getData();
tableViewer.setSelection(new StructuredSelection(defaultBean));
tableViewer.getTable().select(0);
addQualifiersPage.init(defaultBean);