[jaxx] branch develop updated (32ab3e9 -> d8f9bf6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 32ab3e9 fixes #3456: Bad message when using autoImportCss and use others css new 528f673 fixes #3459: Remove warning when a css is not associated to a jaxx file new d8f9bf6 fixes #3458: Remove the autoCssImport option + renmae treatEFile method The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d8f9bf61df9f5ad6143f6b611282a45379fe233a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 24 13:56:28 2014 +0200 fixes #3458: Remove the autoCssImport option + renmae treatEFile method commit 528f6739715cc405eee9e2af280e55661bbee28e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 22 10:41:39 2014 +0200 fixes #3459: Remove warning when a css is not associated to a jaxx file Summary of changes: .../main/java/jaxx/compiler/CompilerConfiguration.java | 11 +---------- .../java/jaxx/compiler/DefaultCompilerConfiguration.java | 7 ------- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 1 - .../java/jaxx/compiler/tasks/CompileFirstPassTask.java | 7 +++---- .../java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 1 - .../main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 16 ---------------- 6 files changed, 4 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 528f6739715cc405eee9e2af280e55661bbee28e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 22 10:41:39 2014 +0200 fixes #3459: Remove warning when a css is not associated to a jaxx file --- .../src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index 26cca78..fd8d71e 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -410,9 +410,6 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat f); } filterFiles.add(jaxxFilePath); - } else { - getLog().warn("can not find jaxx file corresponding " + - "to modified css file " + path); } continue; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit d8f9bf61df9f5ad6143f6b611282a45379fe233a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 24 13:56:28 2014 +0200 fixes #3458: Remove the autoCssImport option + renmae treatEFile method --- .../src/main/java/jaxx/compiler/CompilerConfiguration.java | 11 +---------- .../java/jaxx/compiler/DefaultCompilerConfiguration.java | 7 ------- jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java | 1 - .../main/java/jaxx/compiler/tasks/CompileFirstPassTask.java | 7 +++---- .../main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java | 1 - .../src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 13 ------------- 6 files changed, 4 insertions(+), 36 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java index 376ee3e..cc6dd44 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java @@ -77,15 +77,6 @@ public interface CompilerConfiguration { boolean getOptimize(); /** - * Returns whether or not auto css should be used. - * - * @return {@code true} if a css file with same name as jaxx file should - * be included in jaxx file if found. - * @since 2.0.2 - */ - boolean isAutoImportCss(); - - /** * Returns whether or not should recurse in css for existing JAXX Object. * <p/> * <b>Note:</b> This functionnality was here at the beginning of the project @@ -141,7 +132,7 @@ public interface CompilerConfiguration { boolean isAddAutoHandlerUI(); /** - * @param addAutoHandlerUI + * @param addAutoHandlerUI new value of the state * @since 2.6 */ void setAddAutoHandlerUI(boolean addAutoHandlerUI); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java index 2c628b8..629513c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java @@ -112,8 +112,6 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { /** Encoding to use to write files */ private String encoding; - private boolean autoImportCss; - private boolean autoRecurseInCss; /** decorators available in engine */ @@ -326,11 +324,6 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { } @Override - public boolean isAutoImportCss() { - return autoImportCss; - } - - @Override public boolean isAutoRecurseInCss() { return autoRecurseInCss; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java index 31cfd4d..e848a18 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java @@ -280,7 +280,6 @@ public class JAXXCompiler { /** * Flag to know if jaxx file ident css was found, otherwise add it - * when {@link CompilerConfiguration#isAutoImportCss()} is sets to {@code true} * at the end of the second compile pass. * * @since 2.0.2 diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java index ee691cc..61650d4 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java @@ -21,7 +21,6 @@ */ package jaxx.compiler.tasks; -import jaxx.compiler.CompilerConfiguration; import jaxx.compiler.JAXXCompiler; import jaxx.compiler.JAXXCompilerFile; import jaxx.compiler.JAXXEngine; @@ -60,7 +59,7 @@ public class CompileFirstPassTask extends JAXXEngineTask { for (JAXXCompilerFile jaxxFile : undone) { - boolean successForFile = treateFile(engine, jaxxFile); + boolean successForFile = treatFile(engine, jaxxFile); if (!successForFile) { @@ -75,8 +74,8 @@ public class CompileFirstPassTask extends JAXXEngineTask { return success; } - protected boolean treateFile(JAXXEngine engine, - JAXXCompilerFile jaxxFile) throws Exception { + protected boolean treatFile(JAXXEngine engine, + JAXXCompilerFile jaxxFile) throws Exception { boolean isVerbose = engine.isVerbose(); diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java index c77a6fa..0e2f98e 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java @@ -21,7 +21,6 @@ */ package org.nuiton.jaxx.plugin; -import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.nuiton.io.MirroredFileUpdater; diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index fd8d71e..c436580 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -191,14 +191,6 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat protected boolean optimize; /** - * To auto import css files for a jaxx file. - * - * @since 2.0.2 - */ - @Parameter(property = "jaxx.autoImportCss", defaultValue = "false") - protected boolean autoImportCss; - - /** * To let jaxx recurses in css when a JAXX Object auto import css files * for a jaxx file. * <p/> @@ -545,11 +537,6 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat } @Override - public boolean isAutoImportCss() { - return autoImportCss; - } - - @Override public boolean isAutoRecurseInCss() { return autoRecurseInCss; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm