This is an automated email from the git hooks/post-receive script. New commit to branch feature/3740_missing_ids_in_css in repository jaxx. See http://git.nuiton.org/jaxx.git commit 79c9c7f01142bfea42656233a399f3d43d04f911 Author: Kevin Morin <morin@codelutin.com> Date: Sun Feb 21 16:52:40 2016 +0100 fix de la regexp (fixes #3740) --- .../compiler/tasks/GenerateMissingRulesTask.java | 15 +++++++------ jaxx-test/src/main/java/jaxx/demo/DemoUI.css | 26 +++++++--------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java index f338f9e..3f62397 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java @@ -83,33 +83,34 @@ public class GenerateMissingRulesTask extends JAXXEngineTask { for (String id : objects.keySet()) { + CompiledObject object = objects.get(id); + String styleClass = object.getStyleClass(); + if (log.isInfoEnabled()) { - log.info("id : " + id); + log.info("id : " + id + ", styleClass : " + styleClass); } if (!id.startsWith("$")) { - Pattern idPattern = Pattern.compile("#" + id + "\\s?\\{.*\\}", Pattern.DOTALL); + Pattern idPattern = Pattern.compile("#" + id + "\\s*\\{.*\\}", Pattern.DOTALL); Matcher idMatcher = idPattern.matcher(cssContent); if (!idMatcher.find()) { if (log.isInfoEnabled()) { log.info("add css rule for #" + id + " in " + cssFile.getName()); } - cssRulesToAdd.add( "\n\n/* #" + id + " { } */"); + cssRulesToAdd.add( "\n\n/* #" + id + " {} */"); } } - CompiledObject object = objects.get(id); - String styleClass = object.getStyleClass(); if (styleClass != null) { - Pattern classPattern = Pattern.compile("\\." + styleClass + "\\s?\\{.*\\}", Pattern.DOTALL); + Pattern classPattern = Pattern.compile("\\." + styleClass + "\\s*\\{.*\\}", Pattern.DOTALL); Matcher classMatcher = classPattern.matcher(cssContent); if (!classMatcher.find()) { if (log.isInfoEnabled()) { log.info("add css rule for ." + styleClass + " in " + cssFile.getName()); } - cssRulesToAdd.add( "\n\n/* ." + styleClass + " { } */"); + cssRulesToAdd.add( "\n\n/* ." + styleClass + " {} */"); } } diff --git a/jaxx-test/src/main/java/jaxx/demo/DemoUI.css b/jaxx-test/src/main/java/jaxx/demo/DemoUI.css index d92d306..2fc86af 100644 --- a/jaxx-test/src/main/java/jaxx/demo/DemoUI.css +++ b/jaxx-test/src/main/java/jaxx/demo/DemoUI.css @@ -177,26 +177,16 @@ JSplitPane { }*/ -/* .help { } */ - -/* #p { } */ - -/* .menu { } */ - -/* #mainPane { } */ - -/* #navigation { } */ - -/* #splitPane { } */ - -/* .help { } */ +.menu { + borderPainted: false; +} -/* #p { } */ +/* .help {} */ -/* .menu { } */ +/* #mainPane {} */ -/* #mainPane { } */ +/* #splitPane {} */ -/* #navigation { } */ +/* #navigation {} */ -/* #splitPane { } */ \ No newline at end of file +/* #p {} */ \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.