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

r2504 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config: . model
by tchemit＠users.nuiton.org 10 Oct '12

10 Oct '12

Author: tchemit Date: 2012-10-10 23:15:58 +0200 (Wed, 10 Oct 2012) New Revision: 2504 Url: http://nuiton.org/repositories/revision/jaxx/2504 Log: fixed #2344: Improve ConfigUIModelBuilder api Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java 2012-10-10 20:26:05 UTC (rev 2503) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java 2012-10-10 21:15:58 UTC (rev 2504) @@ -25,6 +25,7 @@ */ package jaxx.runtime.swing.editor.config; +import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; @@ -78,62 +79,80 @@ return model; } - public void addCategory(String categoryName, String categoryLabel) + public ConfigUIModelBuilder addCategory(String categoryName, String categoryLabel) throws IllegalStateException, NullPointerException { modelBuilder.addCategory(categoryName, categoryLabel); + return modelBuilder; } - public void addOption(ApplicationConfig.OptionDef def) + public ConfigUIModelBuilder addCategory(String categoryName, String categoryLabel, String categoryCallback) throws IllegalStateException, NullPointerException { + modelBuilder.addCategory(categoryName, categoryLabel, categoryCallback); + return modelBuilder; + } + + public ConfigUIModelBuilder addOption(ApplicationConfig.OptionDef def) + throws IllegalStateException, NullPointerException { modelBuilder.addOption(def); + return modelBuilder; } - public void addOption(ApplicationConfig.OptionDef def, String propertyName) + public ConfigUIModelBuilder addOption(ApplicationConfig.OptionDef def, String propertyName) throws IllegalStateException, NullPointerException { modelBuilder.addOption(def, propertyName); + return modelBuilder; } - public void setOptionPropertyName(String propertyName) + public ConfigUIModelBuilder setOptionPropertyName(String propertyName) throws IllegalStateException, NullPointerException { modelBuilder.setOptionPropertyName(propertyName); + return modelBuilder; } - public void setOptionEditor(TableCellEditor editor) + public ConfigUIModelBuilder setOptionEditor(TableCellEditor editor) throws IllegalStateException, NullPointerException { modelBuilder.setOptionEditor(editor); + return modelBuilder; } - public void registerCallBack(String name, - String description, - Icon icon, - Runnable action) { + public ConfigUIModelBuilder registerCallBack(String name, + String description, + Icon icon, + Runnable action) { modelBuilder.registerCallBack(name, description, icon, action); + return modelBuilder; } - public void setOptionCallBack(String name) { + public ConfigUIModelBuilder setOptionCallBack(String name) { modelBuilder.setOptionCallBack(name); + return modelBuilder; } - public void setModel(ConfigUIModel model) throws IllegalStateException { + public ConfigUIModelBuilder setModel(ConfigUIModel model) throws IllegalStateException { modelBuilder.setModel(model); + return modelBuilder; } - public void setCategory(CategoryModel categoryModel) + public ConfigUIModelBuilder setCategory(CategoryModel categoryModel) throws IllegalStateException { modelBuilder.setCategory(categoryModel); + return modelBuilder; } - public void setOption(OptionModel optionModel) + public ConfigUIModelBuilder setOption(OptionModel optionModel) throws IllegalStateException { modelBuilder.setOption(optionModel); + return modelBuilder; } - public void setFinalizer(CallBackFinalizer finalizer) { + public ConfigUIModelBuilder setFinalizer(CallBackFinalizer finalizer) { modelBuilder.setFinalizer(finalizer); + return modelBuilder; } - public void setCloseAction(Runnable runnable) { + public ConfigUIModelBuilder setCloseAction(Runnable runnable) { modelBuilder.setCloseAction(runnable); + return modelBuilder; } /** @@ -158,6 +177,7 @@ } public void displayUI(Frame parentUI, boolean undecorated) { + Preconditions.checkNotNull(ui, "UI was not build, use before the *buildUI* method"); ui.getHandler().displayUI(parentUI, undecorated); } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java 2012-10-10 20:26:05 UTC (rev 2503) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java 2012-10-10 21:15:58 UTC (rev 2504) @@ -24,6 +24,7 @@ */ package jaxx.runtime.swing.editor.config.model; +import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,6 +52,13 @@ /** current category used */ CategoryModel category; + /** + * Current default callback used by a category. + * + * @since 2.5.6 + */ + String categoryDefaultCallBack; + /** current option used */ OptionModel option; @@ -58,10 +66,11 @@ * Create a new model and set it as current model. * * @param config the configuration used in model + * @return the builder * @throws IllegalStateException if there is already a current model * @throws NullPointerException if config is {@code null} */ - public void createModel(Supplier<ApplicationConfig> config) + public ConfigUIModelBuilder createModel(Supplier<ApplicationConfig> config) throws IllegalStateException, NullPointerException { checkNoCurrent(model, "model"); checkNotNull(config, "createModel", "config"); @@ -69,16 +78,18 @@ if (log.isDebugEnabled()) { log.debug("model created : " + model); } + return this; } /** * Create a new model and set it as current model. * * @param config the configuration used in model + * @return the builder * @throws IllegalStateException if there is already a current model * @throws NullPointerException if config is {@code null} */ - public void createModel(ApplicationConfig config) + public ConfigUIModelBuilder createModel(ApplicationConfig config) throws IllegalStateException, NullPointerException { checkNoCurrent(model, "model"); checkNotNull(config, "createModel", "config"); @@ -86,6 +97,7 @@ if (log.isDebugEnabled()) { log.debug("model created : " + model); } + return this; } /** @@ -98,11 +110,12 @@ * (can not to be {@code null}) * @param categoryLabel the label of the new category * (can not to be {@code null}) + * @return the builder * @throws IllegalStateException if there is not a current model, * nor category * @throws NullPointerException if any of parameter is {@code null} */ - public void addCategory(String categoryName, String categoryLabel) + public ConfigUIModelBuilder addCategory(String categoryName, String categoryLabel) throws IllegalStateException, NullPointerException { checkCurrent(model, "model"); checkNotNull(categoryName, "addCategory", "categoryName"); @@ -112,20 +125,51 @@ if (log.isDebugEnabled()) { log.debug("category created : " + category); } + return this; } /** + * Add a new category, and set it as current. + * + * Note: As side effets, if a previous category, then store it to + * the model. + * + * @param categoryName the name of the new category + * (can not to be {@code null}) + * @param categoryLabel the label of the new category + * (can not to be {@code null}) + * @return the builder + * @throws IllegalStateException if there is not a current model, + * nor category + * @throws NullPointerException if any of parameter is {@code null} + */ + public ConfigUIModelBuilder addCategory(String categoryName, String categoryLabel, String defaultCallback) + throws IllegalStateException, NullPointerException { + checkCurrent(model, "model"); + checkNotNull(categoryName, "addCategory", "categoryName"); + checkNotNull(categoryLabel, "addCategory", "categoryLabel"); + flushCategory(); + categoryDefaultCallBack = defaultCallback; + category = new CategoryModel(categoryName, categoryLabel); + if (log.isDebugEnabled()) { + log.debug("category created : " + category); + } + return this; + } + + /** * Add a new option, and set it as current. * * Note: As side effets, if a previous option, then store it to * the model. * * @param def the def ot the new option + * @return the builder * @throws IllegalStateException if there is not a current model, * nor category * @throws NullPointerException if any of parameter is {@code null} */ - public void addOption(ApplicationConfig.OptionDef def) + public ConfigUIModelBuilder addOption(ApplicationConfig.OptionDef def) throws IllegalStateException, NullPointerException { checkCurrent(model, "model"); checkCurrent(category, "category"); @@ -133,9 +177,15 @@ flushOption(); Object value = model.getApplicationConfig().getOption(def); option = new OptionModel(def, value); + if (categoryDefaultCallBack != null) { + + // use default callback + setOptionCallBack(categoryDefaultCallBack); + } if (log.isDebugEnabled()) { log.debug("option created : " + option); } + return this; } /** @@ -150,45 +200,52 @@ * * @param def the def ot the new option * @param propertyName the propertyName to set on the option + * @return the builder * @throws IllegalStateException if there is not a current model, nor * category * @throws NullPointerException if any of parameter is {@code null} */ - public void addOption(ApplicationConfig.OptionDef def, String propertyName) + public ConfigUIModelBuilder addOption(ApplicationConfig.OptionDef def, + String propertyName) throws IllegalStateException, NullPointerException { addOption(def); checkNotNull(propertyName, "setOptionPropertyName", "propertyName"); option.setPropertyName(propertyName); + return this; } /** * Set the propertyName on the current option. * * @param propertyName the propertyName to set in the current option. + * @return the builder * @throws IllegalStateException if there is not a current option set. * @throws NullPointerException if any of parameter is {@code null} * @see OptionModel#setPropertyName(String) */ - public void setOptionPropertyName(String propertyName) + public ConfigUIModelBuilder setOptionPropertyName(String propertyName) throws IllegalStateException, NullPointerException { checkCurrent(option, "option"); checkNotNull(propertyName, "setOptionPropertyName", "propertyName"); option.setPropertyName(propertyName); + return this; } /** * Set the editor on the current option. * * @param editor the editor to set in the current option. + * @return the builder * @throws IllegalStateException if there is not a current option set. * @throws NullPointerException if any of parameter is {@code null} * @see OptionModel#setEditor(TableCellEditor) */ - public void setOptionEditor(TableCellEditor editor) + public ConfigUIModelBuilder setOptionEditor(TableCellEditor editor) throws IllegalStateException, NullPointerException { checkCurrent(option, "option"); checkNotNull(editor, "setOptionEditor", "editor"); option.setEditor(editor); + return this; } /** @@ -201,34 +258,68 @@ * @param description the i18n key to describe the action * @param icon the icon of the callBack (used in ui) * @param action the action of the callback + * @return the builder */ - public void registerCallBack(String name, - String description, - Icon icon, - Runnable action) { + public ConfigUIModelBuilder registerCallBack(String name, + String description, + Icon icon, + Runnable action) { checkCurrent(model, "model"); checkNotNull(name, "registerCallBack", "name"); checkNotNull(description, "registerCallBack", "description"); checkNotNull(action, "registerCallBack", "action"); model.registerCallBack(name, description, icon, action); + return this; } /** * Registers the current option into a known callback. * * @param name the name of the callback + * @return the builder */ - public void setOptionCallBack(String name) { + public ConfigUIModelBuilder setOptionCallBack(String name) { checkCurrent(option, "option"); checkNotNull(name, "setOptionCallBack", "name"); + Preconditions.checkArgument( + categoryDefaultCallBack == null, + "You can not use the method *setOptionCallBack* when " + + "a default callback has been assigned to a category"); + model.registerOptionCallBack(name, option); + return this; } - public void setFinalizer(CallBackFinalizer finalizer) { + /** + * Sets the callback finalizet + * + * @param finalizer callback finalize + * @return the builder + * @see CallBackFinalizer + */ + public ConfigUIModelBuilder setFinalizer(CallBackFinalizer finalizer) { model.setFinalizer(finalizer); + return this; } /** + * Sets the default callback to use for this category (the call back + * will be add to all options of this category until you set another one or + * nullify it). + * + * @param categoryDefaultCallBack + * @return the buider + * @since 2.5.6 + */ + public ConfigUIModelBuilder setCategoryDefaultCallBack(String categoryDefaultCallBack) { + checkCurrent(model, "model"); + checkCurrent(category, "category"); + this.categoryDefaultCallBack = categoryDefaultCallBack; + return this; + } + + + /** * Flush the model and return it. * * Note: As a side effect, nothing is available in the builder @@ -252,16 +343,19 @@ * Note: As side effets, il will clean current category and option. * * @param model the model to use + * @return the buider * @throws IllegalStateException if there is already a current model */ - public void setModel(ConfigUIModel model) throws IllegalStateException { + public ConfigUIModelBuilder setModel(ConfigUIModel model) throws IllegalStateException { checkNoCurrent(model, "model"); this.model = model; if (log.isDebugEnabled()) { log.debug("new current model : " + this.model); } category = null; + categoryDefaultCallBack = null; option = null; + return this; } /** @@ -270,28 +364,32 @@ * Note: As side effets, il will clean current option. * * @param categoryModel the category to use + * @return the buider * @throws IllegalStateException if there is not a current model or a * current category */ - public void setCategory(CategoryModel categoryModel) + public ConfigUIModelBuilder setCategory(CategoryModel categoryModel) throws IllegalStateException { checkCurrent(model, "model"); checkNoCurrent(category, "category"); category = categoryModel; + categoryDefaultCallBack = null; if (log.isDebugEnabled()) { log.debug("new current category : " + category); } option = null; + return this; } /** * Sets the given option as current option. * * @param optionModel the option to use + * @return the buider * @throws IllegalStateException if there is not a current model, nor * category, or a current option */ - public void setOption(OptionModel optionModel) + public ConfigUIModelBuilder setOption(OptionModel optionModel) throws IllegalStateException { checkCurrent(model, "model"); checkCurrent(category, "category"); @@ -300,13 +398,14 @@ if (log.isDebugEnabled()) { log.debug("new current option : " + option); } + return this; } - public void setCloseAction(Runnable runnable) { + public ConfigUIModelBuilder setCloseAction(Runnable runnable) { checkNotNull(runnable, "setCloseAction", "runnable"); checkCurrent(model, "model"); model.setCloseAction(runnable); - + return this; } protected CategoryModel flushCategory() { @@ -316,6 +415,7 @@ // add the previous category to the model model.addCategory(category); category = null; + categoryDefaultCallBack = null; } return result; }

