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

r2384 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 18:08:24 +0200 (Thu, 05 Jul 2012) New Revision: 2384 Url: http://nuiton.org/repositories/revision/jaxx/2384 Log: fixes #930: Use maven-plugin-plugin 3 api Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -27,10 +27,19 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.I18nUtil; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Set; /** * Abstract Mojo to generate help stuff. @@ -45,52 +54,49 @@ * * The first locale given is the default locale. * - * @parameter expression="${jaxx.locales}" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.locales", required = true) protected String locales; + /** * Where to generate helpIds files. * - * @parameter expression="${jaxx.outputHelpIds}" default-value="target/generated-sources/jaxx" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.outputHelpIds", defaultValue = "target/generated-sources/jaxx", required = true) private File outputHelpIds; + /** * The store of helpIds generated by the goal {@link GenerateMojo} and then * used by the goal {@link GenerateHelpMojo}. * - * @parameter expression="${jaxx.helpIdsFilename}" default-value="helpIds.properties" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.properties", required = true) private String helpIdsFilename; + /** * The store of cumulate helpIds generated by the goal {@link GenerateMojo} * and then used by the goal {@link GenerateHelpMojo}. * - * @parameter expression="${jaxx.mergeHelpIdsFilename}" default-value="helpIds-all.properties" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.properties", required = true) private String mergeHelpIdsFilename; + /** * Flag to generate the search index. * - * @parameter expression="${jaxx.generateSearch}" default-value="true" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.generateSearch", defaultValue = "true", required = true) protected boolean generateSearch; - /** - * Default locale (the first locale in {@link #localesToTreate}. - */ + + /** Default locale (the first locale in {@link #localesToTreate}. */ private Locale defaultLocale; - /** - * Locales to treate - */ + + /** Locales to treate */ private Locale[] localesToTreate; /** @@ -110,9 +116,7 @@ File source, String localePath) throws Exception; - /** - * Call back after doing all stuff for all locales declared - */ + /** Call back after doing all stuff for all locales declared */ protected abstract void postDoAction(); @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -24,6 +24,8 @@ */ 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; import org.nuiton.plugin.AbstractPlugin; @@ -44,41 +46,35 @@ public abstract void setTargetDirectory(File targetDirectory); - /** - * Dépendance du projet. - * - * @parameter default-value="${project}" - * @required - * @readonly - */ + /** Current maven project. */ + @Component private MavenProject project; /** - * Encoding pour la generation des fichiers. + * Encoding used for file generation. * * Note: If nothing is filled here, we will use the system * property {@code file.encoding}. * - * @parameter expression="${jaxx.encoding}" default-value="${project.build.sourceEncoding}" * @since 2.0.0 */ + @Parameter(property = "jaxx.encoding", defaultValue = "${project.build.sourceEncoding}") private String encoding; /** - * verbose flag + * Verbose flag. * - * @parameter expression="${jaxx.verbose}" default-value="false" * @since 1.3 */ + @Parameter(property = "jaxx.verbose", defaultValue = "false") private boolean verbose; /** - * to force generation of java source for any jaxx files with no timestamp checking. + * To force generation of java source for any jaxx files with no timestamp checking. * * By default, never force generation. - * - * @parameter expression="${jaxx.force}" default-value="false" */ + @Parameter(property = "jaxx.force", defaultValue = "false") private boolean force; /** @@ -86,9 +82,9 @@ * * By default, not active. * - * @parameter expression="${jaxx.generateHelp}" default-value="false" * @since 1.3 */ + @Parameter(property = "jaxx.generateHelp", defaultValue = "false") protected boolean generateHelp; @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,11 @@ package org.nuiton.jaxx.plugin; import org.apache.commons.io.FileUtils; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.plugin.VelocityTemplateGenerator; import org.nuiton.util.SortedProperties; @@ -40,13 +45,13 @@ * Mojo to generate javax help files for your project. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-files - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-ids * @since 2.0.0 */ +@Mojo(name = "generate-help-files", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-ids") public class GenerateHelpFilesMojo extends AbstractGenerateHelpMojo { protected static final String AUTOREMOVE_LINE = @@ -55,79 +60,80 @@ /** * The directory where to create or update help files. * - * @parameter expression="${jaxx.outputHelp}" default-value="${project.basedir}/src/main/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.outputHelp", defaultValue = "${project.basedir}/src/main/help", required = true) protected File outputHelp; + /** * The name of the helpset to generate. * - * @parameter expression="${jaxx.helpsetName}" default-value="${project.artifactId}" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpsetName", defaultValue = "${project.artifactId}", required = true) protected String helpsetName; + /** * The template used to generate helpset file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.helpsetTemplate}" default-value="/defaultHelpSet.hs.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpsetTemplate", defaultValue = "/defaultHelpSet.hs.vm", required = true) protected File helpsetTemplate; + /** * The template used to generate helpset map file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.mapTemplate}" default-value="/defaultMap.jhm.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.mapTemplate", defaultValue = "/defaultMap.jhm.vm", required = true) protected File mapTemplate; + /** * The template used to generate helpset index file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.indexTemplate}" default-value="/defaultIndex.xml.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.indexTemplate", defaultValue = "/defaultIndex.xml.vm", required = true) protected File indexTemplate; + /** * The template used to generate helpset toc file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.tocTemplate}" default-value="/defaultToc.xml.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.tocTemplate", defaultValue = "/defaultToc.xml.vm", required = true) protected File tocTemplate; + /** * The template used to generate helpset content file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.contentTemplate}" default-value="/defaultContent.html.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.contentTemplate", defaultValue = "/defaultContent.html.vm", required = true) protected File contentTemplate; protected String mapFileName; + protected String indexFileName; + protected String tocFileName; + protected int touchedFiles; + protected File idsFile; - /** - * The help ids discovered. - */ + /** The help ids discovered. */ protected Properties helpIds; @Override @@ -303,7 +309,7 @@ boolean exist = f.exists(); if (exist) { // check if there is a autoremoveLine in content - String content = FileUtils.readFileToString( f ); + String content = FileUtils.readFileToString(f); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,8 @@ import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import java.io.File; import java.util.Locale; @@ -37,17 +39,13 @@ * Created: 22 déc. 2009 * * @author tchemit <chemit(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-ids - * @phase process-sources - * @requiresProject * @since 2.0.0 */ +@Mojo(name = "generate-help-ids", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - /** - * help ids to react. - */ + /** help ids to react. */ protected Set<String> helpIds; @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -25,6 +25,11 @@ package org.nuiton.jaxx.plugin; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; + import java.io.File; import java.util.Locale; @@ -34,13 +39,13 @@ * This mojo will chain all others help mojo required. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-search * @since 1.3 */ +@Mojo(name = "generate-help", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-search") public class GenerateHelpMojo extends AbstractGenerateHelpMojo { @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,11 @@ package org.nuiton.jaxx.plugin; import com.sun.java.help.search.Indexer; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.FileUtils; import org.nuiton.plugin.PluginHelper; @@ -43,31 +48,29 @@ * your src directories (this is mainly binary files not to be stored in scm system)... * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-search - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-files * @since 2.0.0 */ +@Mojo(name = "generate-help-search", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-files") public class GenerateHelpSearchMojo extends AbstractGenerateHelpMojo { /** * The directory where to create or update help search index files. * - * @parameter expression="${jaxx.outputHelpSearch}" default-value="${project.basedir}/target/generated-sources/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.outputHelpSearch", defaultValue = "${project.basedir}/target/generated-sources/help", required = true) protected File outputHelpSearch; /** * The directory where to pick content files to generate the index. * - * @parameter expression="${jaxx.inputHelp}" default-value="${project.basedir}/src/main/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.inputHelp", defaultValue = "${project.basedir}/src/main/help", required = true) protected File inputHelp; protected String timestamp; Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -29,11 +29,11 @@ import jaxx.compiler.CompilerConfiguration; import jaxx.compiler.I18nHelper; import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.JAXXEngine; import jaxx.compiler.JAXXFactory; import jaxx.compiler.beans.BeanInfoUtil; import jaxx.compiler.binding.DataBindingHelper; +import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.spi.DefaultInitializer; import jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; @@ -42,6 +42,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.i18n.I18n; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.PluginHelper; @@ -59,158 +64,139 @@ * Generates some java code from jaxx files. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate - * @phase process-sources - * @requiresDependencyResolution compile - * @requiresProject */ +@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true) public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfiguration { /** Default includes to use, if none provided */ private static final String[] INCLUDES = {"**/*.jaxx", "**/*.css"}; /** - * Repertoire sources des fichiers jaxx a generer. - * - * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" + * Directory where jaxx files are located. */ + @Parameter(property = "jaxx.src", defaultValue = "${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" + * Where to generate java files. */ + @Parameter(property = "jaxx.outJava", defaultValue = "${basedir}/target/generated-sources/java") protected File outJava; /** - * pour filter les fichiers a traiter - * - * @parameter expression="${jaxx.includes}" + * To filter file to treat. */ + @Parameter(property = "jaxx.includes") protected String[] includes; /** - * pour filter les fichiers a ne pas traiter - * - * @parameter expression="${jaxx.excludes}" + * To filter files to NOt treat. */ + @Parameter(property = "jaxx.excludes") protected String[] excludes; /** - * Le compilateur à utiliser (par défaut celui de Swing) - * - * @parameter expression="${jaxx.compilerFQN}" default-value="jaxx.compiler.JAXXCompiler" + * FQN of compiler to use (by default swing one). */ + @Parameter(property = "jaxx.compilerFQN", defaultValue = "jaxx.compiler.JAXXCompiler", required = true) protected String compilerFQN; /** - * 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. - * - * @parameter expression="${jaxx.jaxxContextFQN}" default-value="jaxx.runtime.context.DefaultJAXXContext" - * @required */ + @Parameter(property = "jaxx.jaxxContextFQN", defaultValue = "jaxx.runtime.context.DefaultJAXXContext", required = true) protected String jaxxContextFQN; /** - * the FQN of the ui to use for error notification. + * The FQN of the ui to use for error notification. * * If not given, will use the one defined in validator - * - * @parameter expression="${jaxx.defaultErrorUIFQN}" */ + @Parameter(property = "jaxx.defaultErrorUIFQN") protected String defaultErrorUIFQN; /** - * the FQN of the ui to use for error notification. + * 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" * @see CompiledObjectDecorator */ + @Parameter(property = "jaxx.defaultDecoratorFQN", defaultValue = "jaxx.compiler.decorators.DefaultCompiledObjectDecorator") protected String defaultDecoratorFQN; /** - * flag to include in compiler classpath the java sources directories (src + * Flag to include in compiler classpath the java sources directories (src * and outJava). * * By default, false. - * - * @parameter expression="${jaxx.addSourcesToClassPath}" - * default-value="false" */ + @Parameter(property = "jaxx.addSourcesToClassPath", defaultValue = "false") protected boolean addSourcesToClassPath; /** - * flag to include in compiler classpath the java resources directories (src + * Flag to include in compiler classpath the java resources directories (src * and outJava). * * By default, false. * - * @parameter expression="${jaxx.addResourcesToClassPath}" - * default-value="false" * @since 1.6.0 */ + @Parameter(property = "jaxx.addResourcesToClassPath", defaultValue = "false") protected boolean addResourcesToClassPath; /** - * flag to include in compiler classpath the compile class-path (can only be + * 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" * @since 1.6.0 */ + @Parameter(property = "jaxx.addCompileClassPath", defaultValue = "false") protected boolean addCompileClassPath; /** - * flag to include in compiler classpath the project compile classpath. + * Flag to include in compiler classpath the project compile classpath. * * By default, false. - * - * @parameter expression="${jaxx.addProjectClassPath}" - * default-value="false" */ + @Parameter(property = "jaxx.addProjectClassPath", defaultValue = "false") protected boolean addProjectClassPath; /** - * A flag to mark themojo to be used in a test phase. This will permits to + * A flag to mark the mojo 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 */ + @Parameter(property = "jaxx.testPhase", defaultValue = "false") protected boolean testPhase; /** - * to make compiler i18nable, says add the {@link I18n#_(String, Object...)} + * 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 */ + @Parameter(property = "jaxx.i18nable", defaultValue = "true") protected boolean i18nable; /** - * pour optimizer le code compile ou genere ? - * - * @parameter expression="${jaxx.optimize}" default-value="false" + * To optimize generated code. */ + @Parameter(property = "jaxx.optimize", defaultValue = "false") protected boolean optimize; /** * To auto import css files for a jaxx file. * - * @parameter expression="${jaxx.autoImportCss}" default-value="false" * @since 2.0.2 */ + @Parameter(property = "jaxx.autoImportCss", defaultValue = "false") protected boolean autoImportCss; /** @@ -220,31 +206,29 @@ * Warning: This option will be removed in version 3.0 or at least * default value will become {@code false}. * - * @parameter expression="${jaxx.autoRecurseInCss}" default-value="true" * @since 2.0.2 */ + @Parameter(property = "jaxx.autoRecurseInCss", defaultValue = "true") protected boolean autoRecurseInCss; /** - * flag to add logger to each generated jaxx file. + * Flag to add logger to each generated jaxx file. * * By default, always add it. - * - * @parameter expression="${jaxx.addLogger}" default-value="true" */ + @Parameter(property = "jaxx.addLogger", defaultValue = "true") protected boolean addLogger; /** - * flag to keep compilers after the generate operation (usefull for tests. + * Flag to keep compilers after the generate operation (usefull for tests. * * By default, always reset. - * - * @parameter expression="${jaxx.resetAfterCompile}" default-value="true" */ + @Parameter(property = "jaxx.resetAfterCompile", defaultValue = "true") protected boolean resetAfterCompile; /** - * extra path to be added in {@link Introspector#setBeanInfoSearchPath(String[])}. + * Extra path to be added in {@link Introspector#setBeanInfoSearchPath(String[])}. * * add beanInfoSearchPath to be registred by {@link BeanInfoUtil#addJaxxBeanInfoPath(String...)} * @@ -252,33 +236,28 @@ * * * This permit to use real beanInfo of imported graphic libraries. - * - * @parameter expression="${jaxx.beanInfoSearchPath}" */ + @Parameter(property = "jaxx.beanInfoSearchPath") protected String[] beanInfoSearchPath; /** - * list of fqn of class toimport for all generated jaxx files - * - * @parameter expression="${jaxx.extraImportList}" + * List of fqn of class toimport for all generated jaxx files. */ + @Parameter(property = "jaxx.extraImportList") protected String extraImportList; /** - * a flag to use UIManager to retreave icons. - * - * @parameter expression="${jaxx.useUIManagerForIcon}" - * default-value="false" + * A flag to use UIManager to retreave icons. */ + @Parameter(property = "jaxx.useUIManagerForIcon", defaultValue = "false") protected boolean useUIManagerForIcon; /** * flag to activate profile mode. * * By default, not active. - * - * @parameter expression="${jaxx.profile}" default-value="false" */ + @Parameter(property = "jaxx.profile", defaultValue = "false") protected boolean profile; /** @@ -286,9 +265,9 @@ * * By default, do not show them. * - * @parameter expression="${jaxx.showBinding}" default-value="false" * @since 2.0.0 */ + @Parameter(property = "jaxx.showBinding", defaultValue = "false") protected boolean showBinding; /** @@ -296,9 +275,9 @@ * * By default, use the JAXX implementation {@link JAXXHelpBroker}. * - * @parameter expression="${jaxx.helpBrokerFQN}" default-value="jaxx.runtime.swing.help.JAXXHelpBroker" * @since 1.3 */ + @Parameter(property = "jaxx.helpBrokerFQN", defaultValue = "jaxx.runtime.swing.help.JAXXHelpBroker") protected String helpBrokerFQN; /** @@ -306,11 +285,35 @@ * * By default, do not trace it. * - * @parameter expression="${jaxx.showClassDescriptorLoading}" default-value="false" * @since 2.4 */ + @Parameter(property = "jaxx.showClassDescriptorLoading", defaultValue = "false") private boolean showClassDescriptorLoading; + /** + * Decorators available in engine. + * + * @since 2.0.2 + */ + @Component(role = CompiledObjectDecorator.class) + protected Map<String, CompiledObjectDecorator> decorators; + + /** + * Finalizers available in engine. + * + * @since 2.0.2 + */ + @Component(role = JAXXCompilerFinalizer.class) + protected Map<String, JAXXCompilerFinalizer> finalizers; + + /** + * Initializers available to init engine. + * + * @since 2.0.2 + */ + @Component(role = Initializer.class) + protected Map<String, Initializer> initializers; + /** detected jaxx files in {@link #init()} method */ protected String[] files; @@ -342,30 +345,6 @@ /** customized classloader to use in engine */ protected ClassLoader cl; - /** - * decorators available in engine. - * - * @component role="jaxx.compiler.CompiledObjectDecorator" - * @since 2.0.2 - */ - protected Map<String, CompiledObjectDecorator> decorators; - - /** - * Finalizers available in engine. - * - * @component role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" - * @since 2.0.2 - */ - protected Map<String, JAXXCompilerFinalizer> finalizers; - - /** - * initializers availables to init engine. - * - * @component role="jaxx.compiler.spi.Initializer" - * @since 2.0.2 - */ - protected Map<String, Initializer> initializers; - /** JAXX engine */ private JAXXEngine engine;

