March 2010 - Jaxx-commits - mailman.cloud.codelutin.com

r1826 - in trunk/maven-jaxx-plugin: . src/main/java/org/nuiton/jaxx/plugin src/test/java/org/nuiton/jaxx/plugin src/test/resources
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 20:57:47 +0200 (Wed, 31 Mar 2010) New Revision: 1826 Log: Evolution #435: Regenerates jaxx files when his css file is modified + reformat + set to verbose mojo when debug log is on Modified: trunk/maven-jaxx-plugin/pom.xml trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java trunk/maven-jaxx-plugin/src/test/resources/log4j.properties Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/pom.xml 2010-03-31 18:57:47 UTC (rev 1826) @@ -98,6 +98,13 @@ <classifier>tests</classifier> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + </dependencies>  Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2010-03-31 18:57:47 UTC (rev 1826) @@ -19,6 +19,7 @@ package org.nuiton.jaxx.plugin; import org.apache.maven.project.MavenProject; +import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.util.FileUtil; @@ -150,4 +151,26 @@ FileUtil.walkAfter(dir, fileAction); return fileAction.getLastFile().lastModified(); } + + /** + * To test if a jaxx source (or his css ) file is newser than his generated + * java source file. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0.2 + */ + public static class JaxxFileUpdater extends MirroredFileUpdater { + + protected JaxxFileUpdater(File sourceDirectory, File destinationDirectory) { + super(".jaxx|*.css", ".java", sourceDirectory, destinationDirectory); + } + + @Override + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(prefixSourceDirecotory); + String extension = FileUtil.extension(f); + String mirrorRelativePath = file.substring(0, file.length() - extension.length()) + "java"; + return new File(destinationDirectory + File.separator + mirrorRelativePath); + } + } } Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2010-03-31 18:57:47 UTC (rev 1826) @@ -18,11 +18,7 @@ * ##%*/ package org.nuiton.jaxx.plugin; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerConfiguration; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXEngine; +import jaxx.compiler.*; import jaxx.compiler.beans.BeanInfoUtil; import jaxx.compiler.binding.DataBindingHelper; import jaxx.compiler.spi.DefaultInitializer; @@ -34,17 +30,12 @@ import org.apache.commons.lang.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.i18n.I18n; -import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.PluginHelper; import java.beans.Introspector; import java.io.File; -import java.lang.String; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Generates some java code from jaxx files. @@ -57,49 +48,54 @@ */ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfiguration { + /** Default includes to use, if none provided */ + private static final String[] INCLUDES = {"**\\/*.jaxx", "**\\/*.css"}; + /** - * Default includes to use, if none provided - */ - private static final String[] INCLUDES = {"**\\/*.jaxx"}; - /** * Repertoire sources des fichiers jaxx a generer. * * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" */ protected File src; + /** * Repertoire de destination des fichiers java a generer. * * @parameter expression="${jaxx.outJava}" default-value="${basedir}/target/generated-sources/java" */ protected File outJava; + /** * pour filter les fichiers a traiter * * @parameter expression="${jaxx.includes}" */ protected String[] includes; + /** * pour filter les fichiers a ne pas traiter * * @parameter expression="${jaxx.excludes}" */ protected String[] excludes; + /** * Le compilateur à utiliser (par défaut celui de Swing) * * @parameter expression="${jaxx.compilerFQN}" default-value="jaxx.compiler.JAXXCompiler" */ protected String compilerFQN; + /** * Le compilateur à utiliser (par défaut celui de Swing) * * @parameter expression="${jaxx.validatorFQN}" default-value="jaxx.runtime.validator.swing.SwingValidator" */ protected String validatorFQN; + /** - * the name of implementation of {@link JAXXContext}to be used on - * {@link JAXXObject}. + * the name of implementation of {@link JAXXContext}to be used on {@link + * JAXXObject}. * * Must not be abstract. * @@ -107,6 +103,7 @@ * @required */ protected String jaxxContextFQN; + /** * the FQN of the ui to use for error notification. * @@ -115,75 +112,88 @@ * @parameter expression="${jaxx.defaultErrorUIFQN}" */ protected String defaultErrorUIFQN; + /** * the FQN of the ui to use for error notification. * * If not given, will use the one defined in validator * - * @parameter expression="${jaxx.defaultDecoratorFQN}" default-value="jaxx.compiler.decorators.DefaultCompiledObjectDecorator" + * @parameter expression="${jaxx.defaultDecoratorFQN}" + * default-value="jaxx.compiler.decorators.DefaultCompiledObjectDecorator" * @see CompiledObjectDecorator */ protected String defaultDecoratorFQN; + /** - * flag to include in compiler classpath the java sources directories - * (src and outJava). + * flag to include in compiler classpath the java sources directories (src + * and outJava). * * By default, false. * - * @parameter expression="${jaxx.addSourcesToClassPath}" default-value="false" + * @parameter expression="${jaxx.addSourcesToClassPath}" + * default-value="false" */ protected boolean addSourcesToClassPath; + /** - * flag to include in compiler classpath the java resources directories - * (src and outJava). + * flag to include in compiler classpath the java resources directories (src + * and outJava). * * By default, false. * - * @parameter expression="${jaxx.addResourcesToClassPath}" default-value="false" + * @parameter expression="${jaxx.addResourcesToClassPath}" + * default-value="false" * @since 1.6.0 */ protected boolean addResourcesToClassPath; + /** - * flag to include in compiler classpath the compile class-path - * (can only be used in a test phase). + * flag to include in compiler classpath the compile class-path (can only be + * used in a test phase). * * By default, false. * - * @parameter expression="${jaxx.addCompileClassPath}" default-value="false" + * @parameter expression="${jaxx.addCompileClassPath}" + * default-value="false" * @since 1.6.0 */ protected boolean addCompileClassPath; + /** * flag to include in compiler classpath the project compile classpath. * * By default, false. * - * @parameter expression="${jaxx.addProjectClassPath}" default-value="false" + * @parameter expression="${jaxx.addProjectClassPath}" + * default-value="false" */ protected boolean addProjectClassPath; + /** - * A flag to mark themojo to be used in a test phase. This will permits - * to add generated sources in test compile roots. + * A flag to mark themojo to be used in a test phase. This will permits to + * add generated sources in test compile roots. * * @parameter expression="${jaxx.testPhase}" default-value="false" * @since 1.6.0 */ protected boolean testPhase; + /** - * to make compiler i18nable, says add the - * {@link I18n#_(String, Object...)} method invocation on - * {@link I18nHelper#I18N_ATTRIBUTES} attributes. + * to make compiler i18nable, says add the {@link I18n#_(String, Object...)} + * method invocation on {@link I18nHelper#I18N_ATTRIBUTES} attributes. * * @parameter expression="${jaxx.i18nable}" default-value="true" * @see I18nHelper */ protected boolean i18nable; + /** * pour optimizer le code compile ou genere ? * * @parameter expression="${jaxx.optimize}" default-value="false" */ protected boolean optimize; + /** * flag to add logger to each generated jaxx file. * @@ -192,6 +202,7 @@ * @parameter expression="${jaxx.addLogger}" default-value="true" */ protected boolean addLogger; + /** * flag to keep compilers after the generate operation (usefull for tests. * @@ -200,11 +211,11 @@ * @parameter expression="${jaxx.resetAfterCompile}" default-value="true" */ protected boolean resetAfterCompile; + /** * extra path to be added in {@link Introspector#setBeanInfoSearchPath(String[])}. * - * add beanInfoSearchPath to be registred by - * {@link BeanInfoUtil#addJaxxBeanInfoPath(String...)} + * add beanInfoSearchPath to be registred by {@link BeanInfoUtil#addJaxxBeanInfoPath(String...)} * * and then will be use by {@link DefaultInitializer#initialize()}. * @@ -214,18 +225,22 @@ * @parameter expression="${jaxx.beanInfoSearchPath}" */ protected String[] beanInfoSearchPath; + /** * list of fqn of class toimport for all generated jaxx files * * @parameter expression="${jaxx.extraImportList}" */ protected String extraImportList; + /** * a flag to use UIManager to retreave icons. * - * @parameter expression="${jaxx.useUIManagerForIcon}" default-value="false" + * @parameter expression="${jaxx.useUIManagerForIcon}" + * default-value="false" */ protected boolean useUIManagerForIcon; + /** * flag to activate profile mode. * @@ -234,6 +249,7 @@ * @parameter expression="${jaxx.profile}" default-value="false" */ protected boolean profile; + /** * To show detected bindings. * @@ -243,6 +259,7 @@ * @since 2.0.0 */ protected boolean showBinding; + /** * the FQN of help broker * @@ -252,64 +269,75 @@ * @since 1.3 */ protected String helpBrokerFQN; - /** - * detected jaxx files in {@link #init()} method - */ + + /** detected jaxx files in {@link #init()} method */ protected String[] files; + /** * file updater used to detect jaxx files. * * Note: if {@link #verbose} flag is on, will ne be used */ protected MirroredFileUpdater updater; + /** * */ private Class<?> defaultErrorUIClass; + /** * */ private Class<?> validatorClass; + /** - * + * type of {@link CompiledObjectDecorator} to use */ private Class<? extends CompiledObjectDecorator> defaultDecoratorClass; + /** - * + * type of {@link JAXXContext} to use */ private Class<? extends JAXXContext> jaxxContextClass; + /** - * + * type of compiler to use */ private Class<? extends JAXXCompiler> compilerClass; + /** * */ private String[] extraImports; + /** - * + * internal state to known if a files has to be generated */ private boolean nofiles; + /** * */ protected ClassLoader cl; - /** - * JAXX engine - */ + + /** JAXX engine */ private JAXXEngine engine; @SuppressWarnings("unchecked") @Override public void init() throws Exception { + if (getLog().isDebugEnabled()) { + // if debug is on, then verbose also + setVerbose(true); + } fixCompileSourceRoots(); if (includes == null || includes.length == 0) { // use default includes includes = INCLUDES; } - updater = FileUpdaterHelper.newJaxxFileUpdater(src, outJava); + updater = new JaxxFileUpdater(src, outJava); Map<File, String[]> result = new HashMap<File, String[]>(); getFilesToTreateForRoots( @@ -321,18 +349,48 @@ files = result.get(src); + // Evolution #435: Regenerates jaxx files when his css file is modified + // filter css and jaxx files to obtain only jaxx files + // if a css is modified, try to find the corresponding jaxx files + if (files != null && files.length > 0) { + Set<String> filterFiles = new HashSet<String>(files.length); + for (String path : files) { + if (path.endsWith(".css")) { + // take the jaxx file + String jaxxFilePath = + path.substring(0, path.length() - 4) + ".jaxx"; + File f = new File(src, jaxxFilePath); + if (f.exists()) { + if (isVerbose()) { + getLog().info("will treate jaxx file from css " + + f); + } + filterFiles.add(jaxxFilePath); + } else { + getLog().warn("can not find jaxx file corresponding " + + "to modified css file " + path); + } + continue; + } + if (path.endsWith(".jaxx")) { + filterFiles.add(path); + } + } + files = filterFiles.toArray(new String[filterFiles.size()]); + } + nofiles = files == null || files.length == 0; if (nofiles) { return; } cl = initClassLoader(getProject(), - src, - addSourcesToClassPath, - testPhase, - addResourcesToClassPath, - addCompileClassPath, - addProjectClassPath); + src, + addSourcesToClassPath, + testPhase, + addResourcesToClassPath, + addCompileClassPath, + addProjectClassPath); Thread.currentThread().setContextClassLoader(cl); @@ -540,7 +598,7 @@ // no project defined, can not fix anything // this case could appear if we wanted to do some tests of the plugin return; - } + } if (testPhase) { addTestCompileSourceRoots(getTargetDirectory()); Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-03-31 18:57:47 UTC (rev 1826) @@ -24,11 +24,12 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.SystemStreamLog; -import static org.junit.Assert.*; import org.junit.Test; import java.io.File; +import static org.junit.Assert.*; + public class CompilerTest extends JaxxBaseTest { @Test Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2010-03-31 18:57:47 UTC (rev 1826) @@ -20,7 +20,9 @@ */ package org.nuiton.jaxx.plugin; +import jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import jaxx.runtime.context.DefaultJAXXContext; +import jaxx.runtime.validator.swing.SwingValidator; import org.nuiton.util.FileUtil; import java.io.File; @@ -53,11 +55,18 @@ @Override protected void setUpMojo(GenerateMojo mojo, File pomFile) throws Exception { - super.setUpMojo(mojo, pomFile); + try { + super.setUpMojo(mojo, pomFile); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error(e); + } + } mojo.jaxxContextFQN = DefaultJAXXContext.class.getName(); - mojo.compilerFQN = jaxx.compiler.JAXXCompiler.class.getName(); - mojo.validatorFQN = jaxx.runtime.validator.swing.SwingValidator.class.getName(); - mojo.defaultDecoratorFQN = jaxx.compiler.decorators.DefaultCompiledObjectDecorator.class.getName(); + mojo.compilerFQN = JAXXCompiler.class.getName(); + mojo.validatorFQN = SwingValidator.class.getName(); + mojo.defaultDecoratorFQN = DefaultCompiledObjectDecorator.class.getName(); + } protected void checkPattern(GenerateMojo mojo, String pattern, boolean required, String... files) throws IOException { Modified: trunk/maven-jaxx-plugin/src/test/resources/log4j.properties =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/log4j.properties 2010-03-31 13:20:30 UTC (rev 1825) +++ trunk/maven-jaxx-plugin/src/test/resources/log4j.properties 2010-03-31 18:57:47 UTC (rev 1826) @@ -5,5 +5,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +log4j.logger.org.nuiton.plugin.AbstractMojoTest=INFO +log4j.logger.org.nuiton.jaxx=INFO log4j.logger.jaxx.compiler=INFO -log4j.logger.jaxx.compiler.binding=DEBUG +#log4j.logger.jaxx.compiler.binding=DEBUG

