May 2011 - Coser-commits - mailman.cloud.codelutin.com

r836 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:36:47 +0000 (Fri, 27 May 2011) New Revision: 836 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-05-27 08:36:45 UTC (rev 835) +++ trunk/coser-business/pom.xml 2011-05-27 08:36:47 UTC (rev 836) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6</version> + <version>1.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-05-27 08:36:45 UTC (rev 835) +++ trunk/coser-ui/pom.xml 2011-05-27 08:36:47 UTC (rev 836) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6</version> + <version>1.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-05-27 08:36:45 UTC (rev 835) +++ trunk/coser-web/pom.xml 2011-05-27 08:36:47 UTC (rev 836) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6</version> + <version>1.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 08:36:45 UTC (rev 835) +++ trunk/pom.xml 2011-05-27 08:36:47 UTC (rev 836) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6</version> + <version>1.0.7-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -326,9 +326,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.6</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.6</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.6?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> </scm> <build>

1 0

r835 - tags
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:36:45 +0000 (Fri, 27 May 2011) New Revision: 835 Log: [maven-release-plugin] copy for tag coser-1.0.6 Added: tags/coser-1.0.6/

1 0

r834 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:36:42 +0000 (Fri, 27 May 2011) New Revision: 834 Log: [maven-release-plugin] prepare release coser-1.0.6 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-05-27 08:32:38 UTC (rev 833) +++ trunk/coser-business/pom.xml 2011-05-27 08:36:42 UTC (rev 834) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-05-27 08:32:38 UTC (rev 833) +++ trunk/coser-ui/pom.xml 2011-05-27 08:36:42 UTC (rev 834) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-05-27 08:32:38 UTC (rev 833) +++ trunk/coser-web/pom.xml 2011-05-27 08:36:42 UTC (rev 834) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.6</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 08:32:38 UTC (rev 833) +++ trunk/pom.xml 2011-05-27 08:36:42 UTC (rev 834) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.6</version> <packaging>pom</packaging> <modules> @@ -326,9 +326,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.6</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.6</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.6?root=coser</url> </scm> <build>

1 0

r833 - trunk/coser-business/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:32:38 +0000 (Fri, 27 May 2011) New Revision: 833 Log: Fix replace and import Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-05-27 08:14:47 UTC (rev 832) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-05-27 08:32:38 UTC (rev 833) @@ -39,7 +39,6 @@ import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.lang.StringUtils; -import org.nuiton.util.StringUtil; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -154,10 +153,10 @@ arg = StringUtils.removeEnd(arg, ")"); // unescape () and \ - arg = arg.replaceAll("\\)", ")"); - arg = arg.replaceAll("\$", "("); - arg = arg.replaceAll("\\\\\\\\", "\\"); - + arg = StringUtils.replace(arg, "\$", ")"); + arg = StringUtils.replace(arg, "\\(", "("); + arg = StringUtils.replace(arg, "\\\\", "\\"); + listArgs.add(arg); } }

1 0

r832 - trunk/src/announcement
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:14:47 +0000 (Fri, 27 May 2011) New Revision: 832 Log: Update announce mail Added: trunk/src/announcement/release-email-1.0.6.txt Removed: trunk/src/announcement/release-email-1.0.5.txt Deleted: trunk/src/announcement/release-email-1.0.5.txt =================================================================== --- trunk/src/announcement/release-email-1.0.5.txt 2011-05-27 08:12:12 UTC (rev 831) +++ trunk/src/announcement/release-email-1.0.5.txt 2011-05-27 08:14:47 UTC (rev 832) @@ -1,16 +0,0 @@ -Bonjour, - -Une nouvelle version de Coser 1.0.5 vient d'être déployée. - -Changements : - - * Selection de la liste de données pour générer le graphique pour - la partie communauté - * Mise a jour de jquery en 1.6 - -Documentation : http://coser.labs.libre-entreprise.org/ -Téléchargement : http://labs.libre-entreprise.org/frs/?group_id=164 - -Cordialement, - -L'équipe Coser. Copied: trunk/src/announcement/release-email-1.0.6.txt (from rev 822, trunk/src/announcement/release-email-1.0.5.txt) =================================================================== --- trunk/src/announcement/release-email-1.0.6.txt (rev 0) +++ trunk/src/announcement/release-email-1.0.6.txt 2011-05-27 08:14:47 UTC (rev 832) @@ -0,0 +1,19 @@ +Bonjour, + +Une nouvelle version de Coser 1.0.6 vient d'être déployée. + +Changements : + + * Correction d'un problème de rechargement des données lors que les + commentaires contenaient des caratères d'échapement. + * Correction d'un problème de vérification des doubles avec des valeurs + négatives + * Mise à jour de jQuery 1.6.1 + * Mise à jour de HttpComponent Core 4.1.1 + +Documentation : http://coser.labs.libre-entreprise.org/ +Téléchargement : http://labs.libre-entreprise.org/frs/?group_id=164 + +Cordialement, + +L'équipe Coser.

1 0

