February 2011 - Processor-commits - mailman.cloud.codelutin.com

r379 - tags
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:58:23 +0100 (Thu, 03 Feb 2011) New Revision: 379 Url: http://nuiton.org/repositories/revision/processor/379 Log: [maven-release-plugin] copy for tag processor-1.2 Added: tags/processor-1.2/

1 0

r378 - in trunk: . ant-processor-task maven-processor-plugin nuiton-processor
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:58:21 +0100 (Thu, 03 Feb 2011) New Revision: 378 Url: http://nuiton.org/repositories/revision/processor/378 Log: [maven-release-plugin] prepare release processor-1.2 Modified: trunk/ant-processor-task/pom.xml trunk/maven-processor-plugin/pom.xml trunk/nuiton-processor/pom.xml trunk/pom.xml Modified: trunk/ant-processor-task/pom.xml =================================================================== --- trunk/ant-processor-task/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/ant-processor-task/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/maven-processor-plugin/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/nuiton-processor/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.processor</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-03 10:40:42 UTC (rev 377) +++ trunk/pom.xml 2011-02-03 10:58:21 UTC (rev 378) @@ -37,7 +37,7 @@ </parent> <artifactId>processor</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>nuiton-processor</module> @@ -259,11 +259,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/processor/trunk + scm:svn:http://svn.nuiton.org/svn/processor/tags/processor-1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> + <url>http://www.nuiton.org/repositories/browse/processor/tags/processor-1.2</url> </scm> </project>

1 0