1 0

r2383 - in trunk: . jaxx-maven-plugin
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 18:08:02 +0200 (Thu, 05 Jul 2012) New Revision: 2383 Url: http://nuiton.org/repositories/revision/jaxx/2383 Log: refs #2166: Updates to mavenpom 3.3.4 fixes #2167: Updates to eugene 2.4.2 fixes #2168: Updates to maven-verifier 1.3 fixes #2169: Updates to plexus-utils 3.0.1 Modified: trunk/jaxx-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -24,7 +24,9 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -76,6 +78,11 @@ <artifactId>maven-project</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> +  <dependency> @@ -92,7 +99,7 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -107,7 +114,7 @@ <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> </dependency> - +  <dependency> <groupId>com.sun</groupId> @@ -145,11 +152,11 @@ </dependency>  - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>log4j</groupId> @@ -175,36 +182,30 @@ <packaging>maven-plugin</packaging> - <profiles> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <build> + <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - </build> - </profile> + </build> -  + <profiles> + <profile> <id>reporting</id> <activation> @@ -222,6 +223,35 @@ <version>${pluginPluginVersion}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>true</quiet> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${pluginPluginVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.5.5</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -109,12 +109,11 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugeneVersion>2.3.2</eugeneVersion> + <eugeneVersion>2.4.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> - <jrstPluginVersion>2.0.1</jrstPluginVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -174,6 +173,10 @@ <artifactId>jaxen</artifactId> </exclusion> <exclusion> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -349,12 +352,6 @@ </dependency>  -  - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> @@ -396,10 +393,18 @@ </exclusions> </dependency> +  <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> - <version>1.0</version> + <version>1.3</version> <scope>test</scope> </dependency> @@ -442,7 +447,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.1</version> <scope>compile</scope> </dependency>

