August 2009 - Processor-commits - mailman.cloud.codelutin.com

r269 - in trunk/maven-processor-plugin/src/main/java/org/nuiton/processor: ant plugin
by tchemit＠users.nuiton.org 29 Aug '09

29 Aug '09

Author: tchemit Date: 2009-08-29 18:53:36 +0200 (Sat, 29 Aug 2009) New Revision: 269 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java Log: java header is not a javadoc comment Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java 2009-08-29 16:46:57 UTC (rev 268) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java 2009-08-29 16:53:36 UTC (rev 269) @@ -1,4 +1,5 @@ -/* *##% +/* + * *##% * Nuiton processor maven plugin * Copyright (C) 2006 - 2009 CodeLutin * @@ -15,7 +16,8 @@ * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* */ + * ##%* + */ package org.nuiton.processor.ant; Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:46:57 UTC (rev 268) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:53:36 UTC (rev 269) @@ -1,4 +1,5 @@ -/* *##% +/* + * *##% * Nuiton processor maven plugin * Copyright (C) 2006 - 2009 CodeLutin * @@ -15,7 +16,8 @@ * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%*/ + * ##%* + */ package org.nuiton.processor.plugin; import java.io.File;

1 0

r268 - in trunk: . maven-processor-plugin maven-processor-plugin/src/main/java/org/nuiton/processor/ant maven-processor-plugin/src/main/java/org/nuiton/processor/plugin nuiton-processor nuiton-processor/src/main/java/org/nuiton/processor nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 29 Aug '09

29 Aug '09

