[richfaces-svn-commits] JBoss Rich Faces SVN: r16443 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/parser/el and 3 other directories.

Author: nbelaevski Date: 2010-02-11 12:35:12 -0500 (Thu, 11 Feb 2010) New Revision: 16443 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/ValidatorTagGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java Log: https://jira.jboss.org/jira/browse/RF-7732 Fixes in code generation Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/ValidatorTagGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/ValidatorTagGenerator.java 2010-02-11 17:02:58 UTC (rev 16442) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/ValidatorTagGenerator.java 2010-02-11 17:35:12 UTC (rev 16443) @@ -22,16 +22,7 @@ package org.richfaces.cdk.generate.taglib; -import java.io.File; - -import org.richfaces.cdk.CdkException; -import org.richfaces.cdk.FileManager; -import org.richfaces.cdk.Output; -import org.richfaces.cdk.Outputs; -import org.richfaces.cdk.freemarker.FreeMarkerRenderer; -import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ValidatorModel; -import org.richfaces.cdk.model.Visitable; import com.google.inject.Inject; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2010-02-11 17:02:58 UTC (rev 16442) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2010-02-11 17:35:12 UTC (rev 16443) @@ -27,6 +27,7 @@ import org.jboss.el.parser.ELParser; import org.jboss.el.parser.Node; import org.richfaces.cdk.parser.el.node.ITreeNode; +import org.richfaces.cdk.parser.el.types.TypesFactory; /** * Entry point for parsing EL expressions. @see parse() method. @@ -99,7 +100,12 @@ this.setUseConversionToString(true); } - parsedExpression = this.visit(ret, contextMap); + if (ret != null && ret.jjtGetNumChildren() > 0) { + parsedExpression = this.visit(ret, contextMap); + } else { + parsedExpression = StringUtils.getEscapedString(""); + variableType = TypesFactory.getType(String.class); + } } private String visit(Node node, Map<String, Type> context) throws ParsingException { Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-02-11 17:02:58 UTC (rev 16442) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-02-11 17:35:12 UTC (rev 16443) @@ -27,6 +27,7 @@ import java.util.List; import javax.faces.render.RenderKitFactory; +import javax.faces.render.Renderer; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; @@ -53,7 +54,7 @@ private String javaClass; - private String baseClass; + private String baseClass = Renderer.class.getName(); private String rendererType; Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl 2010-02-11 17:02:58 UTC (rev 16442) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/emptiness-check-method.ftl 2010-02-11 17:35:12 UTC (rev 16443) @@ -1 +1 @@ -return object != null; \ No newline at end of file +return object == null; \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2010-02-11 17:02:58 UTC (rev 16442) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2010-02-11 17:35:12 UTC (rev 16443) @@ -500,6 +500,13 @@ assertEquals(Object.class, visitor.getVariableType().getRawType()); } + @Test + public void testEmptyString() throws Exception { + parseExpression(""); + assertEquals("\"\"", visitor.getParsedExpression()); + assertEquals(String.class, visitor.getVariableType().getRawType()); + } + private void parseExpression(String expression) throws ParsingException { Map<String, Type> contextMap = new HashMap<String, Type>();