1 0

r2382 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 16:56:58 +0200 (Thu, 05 Jul 2012) New Revision: 2382 Url: http://nuiton.org/repositories/revision/jaxx/2382 Log: fixes #2163 Improve ActionWorker api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2012-07-05 13:51:54 UTC (rev 2381) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2012-07-05 14:56:58 UTC (rev 2382) @@ -24,11 +24,13 @@ */ package jaxx.runtime.swing.application; +import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; import javax.swing.SwingWorker; +import java.util.concurrent.Callable; /** * Action worker to execute a incoming action. @@ -43,7 +45,7 @@ protected final String actionLabel; - protected Runnable target; + protected Callable<R> target; protected ActionStatus status; @@ -58,38 +60,39 @@ } public ActionWorker(String actionLabel, Runnable target) { - this.target = target; + this.target = new RunnableBridge<R>(target); this.actionLabel = actionLabel; } - public Runnable getTarget() { + public Callable<R> getTarget() { return target; } public void setTarget(Runnable target) { - this.target = target; + setTarget(new RunnableBridge<R>(target)); } /** * Set the target to execute. * - * @param targetWithException the target to execute + * @param target the target to execute * @since 2.5.1 */ - public void setTarget(RunnableWithException targetWithException) { - setTarget(new RunnableBridge(targetWithException)); + public void setTarget(Callable<R> target) { + this.target = target; } @Override protected R doInBackground() throws Exception { + Preconditions.checkNotNull(target != null, "Targe field can not be null here."); startTime = System.nanoTime(); if (log.isDebugEnabled()) { log.debug("Action [" + getActionLabel() + "] is starting..."); } + R result = null; try { - getTarget().run(); - } catch (RunnableBridgeException e) { - error = (Exception) e.getCause(); + + result = getTarget().call(); } catch (Exception e) { error = e; } finally { @@ -97,7 +100,7 @@ log.debug("Action [" + getActionLabel() + "] is ending..."); } } - return null; + return result; } public boolean isFailed() { @@ -152,47 +155,23 @@ } /** - * Contract like {@link Runnable} but with exception autorized. + * Transform a {@link Runnable} into a {@link Callable}. * + * @param <R> type of return (used to maintain generic checks in this class). * @since 2.5.1 */ - public static interface RunnableWithException { + private static class RunnableBridge<R> implements Callable<R> { - void run() throws Exception; - } + private final Runnable target; - /** - * This exception is used by a {@link Runnable} when executing a - * {@link RunnableWithException} inside the - * {@link ActionWorker#doInBackground()} - * method. - * - * @since 2.5.1 - */ - private static class RunnableBridgeException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - private RunnableBridgeException(Throwable cause) { - super(cause); - } - } - - public static class RunnableBridge implements Runnable { - - private final RunnableWithException target; - - public RunnableBridge(RunnableWithException target) { + public RunnableBridge(Runnable target) { this.target = target; } @Override - public void run() { - try { - target.run(); - } catch (Exception e) { - throw new RunnableBridgeException(e); - } + public R call() throws Exception { + target.run(); + return null; } }

1 0

r2381 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 15:51:54 +0200 (Thu, 05 Jul 2012) New Revision: 2381 Url: http://nuiton.org/repositories/revision/jaxx/2381 Log: #2163: Improve ActionWorker api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2012-07-04 16:12:58 UTC (rev 2380) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2012-07-05 13:51:54 UTC (rev 2381) @@ -70,6 +70,16 @@ this.target = target; } + /** + * Set the target to execute. + * + * @param targetWithException the target to execute + * @since 2.5.1 + */ + public void setTarget(RunnableWithException targetWithException) { + setTarget(new RunnableBridge(targetWithException)); + } + @Override protected R doInBackground() throws Exception { startTime = System.nanoTime(); @@ -78,6 +88,8 @@ } try { getTarget().run(); + } catch (RunnableBridgeException e) { + error = (Exception) e.getCause(); } catch (Exception e) { error = e; } finally { @@ -139,4 +151,49 @@ FAIL } + /** + * Contract like {@link Runnable} but with exception autorized. + * + * @since 2.5.1 + */ + public static interface RunnableWithException { + + void run() throws Exception; + } + + /** + * This exception is used by a {@link Runnable} when executing a + * {@link RunnableWithException} inside the + * {@link ActionWorker#doInBackground()} + * method. + * + * @since 2.5.1 + */ + private static class RunnableBridgeException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + private RunnableBridgeException(Throwable cause) { + super(cause); + } + } + + public static class RunnableBridge implements Runnable { + + private final RunnableWithException target; + + public RunnableBridge(RunnableWithException target) { + this.target = target; + } + + @Override + public void run() { + try { + target.run(); + } catch (Exception e) { + throw new RunnableBridgeException(e); + } + } + } + }

1 0

r2380 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-demo/src/main/java/jaxx/demo/feature/validation
by tchemit＠users.nuiton.org July 4, 2012

July 4, 2012

