Author: dazarov Date: 2012-02-14 13:03:41 -0500 (Tue, 14 Feb 2012) New Revision: 38722 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.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/ValuedQualifier.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-14 17:57:28 UTC (rev 38721) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-14 18:03:41 UTC (rev 38722) @@ -51,7 +51,9 @@ pair.name = method.getElementName(); if(mvp != null && mvp.getValue() != null){ pair.value = mvp.getValue(); + pair.required = false; }else{ + pair.required = true; if(pair.type.equals("boolean")){ pair.value = "false"; }else if(pair.type.equals("int") || pair.type.equals("short") || pair.type.equals("long")){ @@ -125,6 +127,8 @@ String text = ""; boolean first = true; for(Pair pair : pairs){ + if(!pair.required) + continue; if(!first){ text += ", "; } @@ -147,6 +151,7 @@ for(Pair pair : pairs){ if(pair.name.equals(name)){ pair.value = value; + pair.required = true; } } } @@ -172,6 +177,7 @@ } private static class Pair{ + public boolean required = true; public String type=""; public String name=""; public Object value;