Author: dazarov Date: 2012-02-15 18:07:40 -0500 (Wed, 15 Feb 2012) New Revision: 38789 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.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-15 22:56:28 UTC (rev 38788) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2012-02-15 23:07:40 UTC (rev 38789) @@ -37,6 +37,26 @@ pair.type = "String"; }else if(mvp.getValueKind() == IMemberValuePair.K_CHAR){ pair.type = "char"; + }else if(mvp.getValueKind() == IMemberValuePair.K_CLASS){ + pair.type = "Class"; + }else if(mvp.getValueKind() == IMemberValuePair.K_BOOLEAN){ + pair.type = "boolean"; + }else if(mvp.getValueKind() == IMemberValuePair.K_BYTE){ + pair.type = "byte"; + }else if(mvp.getValueKind() == IMemberValuePair.K_DOUBLE){ + pair.type = "double"; + }else if(mvp.getValueKind() == IMemberValuePair.K_FLOAT){ + pair.type = "float"; + }else if(mvp.getValueKind() == IMemberValuePair.K_INT){ + pair.type = "int"; + }else if(mvp.getValueKind() == IMemberValuePair.K_LONG){ + pair.type = "long"; + }else if(mvp.getValueKind() == IMemberValuePair.K_QUALIFIED_NAME){ + pair.type = "name"; + }else if(mvp.getValueKind() == IMemberValuePair.K_SHORT){ + pair.type = "short"; + }else if(mvp.getValueKind() == IMemberValuePair.K_SIMPLE_NAME){ + pair.type = "name"; } pairs.add(pair); } @@ -69,7 +89,7 @@ }else if(pair.type.equals("String")){ pair.value = "default"; }else{ - pair.value = "String.class"; + pair.value = "String"; } } pairs.add(pair); @@ -141,6 +161,10 @@ text += "\""+pair.value+"\""; }else{ text += pair.value; + if(!CDIMarkerResolutionUtils.primitives.contains(pair.type)){ + text += ".class"; + } + } first = false; } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-02-15 22:56:28 UTC (rev 38788) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-02-15 23:07:40 UTC (rev 38789) @@ -80,7 +80,7 @@ private static final int NUMBER_OF_STRINGS = 3; - static final HashSet<String> primitives = new HashSet<String>(); + public static final HashSet<String> primitives = new HashSet<String>(); static{ primitives.add("void"); //$NON-NLS-1$ primitives.add("int"); //$NON-NLS-1$