1 0

r1825 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-swing-action jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 15:20:30 +0200 (Wed, 31 Mar 2010) New Revision: 1825 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/jaxx-compiler/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/jaxx-demo/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/jaxx-runtime/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/jaxx-swing-action/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/jaxx-widgets/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/maven-jaxx-plugin/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-31 13:20:14 UTC (rev 1824) +++ trunk/pom.xml 2010-03-31 13:20:30 UTC (rev 1825) @@ -14,7 +14,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -414,9 +414,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.0.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> </project>

1 0

r1824 - tags
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 15:20:14 +0200 (Wed, 31 Mar 2010) New Revision: 1824 Log: [maven-release-plugin] copy for tag jaxx-2.0.1 Added: tags/jaxx-2.0.1/

1 0

r1823 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-swing-action jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 15:20:11 +0200 (Wed, 31 Mar 2010) New Revision: 1823 Log: [maven-release-plugin] prepare release jaxx-2.0.1 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/jaxx-compiler/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/jaxx-demo/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/jaxx-runtime/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/jaxx-swing-action/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/jaxx-widgets/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/maven-jaxx-plugin/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-31 13:10:29 UTC (rev 1822) +++ trunk/pom.xml 2010-03-31 13:20:11 UTC (rev 1823) @@ -14,7 +14,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> <modules> <module>jaxx-runtime</module> @@ -414,9 +414,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.0.1</url> </scm> </project>

1 0

r1822 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation: . tree treetable
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 15:10:29 +0200 (Wed, 31 Mar 2010) New Revision: 1822 Log: revert rev 1819 Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-31 09:22:35 UTC (rev 1821) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-31 13:10:29 UTC (rev 1822) @@ -21,7 +21,6 @@ package jaxx.runtime.swing.navigation; import jaxx.runtime.JAXXAction; -import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.decorator.Decorator; @@ -56,12 +55,6 @@ /** [optional] default action class */ protected Class<? extends JAXXAction> defaultUIHandlerClass; - //TODO Doc - protected Comparator<NavigationNode<?>> rendererComparator; - //TODO Doc - protected boolean useRendererComparator; - //TODO Doc - protected List<JAXXComparator<?>> comparators; /** * if sets to {@code true} will not fires any event (this is a convinient @@ -78,52 +71,6 @@ this.model = model; } - public AbstractNavigationModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationModel<E> model, - boolean useRendererComparator) { - this.defaultUIClass = defaultUIClass; - this.defaultUIHandlerClass = defaultUIHandlerClass; - this.model = model; - this.useRendererComparator = useRendererComparator; - } - - public AbstractNavigationModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationModel<E> model, - JAXXContext context, - JAXXComparator<?> comparator) { - this.defaultUIClass = defaultUIClass; - this.defaultUIHandlerClass = defaultUIHandlerClass; - this.model = model; - comparators = new ArrayList<JAXXComparator<?>>(); - comparators.add(comparator); - } - - public AbstractNavigationModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationModel<E> model, - List<JAXXComparator<?>> comparators) { - this.defaultUIClass = defaultUIClass; - this.defaultUIHandlerClass = defaultUIHandlerClass; - this.model = model; - this.comparators = comparators; - } - - public AbstractNavigationModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationModel<E> model, - JAXXComparator<?> ... comparators) { - this.defaultUIClass = defaultUIClass; - this.defaultUIHandlerClass = defaultUIHandlerClass; - this.model = model; - this.comparators = Arrays.asList(comparators); - } - @Override public NavigationModel<E> getModel() { return model; @@ -321,115 +268,10 @@ if (parentNode == null) { model.setRoot(node); } else { - boolean useExternalComparators = - comparators != null && !comparators.isEmpty(); - if (!useRendererComparator && !useExternalComparators){ - parentNode.add(node); - } else { - Enumeration<? extends E> childEnum = parentNode.children(); - - List<E> children = Collections.list((Enumeration<E>) childEnum); - - if (children.isEmpty()){ - parentNode.add(node); - } else { - children.add(node); - - if (useExternalComparators){ - children = sortWithComparators(children); - } else { - Collections.sort(children, getRendererComparator()); - } - int i = children.indexOf(node); - - if (log.isDebugEnabled()){ - log.debug("Use external comparator : " + useExternalComparators - + " adding child " + node.getFullPath() - + " to parent " + parentNode.getFullPath() - + " at " + i); - } - - parentNode.insert(node, i); - } - } + parentNode.add(node); } model.nodeStructureChanged(parentNode == null ? node : parentNode); return node; } - // Try to find a solution to sort node with comparator - // This one don't work, i think new nodes dont have bean - protected List<E> sortWithComparators(List<E> children) { - for (JAXXComparator<?> comparator : comparators){ - Class<?> beanType = children.get(0).getBean(model.getContext()).getClass(); - if (comparator.getClazz() - .isAssignableFrom(beanType)){ - List<E> result = sortWithComparator(children, comparator); - if (result != null){ - return result; - } - } - } - return children; - } - - protected <T> List<E> sortWithComparator( - List<E> children, - JAXXComparator<T> comparator) { - - Map<T, E> toSort = new HashMap<T, E>(); - - List<T> beans = new ArrayList<T>(); - - // Extract beans - int cnt = 0; - for (E child : children){ - Object o = child.getBean(model.getContext()); - T casted = (T) o; - beans.add(casted); - toSort.put(casted, child); - if (log.isDebugEnabled()){ - log.debug("Will sort : " + ++cnt + " - " + (casted == null ? "null" : casted.toString())); - } - } - - // Sort beans - Collections.sort(beans, comparator); - - // Retrieve sorted nodes - children.clear(); - cnt = 0; - for (T bean : beans){ - E retrieveNode = toSort.get(bean); - if (log.isDebugEnabled()){ - log.debug("Retrieve sorted bean : " + - ++cnt + " - " + (bean == null ? "null" : bean.toString())); - } - children.add(retrieveNode); - } - return children; - } - - protected Comparator<NavigationNode<?>> getRendererComparator(){ - if (rendererComparator == null){ - rendererComparator = new Comparator<NavigationNode<?>>() { - - @Override - public int compare(NavigationNode<?> o1, NavigationNode<?> o2) { - String label1 = o1.getRenderer().toString(); - String label2 = o2.getRenderer().toString(); - if (label1 == null || label2 == null){ - return 0; - } - return label1.compareTo(label2); - } - }; - } - return rendererComparator; - } - //TODO Doc - public interface JAXXComparator<T> extends Comparator<T>{ - - Class<T> getClazz(); - } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java 2010-03-31 09:22:35 UTC (rev 1821) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java 2010-03-31 13:10:29 UTC (rev 1822) @@ -26,12 +26,7 @@ import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.navigation.AbstractNavigationModelBuilder; import jaxx.runtime.swing.navigation.NavigationModelBuilder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import java.util.Comparator; -import java.util.List; - /** * This object is design to build a {@link NavigationTreeModel}. * @@ -41,10 +36,6 @@ */ public class NavigationTreeModelBuilder extends AbstractNavigationModelBuilder<NavigationTreeNode> { - /** Logger */ - static private final Log log = - LogFactory.getLog(NavigationTreeModelBuilder.class); - public NavigationTreeModelBuilder( String pathSeparator, JAXXContext context, @@ -57,96 +48,12 @@ } public NavigationTreeModelBuilder( - String pathSeparator, - JAXXContext context, Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, - boolean useRendererComparator) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeModel(pathSeparator, context), - useRendererComparator - ); - } - - public NavigationTreeModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - JAXXComparator<?> comparator) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeModel(pathSeparator, context), - comparator - ); - } - - public NavigationTreeModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - List<JAXXComparator<?>> comparators) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeModel(pathSeparator, context), - comparators - ); - } - - public NavigationTreeModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - JAXXComparator<?> ... comparators) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeModel(pathSeparator, context), - comparators - ); - } - - public NavigationTreeModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, NavigationTreeModel model) { super(defaultUIClass, defaultUIHandlerClass, model); } - public NavigationTreeModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeModel model, - boolean useRendererComparator) { - super(defaultUIClass, defaultUIHandlerClass, model, useRendererComparator); - } - - public NavigationTreeModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeModel model, - JAXXComparator<?> comparator) { - super(defaultUIClass, defaultUIHandlerClass, model, comparator); - } - - public NavigationTreeModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeModel model, - List<JAXXComparator<?>> comparators) { - super(defaultUIClass, defaultUIHandlerClass, model, comparators); - } - - public NavigationTreeModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeModel model, - JAXXComparator<?> ... comparators) { - super(defaultUIClass, defaultUIHandlerClass, model, comparators); - } - @Override public NavigationTreeNode createNavigationNode( String pathSeparator, Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java 2010-03-31 09:22:35 UTC (rev 1821) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java 2010-03-31 13:10:29 UTC (rev 1822) @@ -5,10 +5,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.navigation.AbstractNavigationModelBuilder; -import jaxx.runtime.swing.navigation.NavigationModel; -import jaxx.runtime.swing.navigation.NavigationNode; -import java.util.*; +import java.util.List; public class NavigationTreeTableModelBuilder extends AbstractNavigationModelBuilder<NavigationTreeTableNode> { @@ -25,100 +23,12 @@ } public NavigationTreeTableModelBuilder( - String pathSeparator, - JAXXContext context, Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, - List<String> columnsName, - boolean useRendererComparator) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeTableModel(pathSeparator, context, columnsName), - useRendererComparator - ); - } - - public NavigationTreeTableModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - List<String> columnsName, - JAXXComparator<?> comparator) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeTableModel(pathSeparator, context, columnsName), - comparator - ); - } - - public NavigationTreeTableModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - List<String> columnsName, - List<JAXXComparator<?>> comparators) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeTableModel(pathSeparator, context, columnsName), - comparators - ); - } - - public NavigationTreeTableModelBuilder( - String pathSeparator, - JAXXContext context, - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - List<String> columnsName, - JAXXComparator<?> ... comparators) { - this(defaultUIClass, - defaultUIHandlerClass, - new NavigationTreeTableModel(pathSeparator, context, columnsName), - comparators - ); - } - - public NavigationTreeTableModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, NavigationTreeTableModel model) { super(defaultUIClass, defaultUIHandlerClass, model); } - public NavigationTreeTableModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeTableModel model, - boolean useRendererComparator) { - super(defaultUIClass, defaultUIHandlerClass, model, useRendererComparator); - } - - public NavigationTreeTableModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeTableModel model, - JAXXComparator<?> comparator) { - super(defaultUIClass, defaultUIHandlerClass, model, comparator); - } - - public NavigationTreeTableModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeTableModel model, - List<JAXXComparator<?>> comparators) { - super(defaultUIClass, defaultUIHandlerClass, model, comparators); - } - - public NavigationTreeTableModelBuilder( - Class<? extends JAXXObject> defaultUIClass, - Class<? extends JAXXAction> defaultUIHandlerClass, - NavigationTreeTableModel model, - JAXXComparator<?>... comparators) { - super(defaultUIClass, defaultUIHandlerClass, model, comparators); - } - @Override public NavigationTreeTableNode createNavigationNode( String pathSeparator,

1 0

r1821 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation: . tree
by tchemit＠users.nuiton.org March 31, 2010

March 31, 2010

Author: tchemit Date: 2010-03-31 11:22:35 +0200 (Wed, 31 Mar 2010) New Revision: 1821 Log: - add adjustingValue state on NavigationMode to not fires any event - clean generics code on Sort methods (again...) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeNode.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModel.java 2010-03-30 21:31:37 UTC (rev 1820) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModel.java 2010-03-31 09:22:35 UTC (rev 1821) @@ -59,6 +59,11 @@ /** Context to retrieve beans */ private JAXXContext context; + /** + * if sets to {@code true} will not fires any event (this is a convinient + * state when we are building the tree to avoid reload of nodes) + */ + protected boolean adjustingValue; public AbstractNavigationModel(TreeModel delegate, String pathSeparator, @@ -72,6 +77,14 @@ // NavigationModel implementation //-------------------------------------------------------------------------- + public boolean isAdjustingValue() { + return adjustingValue; + } + + public void setAdjustingValue(boolean adjustingValue) { + this.adjustingValue = adjustingValue; + } + @Override public JAXXContext getContext() { return context; @@ -165,6 +178,9 @@ @Override public final void nodeChanged(E node) { + if (adjustingValue) { + return; + } nodeChanged(node, false); if (log.isDebugEnabled()) { log.debug(node); @@ -172,6 +188,9 @@ } protected final void reload(E node) { + if (adjustingValue) { + return; + } reload(node, false); } @@ -179,6 +198,9 @@ if (node == null) { return; } + if (adjustingValue) { + return; + } node.reload(getContext()); if (deep) { @@ -211,6 +233,9 @@ @Override public final void valueForPathChanged(TreePath path, Object newValue) { + if (adjustingValue) { + return; + } getDelegate().valueForPathChanged(path, newValue); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-30 21:31:37 UTC (rev 1820) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-31 09:22:35 UTC (rev 1821) @@ -56,13 +56,19 @@ /** [optional] default action class */ protected Class<? extends JAXXAction> defaultUIHandlerClass; - - protected Comparator<NavigationNode> rendererComparator; - + //TODO Doc + protected Comparator<NavigationNode<?>> rendererComparator; + //TODO Doc protected boolean useRendererComparator; - + //TODO Doc protected List<JAXXComparator<?>> comparators; + /** + * if sets to {@code true} will not fires any event (this is a convinient + * state when we are building the tree to avoid reload of nodes) + */ + protected boolean adjustingValue; + public AbstractNavigationModelBuilder( Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, @@ -92,7 +98,7 @@ this.defaultUIClass = defaultUIClass; this.defaultUIHandlerClass = defaultUIHandlerClass; this.model = model; - this.comparators = new ArrayList<JAXXComparator<?>>(); + comparators = new ArrayList<JAXXComparator<?>>(); comparators.add(comparator); } @@ -316,7 +322,7 @@ model.setRoot(node); } else { boolean useExternalComparators = - (comparators != null && !comparators.isEmpty()); + comparators != null && !comparators.isEmpty(); if (!useRendererComparator && !useExternalComparators){ parentNode.add(node); } else { @@ -338,8 +344,8 @@ if (log.isDebugEnabled()){ log.debug("Use external comparator : " + useExternalComparators - + " adding child " + (node.getFullPath()) - + " to parent " + (parentNode.getFullPath()) + + " adding child " + node.getFullPath() + + " to parent " + parentNode.getFullPath() + " at " + i); } @@ -355,7 +361,7 @@ // This one don't work, i think new nodes dont have bean protected List<E> sortWithComparators(List<E> children) { for (JAXXComparator<?> comparator : comparators){ - Class<? extends Object> beanType = children.get(0).getBean(model.getContext()).getClass(); + Class<?> beanType = children.get(0).getBean(model.getContext()).getClass(); if (comparator.getClazz() .isAssignableFrom(beanType)){ List<E> result = sortWithComparator(children, comparator); @@ -404,12 +410,12 @@ return children; } - protected Comparator<NavigationNode> getRendererComparator(){ + protected Comparator<NavigationNode<?>> getRendererComparator(){ if (rendererComparator == null){ - rendererComparator = new Comparator<NavigationNode>() { + rendererComparator = new Comparator<NavigationNode<?>>() { @Override - public int compare(NavigationNode o1, NavigationNode o2) { + public int compare(NavigationNode<?> o1, NavigationNode<?> o2) { String label1 = o1.getRenderer().toString(); String label2 = o2.getRenderer().toString(); if (label1 == null || label2 == null){ @@ -421,7 +427,7 @@ } return rendererComparator; } - + //TODO Doc public interface JAXXComparator<T> extends Comparator<T>{ Class<T> getClazz(); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationModel.java 2010-03-30 21:31:37 UTC (rev 1820) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationModel.java 2010-03-31 09:22:35 UTC (rev 1821) @@ -142,6 +142,20 @@ JAXXContext getContext(); /** + * @return {@code true} if no event should be fired + */ + boolean isAdjustingValue(); + + /** + * Sets the new internal state {@code adjustingValue}. + * + * If the value is {@code true}, no more event will be fired, otherwise + * will not block events firing. + * + * @param adjustingValue the new value of {@code valueAdjusting} state + */ + void setAdjustingValue(boolean adjustingValue); + /** * Obtain the associated bean value from context corresponding to node from * given navigation path. * Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModel.java 2010-03-30 21:31:37 UTC (rev 1820) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModel.java 2010-03-31 09:22:35 UTC (rev 1821) @@ -71,6 +71,9 @@ @Override public void nodeStructureChanged(NavigationTreeNode node) { + if (isAdjustingValue()) { + return; + } NavigationTreeNode n = node; //TC-20091004 never launch a deep reload reload(n, true); @@ -82,7 +85,9 @@ @Override public void nodeChanged(NavigationTreeNode node, boolean deep) { - + if (isAdjustingValue()) { + return; + } NavigationTreeNode n = node; //TC-20091004 never launch a deep clean, since we do a deep nodeChanged. reload(n, deep); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeNode.java 2010-03-30 21:31:37 UTC (rev 1820) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeNode.java 2010-03-31 09:22:35 UTC (rev 1821) @@ -332,6 +332,12 @@ @Override public void setBean(Object bean) { this.bean = bean; + //TC-20100331 : we wants to compute render as soon as possible + // this is a easy way to not need any reload of the node + NavigationNodeRenderer renderer = getRenderer(); + if (renderer != null) { + renderer.reload(bean); + } } @Override

1 0

r1820 - trunk
by tchemit＠users.nuiton.org March 30, 2010

March 30, 2010

Author: tchemit Date: 2010-03-30 23:31:37 +0200 (Tue, 30 Mar 2010) New Revision: 1820 Log: Evolution #428: Using nuiton-i18n 1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-30 12:52:36 UTC (rev 1819) +++ trunk/pom.xml 2010-03-30 21:31:37 UTC (rev 1820) @@ -363,7 +363,7 @@ <projectId>jaxx</projectId> <lutinutil.version>1.2</lutinutil.version> - <i18n.version>1.1</i18n.version> + <i18n.version>1.2</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0

r1819 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation: . tree treetable
by sletellier＠users.nuiton.org March 30, 2010

March 30, 2010

Author: sletellier Date: 2010-03-30 14:52:36 +0200 (Tue, 30 Mar 2010) New Revision: 1819 Log: Try to find an implementation to sort nodes when they are inserted. This method work fine when sort by rederer, but not with owns comparators. This commit it just to keep a trace : before release, revert or fix it ;) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-30 12:44:07 UTC (rev 1818) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/AbstractNavigationModelBuilder.java 2010-03-30 12:52:36 UTC (rev 1819) @@ -21,13 +21,14 @@ package jaxx.runtime.swing.navigation; import jaxx.runtime.JAXXAction; +import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.decorator.Decorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Enumeration; +import java.util.*; /** * Interface to create a builder, this object is design to build a {@link @@ -56,6 +57,12 @@ /** [optional] default action class */ protected Class<? extends JAXXAction> defaultUIHandlerClass; + protected Comparator<NavigationNode> rendererComparator; + + protected boolean useRendererComparator; + + protected List<JAXXComparator<?>> comparators; + public AbstractNavigationModelBuilder( Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, @@ -65,6 +72,52 @@ this.model = model; } + public AbstractNavigationModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationModel<E> model, + boolean useRendererComparator) { + this.defaultUIClass = defaultUIClass; + this.defaultUIHandlerClass = defaultUIHandlerClass; + this.model = model; + this.useRendererComparator = useRendererComparator; + } + + public AbstractNavigationModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationModel<E> model, + JAXXContext context, + JAXXComparator<?> comparator) { + this.defaultUIClass = defaultUIClass; + this.defaultUIHandlerClass = defaultUIHandlerClass; + this.model = model; + this.comparators = new ArrayList<JAXXComparator<?>>(); + comparators.add(comparator); + } + + public AbstractNavigationModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationModel<E> model, + List<JAXXComparator<?>> comparators) { + this.defaultUIClass = defaultUIClass; + this.defaultUIHandlerClass = defaultUIHandlerClass; + this.model = model; + this.comparators = comparators; + } + + public AbstractNavigationModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationModel<E> model, + JAXXComparator<?> ... comparators) { + this.defaultUIClass = defaultUIClass; + this.defaultUIHandlerClass = defaultUIHandlerClass; + this.model = model; + this.comparators = Arrays.asList(comparators); + } + @Override public NavigationModel<E> getModel() { return model; @@ -262,10 +315,115 @@ if (parentNode == null) { model.setRoot(node); } else { - parentNode.add(node); + boolean useExternalComparators = + (comparators != null && !comparators.isEmpty()); + if (!useRendererComparator && !useExternalComparators){ + parentNode.add(node); + } else { + Enumeration<? extends E> childEnum = parentNode.children(); + + List<E> children = Collections.list((Enumeration<E>) childEnum); + + if (children.isEmpty()){ + parentNode.add(node); + } else { + children.add(node); + + if (useExternalComparators){ + children = sortWithComparators(children); + } else { + Collections.sort(children, getRendererComparator()); + } + int i = children.indexOf(node); + + if (log.isDebugEnabled()){ + log.debug("Use external comparator : " + useExternalComparators + + " adding child " + (node.getFullPath()) + + " to parent " + (parentNode.getFullPath()) + + " at " + i); + } + + parentNode.insert(node, i); + } + } } model.nodeStructureChanged(parentNode == null ? node : parentNode); return node; } + // Try to find a solution to sort node with comparator + // This one don't work, i think new nodes dont have bean + protected List<E> sortWithComparators(List<E> children) { + for (JAXXComparator<?> comparator : comparators){ + Class<? extends Object> beanType = children.get(0).getBean(model.getContext()).getClass(); + if (comparator.getClazz() + .isAssignableFrom(beanType)){ + List<E> result = sortWithComparator(children, comparator); + if (result != null){ + return result; + } + } + } + return children; + } + + protected <T> List<E> sortWithComparator( + List<E> children, + JAXXComparator<T> comparator) { + + Map<T, E> toSort = new HashMap<T, E>(); + + List<T> beans = new ArrayList<T>(); + + // Extract beans + int cnt = 0; + for (E child : children){ + Object o = child.getBean(model.getContext()); + T casted = (T) o; + beans.add(casted); + toSort.put(casted, child); + if (log.isDebugEnabled()){ + log.debug("Will sort : " + ++cnt + " - " + (casted == null ? "null" : casted.toString())); + } + } + + // Sort beans + Collections.sort(beans, comparator); + + // Retrieve sorted nodes + children.clear(); + cnt = 0; + for (T bean : beans){ + E retrieveNode = toSort.get(bean); + if (log.isDebugEnabled()){ + log.debug("Retrieve sorted bean : " + + ++cnt + " - " + (bean == null ? "null" : bean.toString())); + } + children.add(retrieveNode); + } + return children; + } + + protected Comparator<NavigationNode> getRendererComparator(){ + if (rendererComparator == null){ + rendererComparator = new Comparator<NavigationNode>() { + + @Override + public int compare(NavigationNode o1, NavigationNode o2) { + String label1 = o1.getRenderer().toString(); + String label2 = o2.getRenderer().toString(); + if (label1 == null || label2 == null){ + return 0; + } + return label1.compareTo(label2); + } + }; + } + return rendererComparator; + } + + public interface JAXXComparator<T> extends Comparator<T>{ + + Class<T> getClazz(); + } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java 2010-03-30 12:44:07 UTC (rev 1818) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/tree/NavigationTreeModelBuilder.java 2010-03-30 12:52:36 UTC (rev 1819) @@ -29,6 +29,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Comparator; +import java.util.List; + /** * This object is design to build a {@link NavigationTreeModel}. * @@ -54,12 +57,96 @@ } public NavigationTreeModelBuilder( + String pathSeparator, + JAXXContext context, Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, + boolean useRendererComparator) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeModel(pathSeparator, context), + useRendererComparator + ); + } + + public NavigationTreeModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + JAXXComparator<?> comparator) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeModel(pathSeparator, context), + comparator + ); + } + + public NavigationTreeModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + List<JAXXComparator<?>> comparators) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeModel(pathSeparator, context), + comparators + ); + } + + public NavigationTreeModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + JAXXComparator<?> ... comparators) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeModel(pathSeparator, context), + comparators + ); + } + + public NavigationTreeModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, NavigationTreeModel model) { super(defaultUIClass, defaultUIHandlerClass, model); } + public NavigationTreeModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeModel model, + boolean useRendererComparator) { + super(defaultUIClass, defaultUIHandlerClass, model, useRendererComparator); + } + + public NavigationTreeModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeModel model, + JAXXComparator<?> comparator) { + super(defaultUIClass, defaultUIHandlerClass, model, comparator); + } + + public NavigationTreeModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeModel model, + List<JAXXComparator<?>> comparators) { + super(defaultUIClass, defaultUIHandlerClass, model, comparators); + } + + public NavigationTreeModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeModel model, + JAXXComparator<?> ... comparators) { + super(defaultUIClass, defaultUIHandlerClass, model, comparators); + } + @Override public NavigationTreeNode createNavigationNode( String pathSeparator, Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java 2010-03-30 12:44:07 UTC (rev 1818) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModelBuilder.java 2010-03-30 12:52:36 UTC (rev 1819) @@ -5,12 +5,13 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.navigation.AbstractNavigationModelBuilder; +import jaxx.runtime.swing.navigation.NavigationModel; +import jaxx.runtime.swing.navigation.NavigationNode; -import java.util.List; +import java.util.*; public class NavigationTreeTableModelBuilder extends AbstractNavigationModelBuilder<NavigationTreeTableNode> { - public NavigationTreeTableModelBuilder( String pathSeparator, JAXXContext context, @@ -24,12 +25,100 @@ } public NavigationTreeTableModelBuilder( + String pathSeparator, + JAXXContext context, Class<? extends JAXXObject> defaultUIClass, Class<? extends JAXXAction> defaultUIHandlerClass, + List<String> columnsName, + boolean useRendererComparator) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeTableModel(pathSeparator, context, columnsName), + useRendererComparator + ); + } + + public NavigationTreeTableModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + List<String> columnsName, + JAXXComparator<?> comparator) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeTableModel(pathSeparator, context, columnsName), + comparator + ); + } + + public NavigationTreeTableModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + List<String> columnsName, + List<JAXXComparator<?>> comparators) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeTableModel(pathSeparator, context, columnsName), + comparators + ); + } + + public NavigationTreeTableModelBuilder( + String pathSeparator, + JAXXContext context, + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + List<String> columnsName, + JAXXComparator<?> ... comparators) { + this(defaultUIClass, + defaultUIHandlerClass, + new NavigationTreeTableModel(pathSeparator, context, columnsName), + comparators + ); + } + + public NavigationTreeTableModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, NavigationTreeTableModel model) { super(defaultUIClass, defaultUIHandlerClass, model); } + public NavigationTreeTableModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeTableModel model, + boolean useRendererComparator) { + super(defaultUIClass, defaultUIHandlerClass, model, useRendererComparator); + } + + public NavigationTreeTableModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeTableModel model, + JAXXComparator<?> comparator) { + super(defaultUIClass, defaultUIHandlerClass, model, comparator); + } + + public NavigationTreeTableModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeTableModel model, + List<JAXXComparator<?>> comparators) { + super(defaultUIClass, defaultUIHandlerClass, model, comparators); + } + + public NavigationTreeTableModelBuilder( + Class<? extends JAXXObject> defaultUIClass, + Class<? extends JAXXAction> defaultUIHandlerClass, + NavigationTreeTableModel model, + JAXXComparator<?>... comparators) { + super(defaultUIClass, defaultUIHandlerClass, model, comparators); + } + @Override public NavigationTreeTableNode createNavigationNode( String pathSeparator,