1 0

r2503 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers
by tchemit＠users.nuiton.org 10 Oct '12

10 Oct '12

Author: tchemit Date: 2012-10-10 22:26:05 +0200 (Wed, 10 Oct 2012) New Revision: 2503 Url: http://nuiton.org/repositories/revision/jaxx/2503 Log: fixes #2343: Can not use in a jaxx file some java file as soon they extends some other classes Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2012-10-07 16:59:00 UTC (rev 2502) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2012-10-10 20:26:05 UTC (rev 2503) @@ -42,7 +42,6 @@ import org.apache.commons.logging.LogFactory; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.lang.reflect.Modifier; @@ -76,16 +75,14 @@ ClassLoader classLoader = getClassLoader(); try { - InputStream in = source.openStream(); - ClassDescriptor result; - Reader reader = new InputStreamReader(in, "utf-8"); + Reader reader = new InputStreamReader(source.openStream(), "utf-8"); try { String displayName = source.toString(); if (log.isDebugEnabled()) { log.debug("for source " + displayName); } - JavaFileParser parser = new JavaFileParser(classLoader); + JavaFileParser parser = new JavaFileParser(classLoader); if (log.isDebugEnabled()) { log.debug("starting parsing : " + displayName); } @@ -95,13 +92,14 @@ // log.error(e.getMessage()); throw new RuntimeException(e); } - result = new JavaFileClassDescriptor(parser, classLoader); + ClassDescriptor result = + new JavaFileClassDescriptor(parser, classLoader); + return result; } finally { reader.close(); } - return result; } catch (IOException e) { throw new ClassNotFoundException( "Could not resolv descriptor from source " + source, @@ -315,8 +313,9 @@ break; case JavaParserTreeConstants.JJTIMPORTDECLARATION: String text = child.getText().trim(); - if (text.startsWith("import")) { - text = text.substring("import".length()).trim(); + int importIndex = text.indexOf("import"); + if (importIndex>-1) { + text = text.substring(importIndex + "import".length()).trim(); } if (text.endsWith(";")) { text = text.substring(0, text.length() - 1);

