Author: scabanovich Date: 2007-08-07 09:27:51 -0400 (Tue, 07 Aug 2007) New Revision: 2933 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java Log: EXIN-217 - Fixed setting precedence value given like Install.FRAMEWORK etc. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-07 13:22:54 UTC (rev 2932) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-07 13:27:51 UTC (rev 2933) @@ -335,15 +335,31 @@ attributes.put(ISeamXmlComponentDeclaration.SCOPE, value); setScope(value == null ? null : value.getValue()); } + + static final Map<String, Integer> NAMED_PRECEDENCES = new HashMap<String, Integer>(); + + static { + NAMED_PRECEDENCES.put("Install.BUILT_IN", new Integer(0)); + NAMED_PRECEDENCES.put("Install.FRAMEWORK", new Integer(10)); + NAMED_PRECEDENCES.put("Install.APPLICATION", new Integer(20)); + NAMED_PRECEDENCES.put("Install.DEPLOYMENT", new Integer(30)); + NAMED_PRECEDENCES.put("Install.MOCK", new Integer(40)); + } public void setPrecedence(IValueInfo value) { attributes.put(ISeamXmlComponentDeclaration.PRECEDENCE, value); - try { - setPrecedence(value == null ? 0 : Integer.parseInt(value.getValue())); + String p = value.getValue(); + if(p == null) { + setPrecedence(0); + return; + } + Integer i = NAMED_PRECEDENCES.get(p); + if(i == null) try { + i = Integer.parseInt(p); } catch (NumberFormatException e) { - setPrecedence(-1); //error value //ignore - exact value is stored in ValueInfo } + setPrecedence(i == null ? -1 : i.intValue()); } public void setTypes(Map<BeanType, IValueInfo> types) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java 2007-08-07 13:22:54 UTC (rev 2932) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java 2007-08-07 13:27:51 UTC (rev 2933) @@ -74,8 +74,12 @@ if(exp instanceof StringLiteral) { return ((StringLiteral)exp).getLiteralValue(); } else if(exp instanceof QualifiedName) { + Object o = exp.resolveConstantExpressionValue(); + if(o != null) return o.toString(); return exp.toString(); } + Object o = exp.resolveConstantExpressionValue(); + if(o != null) return o.toString(); return exp.toString(); }