1 0

r1818 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable
by sletellier＠users.nuiton.org March 30, 2010

March 30, 2010

Author: sletellier Date: 2010-03-30 14:44:07 +0200 (Tue, 30 Mar 2010) New Revision: 1818 Log: Fix bug when root node structure change in TreeTable Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModel.java 2010-03-27 20:03:46 UTC (rev 1817) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/treetable/NavigationTreeTableModel.java 2010-03-30 12:44:07 UTC (rev 1818) @@ -127,11 +127,17 @@ public void nodeStructureChanged(NavigationTreeTableNode node) { if (node != null) { NavigationTreeTableNode parent = node.getParent(); - TreeNode[] treeNodes = getPathToRoot(parent); - if (treeNodes != null) { - getModelSupport().fireTreeStructureChanged(new TreePath(treeNodes)); + if (parent == null || parent.isRoot()){ + getModelSupport().fireNewRoot(); } else { - log.error("[Node structure changed] Path to root is null !"); + TreeNode[] treeNodes = getPathToRoot(parent); + if (treeNodes != null) { + getModelSupport().fireTreeStructureChanged(new TreePath(treeNodes)); + } + // FIXME : it's append.... +// else { +// log.error("[Node structure changed] Path to root is null !"); +// } } reload(node, true); } else { @@ -147,8 +153,10 @@ if (treeNodes != null) { getModelSupport().fireChildChanged( new TreePath(treeNodes), parent.getIndex(node), node); - } else { - log.error("[Node changed] Path to root is null !"); + // FIXME : it's append.... +// else { +// log.error("[Node changed] Path to root is null !"); +// } } reload(node, deep); } else {

1 0

r1817 - trunk
by tchemit＠users.nuiton.org March 27, 2010

March 27, 2010

Author: tchemit Date: 2010-03-27 21:03:46 +0100 (Sat, 27 Mar 2010) New Revision: 1817 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-27 16:12:27 UTC (rev 1816) +++ trunk/pom.xml 2010-03-27 20:03:46 UTC (rev 1817) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>jaxx</artifactId>

1 0