Author: tchemit Date: 2009-08-29 18:46:57 +0200 (Sat, 29 Aug 2009) New Revision: 268 Modified: trunk/maven-processor-plugin/pom.xml trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java trunk/nuiton-processor/pom.xml trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.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/ProcessorUtil.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.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/pom.xml Log: update license header Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/maven-processor-plugin/pom.xml 2009-08-29 16:46:57 UTC (rev 268) @@ -70,7 +70,7 @@    - <name>nuiton-processor - maven plugin</name> + <name>Nuiton processor maven plugin</name> <inceptionYear>2006</inceptionYear>  Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/I18nExtractorTask.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,5 @@ -/* *##% nuiton-processor - maven plugin +/* *##% + * Nuiton processor maven plugin * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +14,8 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* */ package org.nuiton.processor.ant; Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,5 +1,6 @@ /* - * *##% nuiton-processor - maven plugin + * *##% + * Nuiton processor maven plugin * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -14,7 +15,8 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* */ package org.nuiton.processor.ant; Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,5 @@ -/* *##% nuiton-processor - maven plugin +/* *##% + * Nuiton processor maven plugin * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +14,8 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%*/ package org.nuiton.processor.plugin; import java.io.File; Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/pom.xml 2009-08-29 16:46:57 UTC (rev 268) @@ -29,7 +29,7 @@   - <name>nuiton-processor - lib</name> + <name>Nuiton processor library</name> <description> Cette librairie permet la création de filtre sur les fichiers sources. </description> Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/GeneratorTemplatesProcessor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * GeneratorTemplatesProcessor.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/I18nExtractor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * I18nExtractor.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LicenseProcessor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ package org.nuiton.processor; import org.nuiton.processor.filters.LicenseFilter; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/LogsProcessor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * LogsProcessor.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/OptimisationProcessor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * OptimisationProcessor.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * Processor.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * ProcessorReader.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorUtil.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ package org.nuiton.processor; import org.nuiton.processor.filters.Filter; Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorWriter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /** * ProcessorWriter.java 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/ActiveLogsCodeFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* x* * ActiveLogsCodeFilter.java 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /******************************************************************************* * DefaultFilter.java * Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * Filter.java 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * GeneratorTemplatesFilter.java 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-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/GeneratorTemplatesFilterIn.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * GeneratorTemplatesFilterIn.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/I18nFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /******************************************************************************* * I18nFilter.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ package org.nuiton.processor.filters; import org.apache.commons.logging.Log; 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LogsFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * LogsFilter.java Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * NoActionFilter.java 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/OptimisationFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * OptimisationFilter.java 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 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/RemoveLogsCodeFilter.java 2009-08-29 16:46:57 UTC (rev 268) @@ -1,4 +1,6 @@ -/* *##% nuiton-processor - lib +/* + * *##% + * Nuiton processor library * Copyright (C) 2002 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -13,7 +15,9 @@ * * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ /* * * RemoveLogsCodeFilter.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-29 16:26:44 UTC (rev 267) +++ trunk/pom.xml 2009-08-29 16:46:57 UTC (rev 268) @@ -90,7 +90,7 @@    - <name>nuiton-processor - pom</name> + <name>Nuiton processor project</name> <description>Efficient Universal Processor</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/processor</url>

1 0

r267 - in trunk/maven-processor-plugin/src/main/java/org/nuiton/processor: ant plugin
by tchemit＠users.nuiton.org 29 Aug '09

29 Aug '09

Author: tchemit Date: 2009-08-29 18:26:44 +0200 (Sat, 29 Aug 2009) New Revision: 267 Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java Log: add comment + remove commented obsolete code Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 15:50:38 UTC (rev 266) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/ant/ProcessorTask.java 2009-08-29 16:26:44 UTC (rev 267) @@ -33,14 +33,15 @@ * Tache ant pour lutinprocessor. * * To use this task, put this code in ant build file: - * + * <pre> * <taskdef name="processor" classname="org.nuiton.processor.ant.ProcessorTask" * classpath="lib/lutinprocessor.jar" /> + * </pre> * * and use it with: - * + * <pre> * <processor srcdir="${src}" destdir="${targetgen}" filters="org.nuiton.processor.filters.GeneratorTemplatesFilter" /> - * + * </pre> * Created: 14 janv. 2004 * * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin @@ -183,13 +184,13 @@ // Obtain this list of files within the source directory DirectoryScanner ds = getDirectoryScanner(srcDir); - String[] includes = getIncludes(); - if (includes.length > 0) { - ds.setIncludes(includes); + String[] in = getIncludes(); + if (in.length > 0) { + ds.setIncludes(in); } - String[] excludes = getExcludes(); - if (excludes.length > 0) { - ds.setExcludes(excludes); + String[] ex = getExcludes(); + if (ex.length > 0) { + ds.setExcludes(ex); } ds.scan(); Modified: trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 15:50:38 UTC (rev 266) +++ trunk/maven-processor-plugin/src/main/java/org/nuiton/processor/plugin/ProcessorPlugin.java 2009-08-29 16:26:44 UTC (rev 267) @@ -123,16 +123,7 @@ * @since 0.10 */ private boolean verbose; -// /** -// * Flag pour indiquer si on doit ajouter le repertoire de generation dans les répertoires -// * de compilation du project Maven Nom par défaut du paquetage généré -// * <p/> -// * TODO Ce flag doit disparaitre dans la prochaine release (uniquement utilisée pour compatibilité) -// * -// * @parameter expression="${processor.addCompileDirectory}" default-value="false" -// * @since 0.16 -// */ -// protected boolean addCompileDirectory; + protected Map<String, String> filesToTreate; public ProcessorPlugin() { @@ -201,74 +192,12 @@ processor.process(new FileReader(srcFile), new FileWriter(dstFile)); } + // on indique que le repertoire entrant n'est plus dans le build + // car sinon on va avoir des classes dupliquées removeCompileSourceRoots(srcDir); + + // le repertoire sortant est dans le build de maven addCompileSourceRoots(destDir); } -// @Override -// public void execute() throws MojoExecutionException { -// getLog().info("Génération des fichiers à partir de lutin processor"); -// -// /* Création d'un projet ant */ -// Project antProject = new Project(); -// -// BuildLogger logger = new NoBannerLogger(); -// logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); -// logger.setOutputPrintStream(System.out); -// logger.setErrorPrintStream(System.err); -// -// antProject.init(); -// antProject.getBaseDir(); -// antProject.addBuildListener(logger); -// -// /* Création de la tâche ant ProcessorTask */ -// ProcessorTask processor = new ProcessorTask(); -// processor.setProject(antProject); -// processor.setTaskName("Processor"); -// -// if (verbose) { -// getLog().info("srcDir is " + srcDir); -// getLog().info("destDir is " + destDir); -// } -// -// /* Configuration */ -// processor.setVerbose(verbose); -// processor.setSrcdir(srcDir); -// destDir.mkdirs(); -// processor.setDestdir(destDir); -// -// processor.setFileInPattern(fileInPattern); -// processor.setFileOutPattern(fileOutPattern); -// -// processor.setIncludes(includes); -// processor.setExcludes(excludes); -// -// processor.setFilters(filters); -// -// processor.setOverwrite(overwrite); -// -// /* Execution */ -// processor.execute(); -// -// if (addCompileDirectory) { -// fixCompileSourceRoots(); -// } -// } -// /** -// * permet d'ajout le répertoire de génération des fichiers java dans les répertoires -// * de compilation du projet Maven. -// */ -// protected void fixCompileSourceRoots() { -// if (project.getCompileSourceRoots().contains(srcDir.getPath())) { -// if (verbose) { -// getLog().info("srcDir found in compileSourceRoots, removing : " + srcDir.getPath()); -// } -// project.getCompileSourceRoots().remove(srcDir.getPath()); -// } -// if (!project.getCompileSourceRoots().contains(destDir.getPath())) { -// if (verbose) { -// getLog().info("destDir not found in compileSourceRoots, adding : " + destDir.getPath()); -// } -// project.addCompileSourceRoot(destDir.getPath()); -// } -// } + }

