[jaxx] branch develop updated (05086db -> 32ab3e9)
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 05086db fixes #3455: Add more useful method on org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel new 10d6965 fix method name new 32ab3e9 fixes #3456: Bad message when using autoImportCss and use others css 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 32ab3e9d482ff651a12e482fe7dd814c09f5d717 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 21 17:12:00 2014 +0200 fixes #3456: Bad message when using autoImportCss and use others css commit 10d6965590b63d71e9a46353cdd85b67472c0d1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 21 16:10:31 2014 +0200 fix method name Summary of changes: .../swing/AbstractApplicationFormUIModel.java | 8 +++--- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 31 +++++++++------------- .../main/java/jaxx/compiler/tags/StyleHandler.java | 18 +------------ .../jaxx/compiler/tasks/CompileFirstPassTask.java | 8 ++---- 4 files changed, 19 insertions(+), 46 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 10d6965590b63d71e9a46353cdd85b67472c0d1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 21 16:10:31 2014 +0200 fix method name --- .../jaxx/application/swing/AbstractApplicationFormUIModel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java index 34f19b5..3f9762e 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationFormUIModel.java @@ -58,7 +58,7 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic public static final String PROPERTY_CREATE = "create"; - public static final Set<String> MODIFY_IGNORE_PROPERTIES = + public static final ImmutableSet<String> MODIFY_IGNORE_PROPERTIES = ImmutableSet.copyOf(Sets.newHashSet( PROPERTY_MODIFY, PROPERTY_VALID, @@ -206,7 +206,7 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic /** * @return set of property names that will not change the modify state. */ - protected Set<String> getModifyIgnorePropertiyNames() { + protected Set<String> getModifyIgnorePropertyNames() { return MODIFY_IGNORE_PROPERTIES; } @@ -227,7 +227,7 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic public final <B extends JavaBeanObject> void listenModelIsModify(B... javaBeanObjects) { - ModifyPropertyChangeListener listener = new ModifyPropertyChangeListener(this, getModifyIgnorePropertiyNames()); + ModifyPropertyChangeListener listener = new ModifyPropertyChangeListener(this, getModifyIgnorePropertyNames()); for (B javaBeanObject : javaBeanObjects) { javaBeanObject.addPropertyChangeListener(listener); } @@ -236,7 +236,7 @@ public abstract class AbstractApplicationFormUIModel<E, B extends AbstractApplic protected <B extends JavaBeanObject> void listenAndModifyModel(Iterable<B> javaBeanObjects) { - ModifyPropertyChangeListener listener = new ModifyPropertyChangeListener(this, getModifyIgnorePropertiyNames()); + ModifyPropertyChangeListener listener = new ModifyPropertyChangeListener(this, getModifyIgnorePropertyNames()); for (B javaBeanObject : javaBeanObjects) { javaBeanObject.addPropertyChangeListener(listener); } -- 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 32ab3e9d482ff651a12e482fe7dd814c09f5d717 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 21 17:12:00 2014 +0200 fixes #3456: Bad message when using autoImportCss and use others css --- .../src/main/java/jaxx/compiler/JAXXCompiler.java | 31 +++++++++------------- .../main/java/jaxx/compiler/tags/StyleHandler.java | 18 +------------ .../jaxx/compiler/tasks/CompileFirstPassTask.java | 8 ++---- 3 files changed, 15 insertions(+), 42 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java index 7227c2a..31cfd4d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java @@ -987,38 +987,31 @@ public class JAXXCompiler { /*-- StyleSheet methods --------------------------------------------------*/ /*------------------------------------------------------------------------*/ -// public File getIdentCssFile() { -// String extension = FileUtil.extension(src); -// String jaxxFileName = src.getName(); -// String identCssFilename = jaxxFileName.substring( -// 0, -// jaxxFileName.length() - extension.length()) + "css"; -// File identCssFile = new File(src.getParentFile(), identCssFilename); -// return identCssFile; -// } - public boolean isIdentCssFound() { return identCssFound; } - public void registerStyleSheetFile(File styleFile) throws IOException { - if (!identCssFound && getConfiguration().isAutoImportCss()) { + public void registerStyleSheetFile(File styleFile, boolean warnAutoCssImport) throws IOException { + if (!identCssFound) { // detects if the given css file is ident to jaxx file File identCssFile = jaxxFile.getCssFile(); - if (identCssFile.exists()) { + if (styleFile.equals(identCssFile) && identCssFile.exists()) { // ok found ident css file identCssFound = true; - reportWarning("autoImportCss mode is on, you can remove " + - "style declaration with source " + styleFile); + if (warnAutoCssImport) { + + reportWarning("The css file "+styleFile+" can be automaticly imported since it is named as his jaxx file."); + + } + } } String content = loadFile(styleFile); -// String content = StylesheetHelper.loadCssFile(this, styleFile); getSourceFiles().push(styleFile); try { Stylesheet stylesheet = StylesheetHelper.processStylesheet(content); @@ -1996,9 +1989,9 @@ public class JAXXCompiler { } } - public void setIdentCssFound(boolean identCssFound) { - this.identCssFound = identCssFound; - } +// public void setIdentCssFound(boolean identCssFound) { +// this.identCssFound = identCssFound; +// } public void setClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java b/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java index e9fc58b..c96ce5c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java @@ -62,24 +62,8 @@ public class StyleHandler implements TagHandler { if (!styleFile.exists()) { compiler.reportError("stylesheet file not found: " + styleFile); } else { - compiler.registerStyleSheetFile(styleFile); + compiler.registerStyleSheetFile(styleFile, true); } -// StringWriter styleBuffer = new StringWriter(); -// FileReader in = new FileReader(styleFile); -// try { -// char[] readBuffer = new char[2048]; -// int c; -// while ((c = in.read(readBuffer)) > 0) { -// styleBuffer.write(readBuffer, 0, c); -// } -// } catch (FileNotFoundException e) { -// compiler.reportError("stylesheet file not found: " + styleFile); -// } finally { -// in.close(); -// } -// compiler.getSourceFiles().push(styleFile); -// compiler.registerStylesheet(StylesheetHelper.processStylesheet(styleBuffer.toString())); -// compiler.getSourceFiles().pop(); } else if (!name.startsWith(XMLNS_ATTRIBUTE) && !JAXXCompiler.JAXX_INTERNAL_NAMESPACE.equals(attribute.getNamespaceURI())) { throw new UnsupportedAttributeException(name); 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 d17b25a..ee691cc 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java @@ -86,14 +86,12 @@ public class CompileFirstPassTask extends JAXXEngineTask { boolean success = true; - CompilerConfiguration configuration = engine.getConfiguration(); - JAXXCompiler compiler = engine.newCompiler(jaxxFile); addStartProfileTime(engine, compiler); compiler.compileFirstPass(); - if (configuration.isAutoImportCss() && !compiler.isIdentCssFound()) { + if (!compiler.isIdentCssFound()) { // check if we can add ident css file @@ -104,13 +102,11 @@ public class CompileFirstPassTask extends JAXXEngineTask { } if (cssFile.exists()) { - compiler.setIdentCssFound(true); - if (isVerbose) { log.info("Auto import of css " + cssFile); } // ok add it - compiler.registerStyleSheetFile(cssFile); + compiler.registerStyleSheetFile(cssFile, false); } } addEndProfileTime(engine, compiler); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm