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;