1 0

r2502 - trunk/jaxx-maven-plugin/src/license
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 18:59:00 +0200 (Sun, 07 Oct 2012) New Revision: 2502 Url: http://nuiton.org/repositories/revision/jaxx/2502 Log: optimize third parties Modified: trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties 2012-10-07 16:53:30 UTC (rev 2501) +++ trunk/jaxx-maven-plugin/src/license/THIRD-PARTY.properties 2012-10-07 16:59:00 UTC (rev 2502) @@ -1,6 +1,8 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License +# - Apache Public License 2.0 # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -20,10 +22,15 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jun 29 10:40:24 CEST 2012 +#Sun Oct 07 18:56:35 CEST 2012 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… -commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 +commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +nekohtml--xercesMinimal--1.9.6.2=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 +org.slf4j--jcl-over-slf4j--1.5.6=MIT license +org.slf4j--slf4j-api--1.5.6=MIT license +org.slf4j--slf4j-jdk14--1.5.6=MIT license +org.slf4j--slf4j-nop--1.5.3=MIT license oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r2501 - in trunk: . jaxx-demo/src/main/java/jaxx/demo
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 18:53:30 +0200 (Sun, 07 Oct 2012) New Revision: 2501 Url: http://nuiton.org/repositories/revision/jaxx/2501 Log: fixes #2340: Updates to rsyntaxtextarea 1.5.2 Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx trunk/pom.xml Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2012-10-07 16:34:35 UTC (rev 2500) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2012-10-07 16:53:30 UTC (rev 2501) @@ -93,7 +93,7 @@ <RSyntaxTextArea id='editor' font-size='{getConfig().getFontSize()}' minimumSize="{SwingUtil.newMinDimension()}" - textAntiAliasHint='{RenderingHints.KEY_ANTIALIASING.toString()}' + antiAliasingEnabled='true' editable="false" wrapStyleWord="false" columns="80" Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-07 16:34:35 UTC (rev 2500) +++ trunk/pom.xml 2012-10-07 16:53:30 UTC (rev 2501) @@ -361,7 +361,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> + <version>1.5.2</version> </dependency>