r377 - in trunk/nuiton-processor/src: main/java/org/nuiton/processor main/java/org/nuiton/processor/filters test/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:40:42 +0100 (Thu, 03 Feb 2011) New Revision: 377 Url: http://nuiton.org/repositories/revision/processor/377 Log: Evolution #1281: Clean code Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -40,6 +40,7 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilter; +import java.io.Console; import java.io.IOException; public class GeneratorTemplatesProcessor extends Processor { @@ -62,22 +63,11 @@ ProcessorUtil.doProcess(processor, filein, fileout, encoding); } - /** - * @param filein the source file to process - * @param fileout the output file to generate - * @throws IOException if any io problems while processing - * @deprecated since 1.0.4, prefer use {@link #process(String, String, String)}. - */ - @Deprecated - static public void process(String filein, String fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); -// Processor processor = new GeneratorTemplatesProcessor(); -// ProcessorUtil.doProcess(processor, filein, fileout); - } - public static void main(String[] args) throws IOException { + String eol = System.getProperty("line.separator"); + Console console = System.console(); if (args.length < 2) { - System.out.println("Give source and destination file"); + console.printf("Give source and destination file" + eol); System.exit(1); } else { process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -42,6 +42,8 @@ import org.nuiton.processor.filters.ActiveLogsCodeFilter; import org.nuiton.processor.filters.RemoveLogsCodeFilter; +import java.io.Console; + /* * This class is a processor for source logs */ @@ -56,18 +58,6 @@ NoLogsCode } -// /** Type of actions */ -// protected static class Action {} -// -// /** Do nothing */ -// public final static Action NoAction = new Action(); -// -// /** Active logs in output. This is the default action */ -// public final static Action Logs = new Action(); -// -// /** Remove logs in output */ -// public final static Action NoLogsCode = new Action(); - public LogsProcessor(Action action) { switch (action) { @@ -84,63 +74,32 @@ setInputFilter(new RemoveLogsCodeFilter()); break; } -// if (NoAction.equals(action)) { -// // No action is the default filter in Processor -// } else if (NoLogsCode.equals(action)) { -// setInputFilter(new RemoveLogsCodeFilter()); -// } else { -// // Go for logs -// setInputFilter(new ActiveLogsCodeFilter()); -// } } public static void main(String[] args) throws Exception { + Console console = System.console(); + String eol = System.getProperty("line.separator"); if (args.length < 2) { - System.out.println("Give source and destination file, then action"); - System.out.println("Action may be remove or active (default is no action)"); + console.printf("Give source and destination file, then action" + eol); + console.printf("Action may be remove or active (default is no action)" + eol); return; -// System.exit(0); } Action action = Action.NoAction; if (args.length > 2) { if (args[2].equals(REMOVE_ACTION)) { action = Action.NoLogsCode; - System.out.println("Removing logs code"); + console.printf("Removing logs code" + eol); } else if (args[2].equals(ACTIVE_ACTION)) { action = Action.Logs; - System.out.println("Setting logs active"); + console.printf("Setting logs active" + eol); } } if (action == Action.NoAction) { - System.out.println("No action taken"); + console.printf("No action taken" + eol); } LogsProcessor processor = new LogsProcessor(action); ProcessorUtil.doProcess(processor, args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); -// if (args.length > 2) { -// if (args[2].equals(REMOVE_ACTION)) { -// processor = new LogsProcessor(Action.NoLogsCode); -// System.out.println("Removing logs code"); -// } else if (args[2].equals(ACTIVE_ACTION)) { -// processor = new LogsProcessor(Action.Logs); -// System.out.println("Setting logs active"); -// } else { -// processor = new LogsProcessor(Action.NoAction); -// System.out.println("No action taken"); -// } -// FileReader input = new FileReader(args[0]); -// FileWriter output = new FileWriter(args[1]); -// try { -// processor.process(input, output); -// } catch (IOException eee) { -// Logger logger = -// Logger.getLogger("org.nuiton.processor.LogsProcessor."); -// logger.severe("Error during log processing: "+eee); -// } finally { -// input.close(); -// output.close(); -// } -// } } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -41,6 +41,7 @@ import org.nuiton.processor.filters.OptimisationFilter; +import java.io.Console; import java.io.IOException; public class OptimisationProcessor extends Processor { // OptimisationProcessor @@ -61,25 +62,20 @@ ProcessorUtil.doProcess(processor, filein, fileout, encoding); } - /** - * @param filein source to process - * @param fileout result to write - * @throws IOException if any io problem while processing - * @deprecated since 1.0.4, prefer use {@link #process(String, String, String)} - */ - @Deprecated - static public void process(String filein, String fileout) throws IOException { - process(filein, fileout, ProcessorUtil.DEFAULT_ENCODING); -// Processor processor = new OptimisationProcessor(); -// ProcessorUtil.doProcess(processor, filein, fileout); - } - public static void main(String[] args) throws IOException { - if (args.length < 2) { - System.out.println("Give source and destination file"); - System.exit(1); - } else { - process(args[0], args[1]); + String eol = System.getProperty("line.separator"); + Console console = System.console(); + int length = args.length; + switch (length) { + case 0: + case 1: + console.printf("Give source and destination file (and optional encoding)" + eol); + break; + case 2: + process(args[0], args[1], ProcessorUtil.DEFAULT_ENCODING); + break; + case 3: + process(args[0], args[1], args[2]); } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2011-02-03 10:40:42 UTC (rev 377) @@ -37,21 +37,21 @@ * par : */ package org.nuiton.processor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.Filter; +import org.nuiton.processor.filters.NoActionFilter; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.io.LineNumberReader; import java.io.Reader; import java.io.Writer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.processor.filters.Filter; -import org.nuiton.processor.filters.NoActionFilter; /** * This class is a generic sources processor given * a reader class name and a writer class name. - * */ public class Processor { @@ -89,10 +89,10 @@ return result; } - /** + /** * Process all available data. * - * @param externalInput the reader + * @param externalInput the reader * @param externalOutput the writer * @throws IOException if any pb */ Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2011-02-03 10:40:42 UTC (rev 377) @@ -37,12 +37,12 @@ * par : */ package org.nuiton.processor; +import org.nuiton.processor.filters.Filter; + import java.io.IOException; import java.io.LineNumberReader; import java.io.StringReader; -import org.nuiton.processor.filters.Filter; - /** * ProcessorReader is used in conjonction with filter to change source data * @@ -51,7 +51,9 @@ public class ProcessorReader extends LineNumberReader { protected LineNumberReader input; + protected Filter filter; + protected String lineSeparator; protected ProcessorReader() { @@ -59,17 +61,16 @@ } /** - * Override to send call to input - * @return + * Override to send call to input. + * + * @return the actual line number. */ @Override public int getLineNumber() { return input.getLineNumber(); } - /** - * Override to send call to input - */ + /** Override to send call to input */ @Override public void setLineNumber(int lineNumber) { input.setLineNumber(lineNumber); Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,31 +45,33 @@ public class ActiveLogsCodeFilter extends LogsFilter { /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ @Override - protected String performInFilter(String ch){ + protected String performInFilter(String ch) { // Logs must be performed within a try{...}catch{} bloc return - "try {\n" + - ch + - "} catch (Exception logsE) {\n" + - " System.err.println(\"Error in Logging instructions\");\n" + - " logsE.printStackTrace();\n" + - "}"; + "try {\n" + + ch + + "} catch (Exception logsE) {\n" + + " System.err.println(\"Error in Logging instructions\");\n" + + " logsE.printStackTrace();\n" + + "}"; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ @Override - protected String performOutFilter(String ch){ + protected String performOutFilter(String ch) { return ch; } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,6 +45,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.Console; + /* * Classe principale du filtre de génération. Ce filtre recherche tout ce qu'il * y a entre les tag /*{ et }*/ a l'interieur de ces tags un autre filtre @@ -76,8 +78,11 @@ LogFactory.getLog(GeneratorTemplatesFilter.class); protected boolean passEmptyLine; + protected boolean writeParentheses; + protected String writeString; + protected GeneratorTemplatesFilterIn inFilter; public GeneratorTemplatesFilter() { @@ -87,50 +92,51 @@ inFilter = new GeneratorTemplatesFilterIn(this); } - public String getWriteString(){ + public String getWriteString() { return writeString; } /** * methode appele lorsqu'on a la chaine entiere entre le header * et le footer. + * * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ - protected String performInFilter(String ch){ - if(ch.matches("generator option: *passEmptyLine *= *(true|false)")){ + protected String performInFilter(String ch) { + if (ch.matches("generator option: *passEmptyLine *= *(true|false)")) { passEmptyLine = - "true".equalsIgnoreCase(ch.substring(ch.length()-4)); + "true".equalsIgnoreCase(ch.substring(ch.length() - 4)); return EMPTY_STRING; - }else if(ch.matches("generator option: *writeString *= *.*")){ + } else if (ch.matches("generator option: *writeString *= *.*")) { writeString = - ch.replaceAll("generator option: *writeString *= *(.*)", "$1"); + ch.replaceAll("generator option: *writeString *= *(.*)", "$1"); return EMPTY_STRING; - }else if(ch.matches("generator option: *parentheses *= *(true|false)")){ + } else if (ch.matches("generator option: *parentheses *= *(true|false)")) { writeParentheses = - "true".equalsIgnoreCase(ch.substring(ch.length()-4)); + "true".equalsIgnoreCase(ch.substring(ch.length() - 4)); return EMPTY_STRING; - }else{ - if (passEmptyLine && ch.length() > 0){ + } else { + if (passEmptyLine && ch.length() > 0) { // suppression des premieres et dernieres lignes si elles sont vides - String [] all = ch.split("\n"); - if (all.length > 0){ + String[] all = ch.split("\n"); + if (all.length > 0) { // si la derniere ne match que des blancs - if(all[all.length-1].matches("\\s*")){ - int len = ch.length()-all[all.length-1].length()-1; - ch = ch.substring(0, Math.max(len,0)); + if (all[all.length - 1].matches("\\s*")) { + int len = ch.length() - all[all.length - 1].length() - 1; + ch = ch.substring(0, Math.max(len, 0)); } // suppression de la 1er ligne si elle est vide - if(all[0].matches("\\s*")){ - int len = all[0].length()+1; - ch = ch.substring(Math.min(ch.length(),len)); + if (all[0].matches("\\s*")) { + int len = all[0].length() + 1; + ch = ch.substring(Math.min(ch.length(), len)); } } } String resultInFilter = inFilter.parse(ch) + inFilter.flush(); - + String result = getWriteString(); if (writeParentheses) { result += "("; @@ -150,6 +156,7 @@ /** * methode appele lorsqu'on a la chaine entiere a l'exterieur du * header/footer + * * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ @@ -169,12 +176,14 @@ } public static void main(String[] args) { - Filter filter = new GeneratorTemplatesFilter(); - String res = filter.parse(" public void generatePackageStatement(Writer output, ObjectModelClassifier clazz) throws IOException {\n/*{\n package <%=clazz.getPackageName()%>.persistence.jdo; \n}*/ }"); - System.out.println(res); - res = filter.flush(); - System.out.println(res); - } + String eol = System.getProperty("line.separator"); + Console console = System.console(); + Filter filter = new GeneratorTemplatesFilter(); + String res = filter.parse(" public void generatePackageStatement(Writer output, ObjectModelClassifier clazz) throws IOException {\n/*{\n package <%=clazz.getPackageName()%>.persistence.jdo; \n}*/ }"); + console.printf(res + eol); + res = filter.flush(); + console.printf(res + eol); + } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterBody.java 2011-02-03 10:40:42 UTC (rev 377) @@ -51,13 +51,13 @@ * ({@link GeneratorTemplatesFilterIn}) est * utilisé pour générer les tags <% %>, <%= %> et *). * <ul> - * <li>/*[ et ]*/ est remplacer par + "..." pour chaque + * <li>/*[ et ]*/ est remplacer par + "..." pour chaque * ligne et les " sont coté</li> - * <li><% %></li> - * <li><%= %></li> - * <li>*) permet de fermer un commentaire sans le fermer réeellement, cela - * permet au éditeur faisant une analyse du code de continuer a fonctionner - * ce tag est remplacé par son equivalent */ après génération.</li> + * <li><% %></li> + * <li><%= %></li> + * <li>*) permet de fermer un commentaire sans le fermer réeellement, cela + * permet au éditeur faisant une analyse du code de continuer a fonctionner + * ce tag est remplacé par son equivalent */ après génération.</li> * </ul> * Vous pouvez modifier le comportement du processor en mettant des options * Une option est incluse dans le tag et est de la forme 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 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2011-02-03 10:40:42 UTC (rev 377) @@ -49,13 +49,14 @@ private static final Log log = LogFactory.getLog(GeneratorTemplatesFilterIn.class); - + GeneratorTemplatesFilter parent; - protected String beginParenthese = ""; - protected String endParenthese = ""; + protected String beginParenthese = EMPTY_STRING; + protected String endParenthese = EMPTY_STRING; + public GeneratorTemplatesFilterIn(GeneratorTemplatesFilter parent) { this.parent = parent; } @@ -64,8 +65,7 @@ * méthode appelée lorsqu'on a la chaîne entière entre le header et le * footer. * - * @param ch - * la chaîne trouvé + * @param ch la chaîne trouvé * @return ce qu'il faut écrire dans le fichier de sortie */ @Override @@ -74,8 +74,8 @@ beginParenthese = "("; endParenthese = ");"; } else { - beginParenthese = ""; - endParenthese = ""; + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; } if (ch.startsWith("=")) { return "\"+" + ch.substring(1) + "+\""; @@ -86,6 +86,7 @@ /** * Converti les fin de commentaire *) en fin normal de commentraire + * * @param ch la chaine a convertir * @return la chaine convertie */ @@ -98,8 +99,7 @@ * methode appele lorsqu'on a la chaine entiere a l'exterieur du * header/footer * - * @param ch - * la chaine trouve + * @param ch la chaine trouve * @return ce qu'il faut ecrire dans le fichier de sortie */ @Override @@ -108,13 +108,13 @@ beginParenthese = "("; endParenthese = ");"; } else { - beginParenthese = ""; - endParenthese = ""; + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; } String result = convertEndComment(ch).replaceAll("\"", "\\\\\"") .replaceAll("(\r\n|\n|\r)", - "\\\\n\"" + endParenthese + "\n" + - parent.getWriteString() + beginParenthese + "\""); + "\\\\n\"" + endParenthese + "\n" + + parent.getWriteString() + beginParenthese + "\""); // it's important that \r\n is first in regexp. return result; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -44,13 +44,15 @@ */ public abstract class LogsFilter extends DefaultFilter { - private String header = "/*"+"#"; - private String footer = "#"+"*/"; + private String header = "/*" + "#"; - protected String getHeader(){ + private String footer = "#" + "*/"; + + protected String getHeader() { return header; } - protected String getFooter(){ + + protected String getFooter() { return footer; } } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -42,36 +42,39 @@ public class OptimisationFilter extends DefaultFilter { // OptimisationFilter public OptimisationFilter() { - } private String header = "/*%"; + private String footer = "%*/"; - protected String getHeader(){ + protected String getHeader() { return header; } - protected String getFooter(){ + + protected String getFooter() { return footer; } /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performInFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performInFilter(String ch) { return ch; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performOutFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performOutFilter(String ch) { return EMPTY_STRING; } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java 2011-02-03 10:40:42 UTC (rev 377) @@ -45,22 +45,24 @@ public class RemoveLogsCodeFilter extends LogsFilter { /** - * methode appele lorsqu'on a la chaine entiere entre le header - * et le footer. - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performInFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere entre le header + * et le footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performInFilter(String ch) { return EMPTY_STRING; } /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * @param ch la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - protected String performOutFilter(String ch){ + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + protected String performOutFilter(String ch) { return ch; } Modified: trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java =================================================================== --- trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-02-03 10:26:18 UTC (rev 376) +++ trunk/nuiton-processor/src/test/java/org/nuiton/processor/filters/StringFilterTest.java 2011-02-03 10:40:42 UTC (rev 377) @@ -47,6 +47,7 @@ static private final Log log = LogFactory.getLog(StringFilterTest.class); protected static File basedir; + protected static File testdir; @BeforeClass @@ -56,7 +57,7 @@ "processor", "result"); boolean b = testdir.exists() || testdir.mkdirs(); if (!b) { - throw new IOException("Could not create directory : "+testdir); + throw new IOException("Could not create directory : " + testdir); } } @@ -77,7 +78,7 @@ checkPattern("+\" int i = 0;\\n\"", true, out, encoding); fileName = "StringFilterTest_1.java2"; resource = getClass().getResource(fileName); - in = new File(resource.toURI()).getAbsolutePath(); + in = new File(resource.toURI()).getAbsolutePath(); out = getFile(testdir, fileName); content = process(processor, in, out, encoding); if (log.isDebugEnabled()) {

1 0

r376 - in trunk: . nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: tchemit Date: 2011-02-03 11:26:18 +0100 (Thu, 03 Feb 2011) New Revision: 376 Url: http://nuiton.org/repositories/revision/processor/376 Log: remove redundant initializer clean pom Evolution #1280: Stay on jdk 1.5 (some projects need it) Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/pom.xml Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-01-31 08:11:58 UTC (rev 375) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2011-02-03 10:26:18 UTC (rev 376) @@ -60,7 +60,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(DefaultFilter.class); - protected LineNumberReader reader = null; + protected LineNumberReader reader; /** * le buffer interne pour conserve ce qui n'a pas encore été écrit Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-31 08:11:58 UTC (rev 375) +++ trunk/pom.xml 2011-02-03 10:26:18 UTC (rev 376) @@ -245,6 +245,10 @@ <properties>  <projectId>processor</projectId> + +  + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> </properties> @@ -262,21 +266,4 @@ <url>http://www.nuiton.org/repositories/browse/processor/trunk</url> </scm> - <build> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/THIRD-PARTY.properties</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </project>

1 0