Author: tchemit Date: 2012-07-04 18:12:58 +0200 (Wed, 04 Jul 2012) New Revision: 2380 Url: http://nuiton.org/repositories/revision/jaxx/2380 Log: fixes #2161: Can't use 'errors' id for SwingValidatorMessageTableModel Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2012-07-04 16:12:58 UTC (rev 2380) @@ -71,12 +71,10 @@ public static final String ERROR_LIST_ATTRIBUTE = "errorList"; public static final String ERROR_TABLE_ATTRIBUTE = "errorTable"; - //TODO-TC20091024 should change this default value to errorListModel - public static final String ERROR_LIST_MODEL_DEFAULT = "errors"; - //TODO-TC20091024 should change this default value to errorTableModel + public static final String ERROR_LIST_MODEL_DEFAULT = "errorListModel"; - public static final String ERROR_TABLE_MODEL_DEFAULT = "errors2"; + public static final String ERROR_TABLE_MODEL_DEFAULT = "errorTableModel"; public static final String ERROR_LIST_DEFAULT = "errorList"; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationListDemo.jaxx 2012-07-04 16:12:58 UTC (rev 2380) @@ -57,10 +57,8 @@ <Identity id='identity'/>  -  -  - <SwingValidatorMessageListModel id='errors' - onContentsChanged='ok.setEnabled(errors.isEmpty())'/> + <SwingValidatorMessageListModel id='errorListModel' + onContentsChanged='ok.setEnabled(errorListModel.isEmpty())'/>  <BeanValidator id='validator' bean='model1' @@ -353,7 +351,7 @@ layout='{new GridLayout()}' height='200' width='500'> <JScrollPane> - <JList id='errorList' model='{errors}' + <JList id='errorList' model='{errorListModel}' cellRenderer='{new SwingValidatorMessageListRenderer()}'/> </JScrollPane> </JPanel> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2012-07-04 16:02:22 UTC (rev 2379) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2012-07-04 16:12:58 UTC (rev 2380) @@ -58,8 +58,8 @@ <Identity id='identity'/>  - <SwingValidatorMessageTableModel id='errors2' - onTableChanged='ok.setEnabled(errors2.getRowCount()==0)'/> + <SwingValidatorMessageTableModel id='errorTableModel' + onTableChanged='ok.setEnabled(errorTableModel.getRowCount()==0)'/>  <BeanValidator id='validator' bean='model1' @@ -354,7 +354,7 @@ layout='{new GridLayout()}' height='200' width='500'> <JScrollPane columnHeaderView='{errorTable.getTableHeader()}'> - <JTable id='errorTable' model='{errors2}' rowSelectionAllowed='true' + <JTable id='errorTable' model='{errorTableModel}' rowSelectionAllowed='true' autoCreateRowSorter='true' autoResizeMode='2' cellSelectionEnabled='false' selectionMode='0'/>

1 0

July 4, 2012

Author: tchemit Date: 2012-07-04 18:02:22 +0200 (Wed, 04 Jul 2012) New Revision: 2379 Url: http://nuiton.org/repositories/revision/jaxx/2379 Log: fixes #2162: Updates to commons-lang3 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java trunk/jaxx-runtime/pom.xml trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/Movie.java trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/People.java trunk/jaxx-widgets/pom.xml trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -77,11 +77,16 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -33,7 +33,7 @@ import jaxx.compiler.tags.TagManager; import jaxx.compiler.types.TypeManager; import jaxx.runtime.JAXXUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.awt.Container; import java.util.ArrayList; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -29,8 +29,8 @@ import jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -46,7 +46,7 @@ import jaxx.runtime.JAXXObjectDescriptor; import jaxx.runtime.css.Rule; import jaxx.runtime.css.Stylesheet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.java.JavaGeneratorUtil; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -31,8 +31,8 @@ import jaxx.compiler.java.JavaFileGenerator; import jaxx.compiler.java.JavaMethod; import jaxx.compiler.types.TypeManager; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -24,8 +24,8 @@ */ package jaxx.compiler.binding; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * Created: 5 déc. 2009 Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -45,9 +45,9 @@ import jaxx.compiler.tags.TagManager; import jaxx.compiler.types.TypeManager; import jaxx.runtime.JAXXUtil; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -36,7 +36,7 @@ import jaxx.compiler.java.JavaMethod; import jaxx.compiler.script.ScriptInitializer; import jaxx.compiler.types.TypeManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -51,7 +51,7 @@ import jaxx.runtime.JAXXObjectDescriptor; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -28,7 +28,7 @@ import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.types.TypeManager; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.java.extension.ImportsManager; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -45,7 +45,7 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; import jaxx.runtime.css.Stylesheet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -31,7 +31,7 @@ import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.tags.DefaultComponentHandler; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.swing.JScrollPane; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -34,7 +34,7 @@ import jaxx.compiler.tags.TagHandler; import jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.TabInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -33,7 +33,7 @@ import jaxx.compiler.tags.TagHandler; import jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Element; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -33,6 +33,7 @@ import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.reflect.MethodDescriptor; +import org.apache.commons.lang3.StringUtils; import java.io.BufferedWriter; import java.io.FileWriter; @@ -109,7 +110,7 @@ w.append("|"); w.append(className.replace('.', '/')); w.append("|set"); - w.append(org.apache.commons.lang.StringUtils.capitalize(name)); + w.append(StringUtils.capitalize(name)); w.append("|"); w.append(JAXXCompiler.getCanonicalName(property.getPropertyType())); w.append("}}"); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -34,7 +34,7 @@ import jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; import jaxx.compiler.tools.jaxxcapture.handlers.TableHandler; import jaxx.compiler.types.TypeManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-demo/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -89,8 +89,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -25,8 +25,8 @@ package jaxx.demo.entities; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.util.ArrayList; import java.util.List; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -25,8 +25,8 @@ package jaxx.demo.entities; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import static org.nuiton.i18n.I18n.n_; Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -124,8 +124,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.jaxx.plugin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.nuiton.i18n.I18nUtil; Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -39,8 +39,8 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.help.JAXXHelpBroker; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.i18n.I18n; import org.nuiton.io.MirroredFileUpdater; Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-runtime/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -51,11 +51,6 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> <dependency> <groupId>commons-logging</groupId> Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -26,7 +26,6 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; -import org.apache.commons.lang.NotImplementedException; import java.util.Map.Entry; @@ -102,21 +101,21 @@ @Override public void setContextValue(Object o) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } @Override public void setContextValue(Object o, String name) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } @Override public <T> void removeContextValue(Class<T> klazz) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } @Override public <T> void removeContextValue(Class<T> klazz, String name) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -64,12 +64,12 @@ types = new ArrayList<Class<?>>(); List<Decorator<?>> tmp = new ArrayList<Decorator<?>>(); for (JXPathDecorator<?> d : decorator) { - if (types.contains(d.getInternalClass())) { + if (types.contains(d.getType())) { throw new IllegalArgumentException( "can not have twice a decorator of type " + - d.getInternalClass()); + d.getType()); } - types.add(d.getInternalClass()); + types.add(d.getType()); tmp.add(d); } decorators = tmp.toArray(new Decorator<?>[tmp.size()]); Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-tutorial-validation/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -85,8 +85,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/Movie.java =================================================================== --- trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/Movie.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/Movie.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -25,8 +25,8 @@ package jaxx.demo.validation.model; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.util.ArrayList; import java.util.List; Modified: trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/People.java =================================================================== --- trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/People.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-tutorial-validation/src/main/java/jaxx/demo/validation/model/People.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -25,8 +25,8 @@ package jaxx.demo.validation.model; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import static org.nuiton.i18n.I18n.n_; Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-widgets/pom.xml 2012-07-04 16:02:22 UTC (rev 2379) @@ -72,8 +72,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-07-04 09:44:48 UTC (rev 2378) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-07-04 16:02:22 UTC (rev 2379) @@ -42,8 +42,8 @@ import javax.swing.SwingUtilities; import javax.swing.text.BadLocationException; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2378 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by sletellier＠users.nuiton.org July 4, 2012

July 4, 2012

Author: sletellier Date: 2012-07-04 11:44:48 +0200 (Wed, 04 Jul 2012) New Revision: 2378 Url: http://nuiton.org/repositories/revision/jaxx/2378 Log: fixes #2159 : Create GenericListSelectionModel extracted from GenericListModel Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-03 13:39:06 UTC (rev 2377) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-04 09:44:48 UTC (rev 2378) @@ -24,32 +24,19 @@ package jaxx.runtime.swing.model; import com.google.common.collect.Lists; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.util.Collection; import java.util.List; import javax.swing.ComboBoxModel; import javax.swing.DefaultListModel; -import javax.swing.DefaultListSelectionModel; -import javax.swing.event.EventListenerList; import javax.swing.event.ListDataListener; /** * @author sletellier <letellier(a)codelutin.com> */ -public class GenericListModel extends DefaultListSelectionModel implements ComboBoxModel { +public class GenericListModel extends GenericListSelectionModel implements ComboBoxModel { - protected EventListenerList listenerList = new EventListenerList(); - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; - - protected DefaultListModel delegate = new DefaultListModel(); - - protected List selectedValues; - public GenericListModel() { - this.selectedValues = Lists.newArrayList(); + super(new DefaultListModel()); } public GenericListModel(Collection values) { @@ -67,7 +54,7 @@ fireValuesRemoved(oldValues); for (B value : values) { - delegate.addElement(value); + getListModel().addElement(value); } fireSelectionAdded(values); @@ -75,184 +62,64 @@ public void clearElements() { Collection elements = getElements(); - delegate.clear(); + getListModel().clear(); fireValuesRemoved(elements); } public Collection getElements() { - int size = delegate.getSize(); + int size = getListModel().getSize(); Collection result = Lists.newArrayList(); for (int i=0;i<size;i++) { - result.add((B) delegate.get(i)); + result.add((B) getListModel().get(i)); } return result; } public void addElement(int index, B valueToAdd) { - delegate.add(index, valueToAdd); + getListModel().add(index, valueToAdd); fireValuesAdded(Lists.newArrayList(valueToAdd)); } public void addElement(B valueToAdd) { - delegate.addElement(valueToAdd); + getListModel().addElement(valueToAdd); fireValuesAdded(Lists.newArrayList(valueToAdd)); } public void addElements(Collection valuesToAdd) { for (B value : valuesToAdd) { - delegate.addElement(value); + getListModel().addElement(value); } fireValuesAdded(valuesToAdd); } - public B getSelectedValue() { - return selectedValues.get(0); - } - - public Collection getSelectedValues() { - return Lists.newArrayList(selectedValues); - } - public void removeElements(Collection values) { for (B value : values) { - delegate.removeElement(value); + getListModel().removeElement(value); } unSelectItems(values); fireValuesRemoved(values); } - protected void unSelectItems(Collection values) { - Collection oldValue = Lists.newArrayList(selectedValues); - for (B value : values) { - int index = selectedValues.indexOf(value); - removeSelectionIntervalWithoutFire(index, index); - } - fireSelectionRemoved(values); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void unSelectItem(B value) { - Collection oldValue = Lists.newArrayList(selectedValues); - int index = selectedValues.indexOf(value); - removeSelectionIntervalWithoutFire(index, index); - - fireSelectionRemoved(Lists.newArrayList(value)); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public void addSelectedItem(B toSelect) { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.add(toSelect); - int index = selectedValues.indexOf(toSelect); - super.addSelectionInterval(index, index); - - fireSelectionAdded(Lists.newArrayList(toSelect)); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public boolean hasSelectedIndex() { - return !selectedValues.isEmpty(); - } - @Override - public void addSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - - addSelectionIntervalWithFire(index0, index1); - super.addSelectionInterval(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionAdded(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public void setSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - addSelectionIntervalWithFire(index0, index1); - super.setSelectionInterval(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionAdded(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public void removeSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - removeSelectionIntervalWithoutFire(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionRemoved(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void removeSelectionIntervalWithoutFire(int index0, int index1) { - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - if (selectedValues.size() > i && i != -1) { - selectedValues.remove(i); - } - } - super.removeSelectionInterval(index0, index1); - } - - protected void addSelectionIntervalWithFire(int index0, int index1) { - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - - if (delegate.size() > i && i != -1) { - B value = (B)delegate.getElementAt(i); - selectedValues.add(value); - } - } - } - - @Override - public void clearSelection() { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - super.clearSelection(); - + public void setSelectedItem(Object anItem) { + List oldValue = getSelectedValues(); fireSelectionRemoved(oldValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - @Override - public int getSelectionMode() { - return MULTIPLE_INTERVAL_SELECTION; - } + setSelectedValues(Lists.newArrayList((B) anItem)); - @Override - public void setSelectedItem(Object anItem) { - Collection oldValue = this.selectedValues; - fireSelectionRemoved(selectedValues); - - selectedValues = Lists.newArrayList((B)anItem); - - fireSelectionAdded(selectedValues); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + List newValues = getSelectedValues(); + fireSelectionAdded(newValues); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, newValues); } @Override public Object getSelectedItem() { + List selectedValues = getSelectedValues(); if (selectedValues.isEmpty()) { return null; } @@ -261,117 +128,22 @@ @Override public int getSize() { - return delegate.size(); + return getListModel().size(); } @Override public Object getElementAt(int index) { - return delegate.get(index); + return getListModel().get(index); } @Override public void addListDataListener(ListDataListener l) { - delegate.addListDataListener(l); + getListModel().addListDataListener(l); } @Override public void removeListDataListener(ListDataListener l) { - delegate.removeListDataListener(l); + getListModel().removeListDataListener(l); } - public void addGenericListListener(GenericListListener l) { - listenerList.add(GenericListListener.class, l); - } - - public void removeGenericListListener(GenericListListener l) { - listenerList.remove(GenericListListener.class, l); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void fireValuesAdded(Collection values) { - if (values.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, values); - } - ((GenericListListener)listeners[i+1]).valuesAdded(e); - } - } - } - - protected void fireValuesRemoved(Collection values) { - if (values.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, values); - } - ((GenericListListener)listeners[i+1]).valuesRemoved(e); - } - } - } - - protected void fireSelectionAdded(Collection selectedValues) { - if (selectedValues.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, selectedValues); - } - ((GenericListListener)listeners[i+1]).selectionAdded(e); - } - } - } - - protected void fireSelectionRemoved(Collection selectedValues) { - if (selectedValues.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, selectedValues); - } - ((GenericListListener)listeners[i+1]).selectionAdded(e); - } - } - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } } \ No newline at end of file Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java 2012-07-04 09:44:48 UTC (rev 2378) @@ -0,0 +1,255 @@ +package jaxx.runtime.swing.model; + +import com.google.common.collect.Lists; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.Collection; +import java.util.List; +import javax.swing.DefaultListModel; +import javax.swing.DefaultListSelectionModel; +import javax.swing.event.EventListenerList; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class GenericListSelectionModel extends DefaultListSelectionModel { + + public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; + + protected EventListenerList listenerList = new EventListenerList(); + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + protected List selectedValues; + protected DefaultListModel listModel; + + public GenericListSelectionModel(DefaultListModel listModel) { + this.selectedValues = Lists.newArrayList(); + this.listModel = listModel; + } + + public DefaultListModel getListModel() { + return listModel; + } + + public B getSelectedValue() { + return selectedValues.get(0); + } + + public List getSelectedValues() { + return Lists.newArrayList(selectedValues); + } + + public void setSelectedValues(List selectedValues) { + this.selectedValues = selectedValues; + } + + protected void unSelectItems(Collection values) { + Collection oldValue = Lists.newArrayList(selectedValues); + for (B value : values) { + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + } + fireSelectionRemoved(values); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void unSelectItem(B value) { + Collection oldValue = Lists.newArrayList(selectedValues); + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + + fireSelectionRemoved(Lists.newArrayList(value)); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public void addSelectedItem(B toSelect) { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.add(toSelect); + int index = selectedValues.indexOf(toSelect); + super.addSelectionInterval(index, index); + + fireSelectionAdded(Lists.newArrayList(toSelect)); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public boolean hasSelectedIndex() { + return !selectedValues.isEmpty(); + } + + @Override + public void addSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + + addSelectionIntervalWithFire(index0, index1); + super.addSelectionInterval(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionAdded(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + addSelectionIntervalWithFire(index0, index1); + super.setSelectionInterval(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionAdded(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void removeSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + removeSelectionIntervalWithoutFire(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionRemoved(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void removeSelectionIntervalWithoutFire(int index0, int index1) { + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + if (selectedValues.size() > i && i != -1) { + selectedValues.remove(i); + } + } + super.removeSelectionInterval(index0, index1); + } + + protected void addSelectionIntervalWithFire(int index0, int index1) { + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + + if (listModel.size() > i && i != -1) { + B value = (B)listModel.getElementAt(i); + selectedValues.add(value); + } + } + } + + @Override + public void clearSelection() { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + super.clearSelection(); + + fireSelectionRemoved(oldValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; + } + + protected void fireValuesAdded(Collection values) { + if (values.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, values); + } + ((GenericListListener)listeners[i+1]).valuesAdded(e); + } + } + } + + protected void fireValuesRemoved(Collection values) { + if (values.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, values); + } + ((GenericListListener)listeners[i+1]).valuesRemoved(e); + } + } + } + + protected void fireSelectionAdded(Collection selectedValues) { + if (selectedValues.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, selectedValues); + } + ((GenericListListener)listeners[i+1]).selectionAdded(e); + } + } + } + + protected void fireSelectionRemoved(Collection selectedValues) { + if (selectedValues.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, selectedValues); + } + ((GenericListListener)listeners[i+1]).selectionAdded(e); + } + } + } + + public void addGenericListListener(GenericListListener l) { + listenerList.add(GenericListListener.class, l); + } + + public void removeGenericListListener(GenericListListener l) { + listenerList.remove(GenericListListener.class, l); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } +}

1 0

r2377 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by tchemit＠users.nuiton.org July 3, 2012

July 3, 2012

Author: tchemit Date: 2012-07-03 15:39:06 +0200 (Tue, 03 Jul 2012) New Revision: 2377 Url: http://nuiton.org/repositories/revision/jaxx/2377 Log: revert some error commit (2334) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-03 13:12:49 UTC (rev 2376) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-03 13:39:06 UTC (rev 2377) @@ -80,6 +80,6 @@ } checkBox.setSelected((value != null && (Boolean) value)); setBorder(render.getBorder()); - return this; + return checkBox; } }

1 0

r2376 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime: . swing/renderer
by tchemit＠users.nuiton.org July 3, 2012

July 3, 2012

Author: tchemit Date: 2012-07-03 15:12:49 +0200 (Tue, 03 Jul 2012) New Revision: 2376 Url: http://nuiton.org/repositories/revision/jaxx/2376 Log: refs #2156 (reput old behaviour) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-07-02 23:28:37 UTC (rev 2375) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-07-03 13:12:49 UTC (rev 2376) @@ -24,6 +24,46 @@ */ package jaxx.runtime; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXComboBox; +import jaxx.runtime.swing.renderer.BooleanCellEditor; +import jaxx.runtime.swing.renderer.BooleanCellRenderer; +import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; +import jaxx.runtime.swing.renderer.EnumTableCellRenderer; +import jaxx.runtime.swing.renderer.I18nTableCellRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.jxlayer.plaf.LayerUI; +import org.jdesktop.swingx.JXTreeTable; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JLayeredPane; +import javax.swing.JList; +import javax.swing.JRootPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.text.AbstractDocument; +import javax.swing.text.JTextComponent; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -56,44 +96,6 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Properties; -import javax.swing.DefaultComboBoxModel; -import javax.swing.DefaultListModel; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JLayeredPane; -import javax.swing.JList; -import javax.swing.JRootPane; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTree; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; -import javax.swing.text.AbstractDocument; -import javax.swing.text.JTextComponent; -import javax.swing.tree.TreeNode; -import javax.swing.tree.TreePath; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -import jaxx.runtime.swing.renderer.BooleanCellEditor; -import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; -import jaxx.runtime.swing.renderer.EnumTableCellRenderer; -import jaxx.runtime.swing.renderer.I18nTableCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.jxlayer.plaf.LayerUI; -import org.jdesktop.swingx.JXTreeTable; import static org.nuiton.i18n.I18n._; @@ -892,6 +894,11 @@ public static TableCellRenderer newBooleanTableCellRenderer( TableCellRenderer renderer) { + return new BooleanCellRenderer(renderer); + } + + public static TableCellRenderer newBooleanTableCellEditorAndRenderer( + TableCellRenderer renderer) { return new BooleanCellEditor(renderer); } @@ -1232,11 +1239,11 @@ /** * Used to edit cell * - * @param table to edit - * @param row of cell to editing + * @param table to edit + * @param row of cell to editing * @param colummn of cell to editing * @return false if for any reason the cell cannot be edited, - * or if the indices are invalid + * or if the indices are invalid */ public static boolean editCell(JTable table, int row, int colummn) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-02 23:28:37 UTC (rev 2375) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-03 13:12:49 UTC (rev 2376) @@ -24,8 +24,6 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Color; -import java.awt.Component; import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JComponent; @@ -33,13 +31,13 @@ import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; /** - * @deprecated prefere use {@link BooleanCellEditor} * @author tchemit <chemit(a)codelutin.com> * @since 1.5 */ -@Deprecated public class BooleanCellRenderer extends JPanel implements TableCellRenderer { private static final long serialVersionUID = 1L;