1 0

r2500 - trunk/src/site
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 18:34:35 +0200 (Sun, 07 Oct 2012) New Revision: 2500 Url: http://nuiton.org/repositories/revision/jaxx/2500 Log: updates to fluido 1.3.0 Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-10-07 16:33:21 UTC (rev 2499) +++ trunk/src/site/site_fr.xml 2012-10-07 16:34:35 UTC (rev 2500) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom>

1 0

r2499 - in trunk: . jaxx-demo jaxx-swing-action jaxx-validator jaxx-widgets src/site/rst
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 18:33:21 +0200 (Sun, 07 Oct 2012) New Revision: 2499 Url: http://nuiton.org/repositories/revision/jaxx/2499 Log: fixes #2334: Updates to i18n-m-p 2.5 fixes #2335: Updates to nuiton-utils 2.6.3 fixes #2336: Updates to eugene 2.5 fixes #2337: Updates to maven-plugin-testing-harness 1.3 fixes #2338: Updates to mavenpom 3.3.8 Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml trunk/src/site/rst/I18n.rst Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/jaxx-demo/pom.xml 2012-10-07 16:33:21 UTC (rev 2499) @@ -239,7 +239,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <treateDefaultEntry>true</treateDefaultEntry> <entries> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/jaxx-swing-action/pom.xml 2012-10-07 16:33:21 UTC (rev 2499) @@ -94,7 +94,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/jaxx-validator/pom.xml 2012-10-07 16:33:21 UTC (rev 2499) @@ -124,7 +124,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/jaxx-widgets/pom.xml 2012-10-07 16:33:21 UTC (rev 2499) @@ -166,7 +166,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <entries> <entry> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/pom.xml 2012-10-07 16:33:21 UTC (rev 2499) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.7</version> + <version>3.3.8</version> </parent> <artifactId>jaxx</artifactId> @@ -117,9 +117,9 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6</nuitonUtilsVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugeneVersion>2.4.2</eugeneVersion> + <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> + <eugeneVersion>2.5</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.4</swingXVersion> @@ -429,7 +429,7 @@ <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.2</version> + <version>1.3</version> <scope>test</scope> <exclusions> @@ -465,7 +465,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.1</version> + <version>3.0.8</version> <scope>compile</scope> </dependency> @@ -492,7 +492,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> Modified: trunk/src/site/rst/I18n.rst =================================================================== --- trunk/src/site/rst/I18n.rst 2012-10-07 16:00:24 UTC (rev 2498) +++ trunk/src/site/rst/I18n.rst 2012-10-07 16:33:21 UTC (rev 2499) @@ -82,7 +82,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <entries> <entry>