r831 - in trunk: . coser-ui/src/main/java/fr/ifremer/coser/ui/common coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 08:12:12 +0000 (Fri, 27 May 2011) New Revision: 831 Log: Fix jetty, add log warn. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java trunk/pom.xml Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-05-26 17:01:54 UTC (rev 830) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-05-27 08:12:12 UTC (rev 831) @@ -34,6 +34,11 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.coser.ui.control.ControlHandler; + /** * Common application handler. * @@ -45,6 +50,9 @@ */ public class CommonHandler { + /** Logger. */ + private static final Log log = LogFactory.getLog(ControlHandler.class); + /** File chooser instance. */ protected JFileChooser fileChooserInstance; @@ -91,6 +99,9 @@ try { Desktop.getDesktop().browse(report.toURI()); } catch (IOException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't open generated report at " + report.getAbsolutePath(), ex); + } JOptionPane.showMessageDialog(parentComponent, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-05-26 17:01:54 UTC (rev 830) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-05-27 08:12:12 UTC (rev 831) @@ -52,7 +52,6 @@ protected String[] header; public ControlDataTableModel(ControlView controlView, Category category) { - super(); this.category = category; updateData(controlView); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-26 17:01:54 UTC (rev 830) +++ trunk/pom.xml 2011-05-27 08:12:12 UTC (rev 831) @@ -350,12 +350,12 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>7.4.1.v20110513</version> + <version>7.4.0.v20110414</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-jspc-maven-plugin</artifactId> - <version>7.4.1.v20110513</version> + <version>7.4.0.v20110414</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r830 - in trunk: . coser-business/src/main/java/fr/ifremer/coser coser-business/src/test/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org May 26, 2011

May 26, 2011

Author: chatellier Date: 2011-05-26 17:01:54 +0000 (Thu, 26 May 2011) New Revision: 830 Log: Fix command parsing when comment was containing special control char ' Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java trunk/coser-business/src/test/java/fr/ifremer/coser/CoserUtilsTest.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-05-26 14:22:04 UTC (rev 829) +++ trunk/changelog.txt 2011-05-26 17:01:54 UTC (rev 830) @@ -4,6 +4,7 @@ 1.0.6 ----- + * Fix command parsing when comment was containing special control char ' * Fix double min decimal check with negative values * Update to jQuery 1.6.1 * Update to HttpComponent Core 4.1.1 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-05-26 14:22:04 UTC (rev 829) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2011-05-26 17:01:54 UTC (rev 830) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -55,7 +55,7 @@ */ public class CoserUtils { - public static final String BRACKET_STRING_SEPARATOR = ";"; + public static final char BRACKET_STRING_SEPARATOR = ';'; /** Pattern pour ajouter les suffix (probleme de replace sur le 'dernier' .) */ public static final Pattern FILENAME_SUFFIX_PATTERN = Pattern.compile("^(.+)(\\.[^\\.]+)$"); @@ -63,6 +63,7 @@ /** * Converti une collection de string en une string * delimité par les () pour pouvoir être facilement relu par + * {@link #splitWithBrackets(String, char)} * * @param args * @return string @@ -73,7 +74,13 @@ Iterator<String> itArgs = args.iterator(); while (itArgs.hasNext()) { buffer.append('('); - buffer.append(itArgs.next()); + String arg = itArgs.next(); + // escape special chars + // just (, ) and escape char \ + arg = StringUtils.replace(arg, "\\", "\\\\"); + arg = StringUtils.replace(arg, ")", "\\)"); + arg = StringUtils.replace(arg, "(", "\$"); + buffer.append(arg); buffer.append(')'); if (itArgs.hasNext()) { buffer.append(BRACKET_STRING_SEPARATOR); @@ -83,19 +90,74 @@ } /** + * Split line counting opened ( and ) and take care about escaped \$. + * + * @param str string to parse + * @param separator to take care + * @return string splited + */ + protected static List<String> splitWithBrackets(String str, char separator) { + + List<String> result = new ArrayList<String>(); + + StringBuffer op = new StringBuffer(); // stack of {([< currently open + int opened = 0; + boolean escapeNext = false; + + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (escapeNext) { + op.append(c); + escapeNext = false; + } + else if (c == '\\') { + escapeNext = true; + } else if (c == '(') { + op.append(c); + opened++; + } else if (c == ')') { + op.append(c); + opened--; + } else if (c == separator) { + if (opened == 0) { + result.add(op.toString()); + op = new StringBuffer(); + } + else { + op.append(c); + } + } else { + op.append(c); + } + } + + if (op.length() > 0) { + result.add(op.toString()); + } + + return result; + } + + /** * Parse la string avec les gestions des () en les supprimant. * * @param argsString string to parse * @return parse list */ public static List<String> convertBracketToList(String argsString) { - String[] args = StringUtil.split(argsString, BRACKET_STRING_SEPARATOR); + List<String> args = splitWithBrackets(argsString, BRACKET_STRING_SEPARATOR); List<String> listArgs = new ArrayList<String>(); for (String arg : args) { if (arg.startsWith("(") && arg.endsWith(")")) { arg = StringUtils.removeStart(arg, "("); arg = StringUtils.removeEnd(arg, ")"); + + // unescape () and \ + arg = arg.replaceAll("\\)", ")"); + arg = arg.replaceAll("\\(", "("); + arg = arg.replaceAll("\\\\\\\\", "\\"); + listArgs.add(arg); } } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/CoserUtilsTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/CoserUtilsTest.java 2011-05-26 14:22:04 UTC (rev 829) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/CoserUtilsTest.java 2011-05-26 17:01:54 UTC (rev 830) @@ -26,6 +26,8 @@ package fr.ifremer.coser; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -69,4 +71,40 @@ Assert.assertNotNull(CoserUtils.parseDocument("<html>")); } + /** + * Test que la chaine est bien parsée (buggé dans coser 1.0.5). + */ + @Test + public void testBracketToList() { + String data = "(38be0fde-0f55-4dc1-a089-8e589a2623f0);(MergeSpeciesCommand);(Regroupe FMCOTTI, TAURBUB et MYOXSCO en FMCOTTI : PB d'identification avant 2000);((newSpecyName=FMCOTTI);(speciesNames=(FMCOTTI);(MYOXSCO);(TAURBUB)))"; + List<String> dataAsList = CoserUtils.convertBracketToList(data); + Assert.assertEquals(4, dataAsList.size()); + + data = "(38be0fde-0f55-4dc1-a089-8e589a2623f0);(test \\\\);(test \\) echappement)"; + dataAsList = CoserUtils.convertBracketToList(data); + + Assert.assertEquals(3, dataAsList.size()); + Assert.assertEquals("test \\", dataAsList.get(1)); + Assert.assertEquals("test ) echappement", dataAsList.get(2)); + } + + /** + * Convertit une liste en une string separé par des () et + * verifie que les echapements sont pris en compte. + */ + @Test + public void testListToBracket() { + List<String> myList = new ArrayList<String>(); + myList.add("string1"); + myList.add("string2 avec \\"); + myList.add("string3 avec )"); + myList.add("string4 avec ("); + myList.add("string5"); + String asString = CoserUtils.convertBracketString(myList); + Assert.assertEquals("(string1);(string2 avec \\\\);(string3 avec \\));(string4 avec \\();(string5)", asString); + + myList = CoserUtils.convertBracketToList(asString); + Assert.assertEquals(5, myList.size()); + Assert.assertEquals("[string1, string2 avec \\, string3 avec ), string4 avec (, string5]", myList.toString()); + } }

1 0

r829 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util
by chatellier＠users.labs.libre-entreprise.org May 26, 2011

May 26, 2011

Author: chatellier Date: 2011-05-26 14:22:04 +0000 (Thu, 26 May 2011) New Revision: 829 Log: Add reply to for spam. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 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-05-26 14:19:25 UTC (rev 828) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2011-05-26 14:22:04 UTC (rev 829) @@ -123,6 +123,8 @@ email.setFrom("no-reply at labs.libre-entreprise.org", "Coser"); // subject email.setSubject("Project error notification : Coser"); + // add reply-to for spam + email.addReplyTo("no-reply at labs.libre-entreprise.org.org"); // message description StringBuffer message = new StringBuffer();

1 0

r828 - trunk/coser-business/src/main/java/fr/ifremer/coser/validators
by chatellier＠users.labs.libre-entreprise.org May 26, 2011

May 26, 2011

Author: chatellier Date: 2011-05-26 14:19:25 +0000 (Thu, 26 May 2011) New Revision: 828 Log: Fix exponent case Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 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-05-25 10:25:31 UTC (rev 827) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-05-26 14:19:25 UTC (rev 828) @@ -51,7 +51,7 @@ * - group3 => exposant with e * - group4 => exposant without e */ - protected static final Pattern DOUBLE_PATTERN = Pattern.compile("^-?[0-9]+(\\.([0-9]+))?(e(\\-?[0-9]+))?$"); + protected static final Pattern DOUBLE_PATTERN = Pattern.compile("^-?[0-9]+(\\.([0-9]+))?([eE](\\-?[0-9]+))?$"); protected String notAvailable;

1 0

r827 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/validators
by chatellier＠users.labs.libre-entreprise.org May 25, 2011

May 25, 2011

Author: chatellier Date: 2011-05-25 10:25:31 +0000 (Wed, 25 May 2011) New Revision: 827 Log: Fix double min decimal check with negative values Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-05-22 17:59:30 UTC (rev 826) +++ trunk/changelog.txt 2011-05-25 10:25:31 UTC (rev 827) @@ -4,6 +4,7 @@ 1.0.6 ----- + * Fix double min decimal check with negative values * Update to jQuery 1.6.1 * Update to HttpComponent Core 4.1.1 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-05-22 17:59:30 UTC (rev 826) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserCheckDoubleValidator.java 2011-05-25 10:25:31 UTC (rev 827) @@ -51,7 +51,7 @@ * - group3 => exposant with e * - group4 => exposant without e */ - protected static final Pattern DOUBLE_PATTERN = Pattern.compile("^[0-9]+(\\.([0-9]+))?(e(\\-?[0-9]+))?$"); + protected static final Pattern DOUBLE_PATTERN = Pattern.compile("^-?[0-9]+(\\.([0-9]+))?(e(\\-?[0-9]+))?$"); protected String notAvailable;

1 0