1 0

r2375 - in trunk/jaxx-compiler/src: main/java/jaxx/compiler/java test/java/jaxx/compiler/java
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-03 01:28:37 +0200 (Tue, 03 Jul 2012) New Revision: 2375 Url: http://nuiton.org/repositories/revision/jaxx/2375 Log: refs #2154: Jaxx deos not compile under jdk 7 (field comparator fails) : add test and apply quick fix (but not best...) Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2012-07-02 21:52:39 UTC (rev 2374) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2012-07-02 23:28:37 UTC (rev 2375) @@ -108,22 +108,23 @@ String n1 = o1.getName(); String n2 = o2.getName(); - Matcher matcher1 = NAME_PATTERN.matcher(n1); - Matcher matcher2 = NAME_PATTERN.matcher(n2); - if (matcher1.matches() && matcher2.matches()) { - // les deux noms finissent par un nombre - String p1 = matcher1.group(1); - String p2 = matcher1.group(2); - int i = p1.compareTo(p2); - if (i != 0) { - // on est sur des noms de prefix différents, donc pas de tri sur les suffixes - return i; - } - // les deux noms doivent être triés sur les suffixes entiers - int i1 = Integer.valueOf(matcher1.group(2)); - int i2 = Integer.valueOf(matcher2.group(2)); - return i1 - i2; - } + //FIXME-tchemit-2012-07-02 (see http://nuiton.org/issues/2154) +// Matcher matcher1 = NAME_PATTERN.matcher(n1); +// Matcher matcher2 = NAME_PATTERN.matcher(n2); +// if (matcher1.matches() && matcher2.matches()) { +// // les deux noms finissent par un nombre +// String p1 = matcher1.group(1); +// String p2 = matcher1.group(2); +// int i = p1.compareTo(p2); +// if (i != 0) { +// // on est sur des noms de prefix différents, donc pas de tri sur les suffixes +// return i; +// } +// // les deux noms doivent être triés sur les suffixes entiers +// int i1 = Integer.valueOf(matcher1.group(2)); +// int i2 = Integer.valueOf(matcher2.group(2)); +// return i1 - i2; +// } // les deux noms sont simplement comparé en alpha return n1.compareTo(n2); Modified: trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java =================================================================== --- trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java 2012-07-02 21:52:39 UTC (rev 2374) +++ trunk/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java 2012-07-02 23:28:37 UTC (rev 2375) @@ -24,13 +24,16 @@ */ package jaxx.compiler.java; +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import java.lang.reflect.Modifier; +import java.util.Collections; import java.util.EnumSet; +import java.util.List; /** * Created: 3 déc. 2009 @@ -42,9 +45,7 @@ * $Author$ */ public class JavaFieldTest { - /** - * Logger - */ + /** Logger */ private static final Log log = LogFactory.getLog(JavaFieldTest.class); @Test @@ -91,4 +92,36 @@ Assert.assertTrue(constants.contains(JavaField.FieldOrder.internalFields)); } + + /** + * To test http://nuiton.org/issues/2154. + * + * @since 2.5.1 + */ + @Test + public void testCompare() { + + String[] names = new String[]{ + "cf0", + "cf1", + "cf0O1", + "cf0A1", + "ct0O1", "ct0A1", + "cgett0", + "cgett1", "cgett0O1", + "cgett0A1", "cfile", "cgetfile", "t0", "t1", + "cmt0", "cmt1", "cmt0O1", "cmt0A1", "cmgett0", + "cmgett1", "cmgett0O1", "cmgett0A1", + "cMfile", "cMgetfile", + "Mt0", "Mt1", "cit0", "cit1", "cit0O1", "cit0A1", "cigett0", + "bindings" + }; + List<JavaField> theFileds = Lists.newArrayList(); + for (String name : names) { + JavaField field = new JavaField(Modifier.PROTECTED, "String", name, false); + theFileds.add(field); + } + Collections.sort(theFileds); + + } }

1 0