1 0

r2498 - trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 18:00:24 +0200 (Sun, 07 Oct 2012) New Revision: 2498 Url: http://nuiton.org/repositories/revision/jaxx/2498 Log: fixes #2303: SwingListValidatorMessageTableModel is not correct Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java 2012-10-07 15:59:16 UTC (rev 2497) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java 2012-10-07 16:00:24 UTC (rev 2498) @@ -63,7 +63,7 @@ "validator.field", "validator.message"}; public static final Class<?>[] columnClasses = - {NuitonValidatorScope.class, Integer.class, String.class, String.class}; + {NuitonValidatorScope.class, Object.class, String.class, String.class}; /** list of registred validators */ protected transient List<BeanListValidator<?>> validators;

1 0

r2497 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org 07 Oct '12

07 Oct '12

Author: tchemit Date: 2012-10-07 17:59:16 +0200 (Sun, 07 Oct 2012) New Revision: 2497 Url: http://nuiton.org/repositories/revision/jaxx/2497 Log: fixes #2333: Improve FileEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-08-30 14:43:00 UTC (rev 2496) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-10-07 15:59:16 UTC (rev 2497) @@ -55,6 +55,12 @@ } } + public void setSelectedFile(String startPath) { + this.selectedFile = null; + setStartPath(startPath); + fireActionEvent(); + } + public File getSelectedFile() { if (selectedFile == null) { if (StringUtils.isNotEmpty(startPath)) { @@ -70,7 +76,7 @@ constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' - onKeyReleased='setSelectedFile(null);setStartPath(pathField.getText())'/> + onKeyReleased='setSelectedFile(pathField.getText())'/> <JButton id='boutonXslLocation' constraints='BorderLayout.EAST'

1 0

r2496 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:43:00 +0200 (Thu, 30 Aug 2012) New Revision: 2496 Url: http://nuiton.org/repositories/revision/jaxx/2496 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) +++ trunk/pom.xml 2012-08-30 14:43:00 UTC (rev 2496) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2495 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: maven-release Date: 2012-08-23 09:52:27 +0200 (Thu, 23 Aug 2012) New Revision: 2495 Url: http://nuiton.org/repositories/revision/jaxx/2495 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-compiler/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-demo/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-maven-plugin/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-runtime/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-validator/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/jaxx-widgets/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-23 07:52:25 UTC (rev 2494) +++ trunk/pom.xml 2012-08-23 07:52:27 UTC (rev 2495) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.5</version> + <version>2.5.6-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.5</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.5 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5.5</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <distributionManagement>

1 0