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 41679802984f7e8ee660fd3f7e4d142e7a6228d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 18 11:23:15 2014 +0200 fixes #3503: Define a global CSS file --- .../main/java/jaxx/compiler/CompilerConfiguration.java | 6 ++++++ .../java/jaxx/compiler/DefaultCompilerConfiguration.java | 16 ++++++++++++++++ .../java/jaxx/compiler/tasks/CompileFirstPassTask.java | 9 +++++++++ .../main/java/org/nuiton/jaxx/plugin/GenerateMojo.java | 13 +++++++++++++ 4 files changed, 44 insertions(+) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java index cc6dd44..efc8214 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java @@ -145,4 +145,10 @@ public interface CompilerConfiguration { Map<String, JAXXCompilerFinalizer> getFinalizers(); Map<String, Initializer> getInitializers(); + + /** + * @return the optional common css to inject in all JaxxCompiler. + * @since 2.13 + */ + File getCommonCss(); } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java index 629513c..419ddfb 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java @@ -137,6 +137,13 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { */ private boolean addAutoHandlerUI; + /** + * Optional common css. + * + * @since 2.13 + */ + private File commonCss; + @Override public File getTargetDirectory() { return targetDirectory; @@ -324,6 +331,15 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { } @Override + public File getCommonCss() { + return commonCss; + } + + public void setCommonCss(File commonCss) { + this.commonCss = commonCss; + } + + @Override public boolean isAutoRecurseInCss() { return autoRecurseInCss; } 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 61650d4..a16a91b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java @@ -108,6 +108,15 @@ public class CompileFirstPassTask extends JAXXEngineTask { compiler.registerStyleSheetFile(cssFile, false); } } + + File commonCss = engine.getConfiguration().getCommonCss(); + if (commonCss != null) { + if (isVerbose) { + log.info("Import global css: " + commonCss); + } + compiler.registerStyleSheetFile(commonCss, false); + } + addEndProfileTime(engine, compiler); if (compiler.isFailed()) { 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 c436580..7b3de10 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 @@ -302,6 +302,14 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat private boolean addAutoHandlerUI; /** + * A optional common css to inject in all jaxx files. + * + * @since 2.13 + */ + @Parameter(property = "jaxx.commonCss") + private File commonCss; + + /** * Decorators available in engine. * * @since 2.0.2 @@ -646,6 +654,11 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat return initializers; } + @Override + public File getCommonCss() { + return commonCss; + } + public JAXXEngine getEngine() { return engine; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.