1 0

r266 - trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 29 Aug '09

29 Aug '09

Author: tchemit Date: 2009-08-29 17:50:38 +0200 (Sat, 29 Aug 2009) New Revision: 266 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java Log: - fix LicenseFilter error : can not process fil if open processor tag is found twice (for any cases) Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-26 20:10:33 UTC (rev 265) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-29 15:50:38 UTC (rev 266) @@ -51,12 +51,12 @@ if (log.isDebugEnabled()) { log.debug(ch); } + if (touched) { + // on autorise pas deux process de la licence dans un fichier java + throw new IllegalStateException("Can only have one license processor open tag " + LicenseFilter.HEADER); + } if (getMatchIndexFor(ch, HEADER) == NOT_FOUND) { // on est bien dans la license, on peut effectuer le changement - if (touched) { - // on autorise pas deux process de la licence dans un fichier java - throw new IllegalStateException("has find more than once the license processor tags in a file"); - } touched = true; return HEADER + licenseHeader + FOOTER; }

1 0

r265 - trunk
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 22:10:33 +0200 (Wed, 26 Aug 2009) New Revision: 265 Modified: trunk/pom.xml Log: use common-loggin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-26 20:10:08 UTC (rev 264) +++ trunk/pom.xml 2009-08-26 20:10:33 UTC (rev 265) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <artifactId>processor</artifactId> @@ -24,6 +24,13 @@ <dependencies> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version>

1 0

r264 - trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 22:10:08 +0200 (Wed, 26 Aug 2009) New Revision: 264 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java Log: fix BUG #27 on maven-license-plugin Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-26 20:09:20 UTC (rev 263) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/LicenseFilter.java 2009-08-26 20:10:08 UTC (rev 264) @@ -16,6 +16,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ package org.nuiton.processor.filters; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Un filtre pour remplacer la license d'un fichier source java. * <p/> @@ -25,6 +28,8 @@ */ public class LicenseFilter extends DefaultFilter { + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(LicenseFilter.class); public static final String HEADER = "*" + "#" + "#" + "%"; public static final String FOOTER = "#" + "#" + "%" + "*"; /** @@ -32,40 +37,73 @@ * commence par un ' * ', sauf pour la premiere et derniere ligne). */ protected String licenseHeader; - /** flag pour indiquer si la licence a ete trouvee entre le header et le footer */ protected boolean touched; + /** flag pour indiquer si on a rencontree le header du filtre */ + protected boolean detectHeader; public LicenseFilter(String licenseHeader) { this.licenseHeader = " " + licenseHeader + " "; } + @Override protected String performInFilter(String ch) { - if (touched) { - // on autorise pas deux process de la licence dans un fichier java - throw new IllegalStateException("has find more than once the license processor tags in a file"); + if (log.isDebugEnabled()) { + log.debug(ch); } - touched = true; - return HEADER + licenseHeader + FOOTER; + if (getMatchIndexFor(ch, HEADER) == NOT_FOUND) { + // on est bien dans la license, on peut effectuer le changement + if (touched) { + // on autorise pas deux process de la licence dans un fichier java + throw new IllegalStateException("has find more than once the license processor tags in a file"); + } + touched = true; + return HEADER + licenseHeader + FOOTER; + } + // ce cas arrive lorsque l'on a parcouru tout le fichier avec detection + // de la balise header mais sans balise footer + // et on arrive dans cette methode dans le flush du filter + return ch; } + @Override protected String performOutFilter(String ch) { + if (log.isDebugEnabled()) { + log.debug(ch); + } return ch; } + @Override protected String getHeader() { return HEADER; } + @Override protected String getFooter() { return FOOTER; } + @Override + protected void changeState(State newState) { + super.changeState(newState); + if (newState == State.SEARCH_FOOTER) { + // on a decouvert un header + detectHeader = true; + } + } + public boolean wasTouched() { return touched; } + public boolean isDetectHeader() { + return detectHeader; + } + public void reset() { touched = false; + detectHeader = false; + state = State.SEARCH_HEADER; } }

1 0

r263 - trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 22:09:20 +0200 (Wed, 26 Aug 2009) New Revision: 263 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java Log: clean code 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 2009-08-26 19:10:45 UTC (rev 262) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2009-08-26 20:09:20 UTC (rev 263) @@ -124,7 +124,6 @@ buffer.append(performInFilter(performHeaderFooterFilter(content.substring(0, matchingEndIndex)))); buffer.append(parse(content.substring(matchingEndIndex))); return buffer.toString(); -// return performInFilter(performHeaderFooterFilter(content.substring(0, matchingEndIndex))) + parse(content.substring(matchingEndIndex)); } // No footer found ! return EMPTY_STRING;

1 0

r262 - trunk/nuiton-processor
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 21:10:45 +0200 (Wed, 26 Aug 2009) New Revision: 262 Modified: trunk/nuiton-processor/pom.xml Log: use common-loggin Modified: trunk/nuiton-processor/pom.xml =================================================================== --- trunk/nuiton-processor/pom.xml 2009-08-26 19:08:21 UTC (rev 261) +++ trunk/nuiton-processor/pom.xml 2009-08-26 19:10:45 UTC (rev 262) @@ -16,6 +16,15 @@ <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + </dependencies> +

1 0

r261 - trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 21:08:21 +0200 (Wed, 26 Aug 2009) New Revision: 261 Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java Log: refactor DefaultFilter class 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 2009-08-26 19:07:41 UTC (rev 260) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/DefaultFilter.java 2009-08-26 19:08:21 UTC (rev 261) @@ -16,35 +16,80 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ /******************************************************************************* * DefaultFilter.java - * + * * Created: Wed Sep 4 2002 - * + * * @author <poussin(a)codelutin.com>Copyright Code Lutin - * + * * @version $Revision$ - * + * * Mise a jour: $Date$ par : $Author$ */ package org.nuiton.processor.filters; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A common astract filter. + * + * Implements the methods : + * <ul> + * <li>{@link #getHeader()}</li> + * <li>{@link #getFooter()}</li> + * <li>{@link #performInFilter(String)}</li> + * <li>{@link #performOutFilter(String)}</li> + * </ul> + * + * @author poussin + */ public abstract class DefaultFilter implements Filter { // DefaultFilter - public static int NOT_FOUND = -1; + public final static int NOT_FOUND = -1; + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(DefaultFilter.class); + /** + * le buffer interne pour conserve ce qui n'a pas encore été écrit + */ protected StringBuffer cachedContent = new StringBuffer(); - public DefaultFilter() { - } - /** Type of states */ - protected static class State { + protected enum State { /** Looking-for-header state */ - public final static State SEARCH_HEADER = new State(); + SEARCH_HEADER, /** Looking-for-footer state */ - public final static State SEARCH_FOOTER = new State(); + SEARCH_FOOTER; } - protected State currentState = State.SEARCH_HEADER; + /** + * l'état interne du filtre + */ + protected State state = State.SEARCH_HEADER; + /** + * 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 + */ + abstract protected String performInFilter(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 + */ + abstract protected String performOutFilter(String ch); + + /** @return la chaine du header */ + abstract protected String getHeader(); + + /** @return la chaine du footer */ + abstract protected String getFooter(); + @Override public String parse(String input) { int matchingIndex; @@ -53,34 +98,38 @@ cachedContent.append(input); String content = cachedContent.toString(); - if (currentState.equals(State.SEARCH_HEADER)) { + if (state.equals(State.SEARCH_HEADER)) { // Looking for a header matchingIndex = getMatchIndexFor(content, getHeader()); if (matchingIndex != NOT_FOUND) { // Header found, return "out" part of it + recursive process of remaining chars - currentState = State.SEARCH_FOOTER; - cachedContent.setLength(0); - return performOutFilter(content.substring(0, matchingIndex)) + parse(content.substring(matchingIndex)); + changeState(State.SEARCH_FOOTER); + StringBuilder buffer = new StringBuilder(); + buffer.append(performOutFilter(content.substring(0, matchingIndex))); + buffer.append(parse(content.substring(matchingIndex))); + return buffer.toString(); } // No header found ! return EMPTY_STRING; } - if (currentState.equals(State.SEARCH_FOOTER)) { + if (state.equals(State.SEARCH_FOOTER)) { // Looking for a footer matchingIndex = getMatchIndexFor(content, getFooter()); if (matchingIndex != NOT_FOUND) { // Footer found, return "in" part of it + recursive process of remaining chars - currentState = State.SEARCH_HEADER; - cachedContent.setLength(0); + changeState(State.SEARCH_HEADER); int matchingEndIndex = matchingIndex + getMatchLengthFor(getFooter()); - return performInFilter(performHeaderFooterFilter(content.substring(0, matchingEndIndex))) + parse(content.substring(matchingEndIndex)); + StringBuilder buffer = new StringBuilder(); + buffer.append(performInFilter(performHeaderFooterFilter(content.substring(0, matchingEndIndex)))); + buffer.append(parse(content.substring(matchingEndIndex))); + return buffer.toString(); +// return performInFilter(performHeaderFooterFilter(content.substring(0, matchingEndIndex))) + parse(content.substring(matchingEndIndex)); } // No footer found ! return EMPTY_STRING; } - - return "INVALID STATE in DefaultFilter !"; + throw new IllegalStateException("state " + state + " is unkwon..."); } public String performHeaderFooterFilter(String ch) { @@ -106,35 +155,20 @@ // Empty the cache, cachedContent.setLength(0); // and returns its content - if (currentState.equals(State.SEARCH_HEADER)) { + if (state.equals(State.SEARCH_HEADER)) { return performOutFilter(line); } return performInFilter(line); } - /** - * 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 - */ - abstract protected String performInFilter(String ch); + protected void changeState(State newState) { + if (log.isDebugEnabled()) { + log.debug("change state : <old:" + this.state + ", new:" + newState + ">"); + } - /** - * 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 - */ - abstract protected String performOutFilter(String ch); + this.state = newState; + // le changement d'état réinitialise toujours le buffer interne + cachedContent.setLength(0); + } +} // DefaultFilter - /** @return la chaine du header */ - abstract protected String getHeader(); - - /** @return la chaine du footer */ - abstract protected String getFooter(); -} // DefaultFilter

1 0

r260 - in trunk/nuiton-processor/src/main/java/org/nuiton/processor: . filters
by tchemit＠users.nuiton.org 26 Aug '09

26 Aug '09

Author: tchemit Date: 2009-08-26 21:07:41 +0200 (Wed, 26 Aug 2009) New Revision: 260 Modified: 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/Filter.java trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java Log: - reformat code - add javadoc - use Log from commons-logging instead of Logger api Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2009-08-22 23:01:22 UTC (rev 259) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/Processor.java 2009-08-26 19:07:41 UTC (rev 260) @@ -32,16 +32,18 @@ import org.nuiton.processor.filters.*; import org.nuiton.processor.filters.Filter; import java.io.*; -import java.util.logging.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; -/* - * This class is a generic sources processor - * Given a reader class name and a writer class name +/** + * This class is a generic sources processor given + * a reader class name and a writer class name. + * */ public class Processor { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Logger log = Logger.getLogger("org.nuiton.processor.Processor"); + static private final Log log = LogFactory.getLog(Processor.class); protected Filter[] inputFilter = new Filter[]{new NoActionFilter()}; protected Filter outputFilter = new NoActionFilter(); @@ -72,23 +74,31 @@ return result; } - /** Process all available data - * @param externalInput - * @param externalOutput + /** + * Process all available data. + * + * @param externalInput the reader + * @param externalOutput the writer * @throws IOException if any pb */ public void process(Reader externalInput, Writer externalOutput) throws IOException { - log.finest("Debug du process"); + if (log.isTraceEnabled()) { + log.trace("Debug du process"); + } BufferedReader input = getReader(externalInput); ProcessorWriter output = new ProcessorWriter(new BufferedWriter(externalOutput), outputFilter); - log.finest("input: " + input); - log.finest("output: " + output); + if (log.isTraceEnabled()) { + log.trace("input: " + input); + log.trace("output: " + output); + } String line = input.readLine(); while (line != null) { - log.finest("Ligne lu: " + line); + if (log.isTraceEnabled()) { + log.trace("Ligne lu: " + line); + } output.writeLine(line); line = input.readLine(); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2009-08-22 23:01:22 UTC (rev 259) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/ProcessorReader.java 2009-08-26 19:07:41 UTC (rev 260) @@ -16,18 +16,17 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ /* * -* ProcessorReader.java -* -* Created: Wed Jan 14 2004 -* -* @author <poussin(a)codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - + * ProcessorReader.java + * + * Created: Wed Jan 14 2004 + * + * @author <poussin(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ package org.nuiton.processor; import java.io.BufferedReader; @@ -36,13 +35,18 @@ import org.nuiton.processor.filters.Filter; +/** + * TODO doc. + * + * @author poussin + */ public class ProcessorReader extends BufferedReader { protected BufferedReader input; protected Filter filter; protected String lineSeparator; - protected ProcessorReader(){ + protected ProcessorReader() { super(new StringReader("")); } @@ -53,12 +57,12 @@ lineSeparator = System.getProperty("line.separator"); } - public void setInput(BufferedReader input){ + public void setInput(BufferedReader input) { this.input = input; } @Override - public boolean markSupported(){ + public boolean markSupported() { return false; } @@ -66,18 +70,18 @@ public String readLine() throws IOException { if (input.ready()) { String line = input.readLine(); - if(line != null){ - if (!(input instanceof ProcessorReader)){ + if (line != null) { + if (!(input instanceof ProcessorReader)) { line += lineSeparator; } - return filter.parse(line); + String parse = filter.parse(line); + return parse; } } - if(filter.hasCachedData()){ + if (filter.hasCachedData()) { return filter.flush(); - } else { - return null; } + return null; } @Override @@ -97,5 +101,4 @@ public void close() throws IOException { input.close(); } - } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2009-08-22 23:01:22 UTC (rev 259) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/Filter.java 2009-08-26 19:07:41 UTC (rev 260) @@ -16,26 +16,44 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ /* * -* Filter.java -* -* Created: Wed Jan 14 2004 -* -* @author <poussin(a)codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - + * Filter.java + * + * Created: Wed Jan 14 2004 + * + * @author <poussin(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ package org.nuiton.processor.filters; +/** + * TODO doc + * + * @author poussin + */ public interface Filter { final static String EMPTY_STRING = ""; - String parse (String input); + /** + * + * @param input la chaine de caractère à processer + * @return la chaine processée + */ + String parse(String input); + + /** + * + * @return <code>true</code> si le filtre contient des données en cache + */ boolean hasCachedData(); - String flush (); + /** + * + * @return la chaine de caractères + */ + String flush(); } Modified: trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java =================================================================== --- trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2009-08-22 23:01:22 UTC (rev 259) +++ trunk/nuiton-processor/src/main/java/org/nuiton/processor/filters/NoActionFilter.java 2009-08-26 19:07:41 UTC (rev 260) @@ -16,35 +16,37 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ /* * -* NoActionFilter.java -* -* Created: Wed Jan 14 2004 -* -* @author <poussin(a)codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - + * NoActionFilter.java + * + * Created: Wed Jan 14 2004 + * + * @author <poussin(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ package org.nuiton.processor.filters; -/* -* This class deals with the -*/ +/** + * This filter does nothing on input. + * + */ public class NoActionFilter implements Filter { - public String parse (String input) { + @Override + public String parse(String input) { return input; } - public boolean hasCachedData(){ + @Override + public boolean hasCachedData() { return false; } - public String flush (){ - return EMPTY_STRING; + @Override + public String flush() { + return DefaultFilter.EMPTY_STRING; } - }

1 0