Author: mfortun Date: 2011-07-28 10:16:27 +0200 (Thu, 28 Jul 2011) New Revision: 1095 Url: http://nuiton.org/repositories/revision/wikitty/1095 Log: * correct filter use Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-07-27 16:06:15 UTC (rev 1094) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-07-28 08:16:27 UTC (rev 1095) @@ -5,10 +5,23 @@ protected String writeString; protected String stringDelim; protected String concatChar; - protected boolean passEmptyLine = false; - protected boolean writeParentheses = true; protected String endingCar; - protected String prefixFirstWriteString; + protected String initializeOutputWriter; + protected String closingWriterChar; + + public String getClosingWriterChar() { + return closingWriterChar; + } + public void setClosingWriterChar(String closingWriterChar) { + this.closingWriterChar = closingWriterChar; + } + public String getOpeningWriterChar() { + return openingWriterChar; + } + public void setOpeningWriterChar(String openingWriterChar) { + this.openingWriterChar = openingWriterChar; + } + protected String openingWriterChar; public String getWriteString() { return writeString; @@ -28,29 +41,18 @@ public void setConcatChar(String concatChar) { this.concatChar = concatChar; } - public boolean isPassEmptyLine() { - return passEmptyLine; - } - public void setPassEmptyLine(boolean passEmptyLine) { - this.passEmptyLine = passEmptyLine; - } - public boolean isWriteParentheses() { - return writeParentheses; - } - public void setWriteParentheses(boolean writeParentheses) { - this.writeParentheses = writeParentheses; - } + public String getEndingCar() { return endingCar; } public void setEndingCar(String endingCar) { this.endingCar = endingCar; } - public String getPrefixFirstWriteString() { - return prefixFirstWriteString; + public String getInitializeOutputWriter() { + return initializeOutputWriter; } - public void setPrefixFirstWriteString(String prefixFirstWriteString) { - this.prefixFirstWriteString = prefixFirstWriteString; + public void setInitializeOutputWriter(String prefixFirstWriteString) { + this.initializeOutputWriter = prefixFirstWriteString; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-27 16:06:15 UTC (rev 1094) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 08:16:27 UTC (rev 1095) @@ -37,12 +37,13 @@ static { defaultFilterOption= new FilterOption(); - defaultFilterOption.setPrefixFirstWriteString("var "); - defaultFilterOption.setWriteString("result= \""); + defaultFilterOption.setInitializeOutputWriter("var result=\""); + defaultFilterOption.setWriteString("result"); defaultFilterOption.setStringDelim("\""); defaultFilterOption.setConcatChar("+"); defaultFilterOption.setEndingCar(";"); - defaultFilterOption.setWriteParentheses(false); + defaultFilterOption.setClosingWriterChar(""); + defaultFilterOption.setOpeningWriterChar("+="); } @@ -78,13 +79,14 @@ filterIn.setStringDelim(foption.getStringDelim()); filterIn.getParent().setWriteString(foption.getWriteString()); filterIn.setEndCar(foption.getEndingCar()); + filterIn.setOpeningWriterChar(foption.getOpeningWriterChar()); + filterIn.setClosingWriterChar(foption.getClosingWriterChar()); decoringEnd = foption.getStringDelim() + foption.getEndingCar(); - decoringAffect = foption.getPrefixFirstWriteString() - + foption.getWriteString(); + decoringAffect = foption.getInitializeOutputWriter(); // initialize new content String decoredContent = decoringInit;