Author: echatellier Date: 2011-12-23 16:13:27 +0100 (Fri, 23 Dec 2011) New Revision: 932 Url: http://forge.codelutin.com/repositories/revision/coser/932 Log: Update to commons-lang3 Modified: trunk/coser-business/pom.xml trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java trunk/coser-ui/pom.xml trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesTypesRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java trunk/coser-web/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/pom.xml 2011-12-23 15:13:27 UTC (rev 932) @@ -50,8 +50,8 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-12-23 15:13:27 UTC (rev 932) @@ -38,7 +38,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-12-23 15:13:27 UTC (rev 932) @@ -34,7 +34,7 @@ import java.util.Properties; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserUtils; import fr.ifremer.coser.storage.DataStorage; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2011-12-23 15:13:27 UTC (rev 932) @@ -29,7 +29,7 @@ import java.util.List; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserUtils; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-12-23 15:13:27 UTC (rev 932) @@ -32,9 +32,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -95,7 +94,7 @@ */ @Override public void undoCommand(Project project, AbstractDataContainer container) throws CoserBusinessException { - throw new NotImplementedException("Merge operation can't be undone"); + throw new RuntimeException("Merge operation can't be undone"); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2011-12-23 15:13:27 UTC (rev 932) @@ -32,8 +32,8 @@ import java.util.List; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserUtils; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-12-23 15:13:27 UTC (rev 932) @@ -42,7 +42,7 @@ import java.util.regex.Pattern; 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; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-12-23 15:13:27 UTC (rev 932) @@ -45,7 +45,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.ArrayUtil; import au.com.bytecode.opencsv.CSVReader; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-12-23 15:13:27 UTC (rev 932) @@ -61,7 +61,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -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.apache.commons.math.util.MathUtils; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2011-12-23 15:13:27 UTC (rev 932) @@ -47,7 +47,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; -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.jfree.chart.ChartUtilities; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-12-23 15:13:27 UTC (rev 932) @@ -57,8 +57,8 @@ import org.apache.commons.collections.map.MultiKeyMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.EmailException; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-12-23 15:13:27 UTC (rev 932) @@ -28,7 +28,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.opensymphony.xwork2.validator.ValidationException; Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/pom.xml 2011-12-23 15:13:27 UTC (rev 932) @@ -61,8 +61,8 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-12-23 15:13:27 UTC (rev 932) @@ -63,7 +63,7 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-12-23 15:13:27 UTC (rev 932) @@ -36,7 +36,7 @@ import jaxx.runtime.JAXXContext; import org.apache.commons.io.FileUtils; -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.util.Resource; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeModel.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeModel.java 2011-12-23 15:13:27 UTC (rev 932) @@ -30,7 +30,7 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.jdesktop.swingx.tree.TreeModelSupport; import fr.ifremer.coser.CoserConstants.Category; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-12-23 15:13:27 UTC (rev 932) @@ -39,7 +39,7 @@ import jaxx.runtime.JAXXUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConfig; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-12-23 15:13:27 UTC (rev 932) @@ -53,7 +53,7 @@ import jaxx.runtime.JAXXUtil; -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.jfree.chart.ChartPanel; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesTypesRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesTypesRenderer.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesTypesRenderer.java 2011-12-23 15:13:27 UTC (rev 932) @@ -29,7 +29,7 @@ import javax.swing.JList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jdesktop.swingx.renderer.DefaultListRenderer; import fr.ifremer.coser.ui.selection.model.SpeciesTypesListModel; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListSelectionModel.java 2011-12-23 15:13:27 UTC (rev 932) @@ -34,8 +34,6 @@ import jaxx.runtime.swing.OneClicListSelectionModel; -import org.apache.commons.lang.NotImplementedException; - /** * Model de selection fonctionnant avec les intances des objects selectionnée * et non par indices. @@ -99,7 +97,7 @@ */ @Override public void intervalAdded(ListDataEvent e) { - throw new NotImplementedException("Not yet implemented"); + throw new RuntimeException("Not yet implemented"); } /* @@ -107,7 +105,7 @@ */ @Override public void intervalRemoved(ListDataEvent e) { - throw new NotImplementedException("Not yet implemented"); + throw new RuntimeException("Not yet implemented"); } /* Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2011-12-23 15:13:27 UTC (rev 932) @@ -35,7 +35,7 @@ import javax.swing.JOptionPane; -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.apache.commons.mail.EmailException; Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-12-23 15:13:08 UTC (rev 931) +++ trunk/coser-web/pom.xml 2011-12-23 15:13:27 UTC (rev 932) @@ -29,6 +29,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>