r291 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor/filters test/resources/org/nuiton/processor/filters
Author: fdesbois Date: 2009-10-22 17:41:23 +0200 (Thu, 22 Oct 2009) New Revision: 291 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 Log: Fix missing else for parentheses Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2009-10-20 15:06:33 UTC (rev 290) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2009-10-22 15:41:23 UTC (rev 291) @@ -68,6 +68,9 @@ if (this.parent.writeParentheses) { this.beginParenthese = "("; this.endParenthese = ");"; + } else { + this.beginParenthese = ""; + this.endParenthese = ""; } if (ch.startsWith("=")) { return "\"+" + ch.substring(1) + "+\""; @@ -98,6 +101,9 @@ if (this.parent.writeParentheses) { this.beginParenthese = "("; this.endParenthese = ");"; + } else { + this.beginParenthese = ""; + this.endParenthese = ""; } String result = convertEndComment(ch).replaceAll("\"", "\\\\\"") .replaceAll("(\r\n|\n|\r)", Modified: trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 =================================================================== --- trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 2009-10-20 15:06:33 UTC (rev 290) +++ trunk/nuiton-processor/src/test/resources/org/nuiton/processor/filters/StringFilterTest.java2 2009-10-22 15:41:23 UTC (rev 291) @@ -1,13 +1,14 @@ - - +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ public class StringProcessorTest { public void testForStringTemplatesFilter() { + String objectName = "name"; String code = "" /*{ int i = 0; i = 1+2; - MonObject result = new MonObject(result); + MonObject result = new MonObject(<%=objectName%>); return result; }*/; }
Le Thu, 22 Oct 2009 17:41:23 +0200 (CEST), fdesbois@users.nuiton.org a écrit :
if (this.parent.writeParentheses) { this.beginParenthese = "("; this.endParenthese = ");"; + } else { + this.beginParenthese = ""; + this.endParenthese = ""; } on pourrait introduire des constantes pour ces chaines de caractères :)
-- Tony Chemit -------------------- tél: +33 (0) 2 40 50 29 28 email: chemit@codelutin.com http://www.codelutin.com
participants (2)
-
fdesbois@users.nuiton.org -
Tony Chemit