Author: kmorin Date: 2013-05-21 16:44:45 +0200 (Tue, 21 May 2013) New Revision: 970 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/970 Log: fixes #2456 [ERGO] Format num?\195?\169rique : pouvoir saisir sans mettre de 0 devant la virgule Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2013-05-21 14:01:33 UTC (rev 969) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2013-05-21 14:44:45 UTC (rev 970) @@ -103,7 +103,7 @@ * * @since 0.1 */ - public static final String DECIMAL1_PATTERN = "\\d{0,6}|\\d{1,6}\\.\\d{0,1}"; + public static final String DECIMAL1_PATTERN = "\\d{0,6}(\\.\\d{0,1})?"; /** * Pattern to use for decimal numeric values with 2 decimal digits in @@ -111,7 +111,7 @@ * * @since 0.1 */ - public static final String DECIMAL2_PATTERN = "\\d{0,6}|\\d{1,6}\\.\\d{0,2}"; + public static final String DECIMAL2_PATTERN = "\\d{0,6}(\\.\\d{0,2})?"; /** * Pattern to use for decimal numeric values with 3 decimal digits in @@ -119,7 +119,7 @@ * * @since 0.1 */ - public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}\\.\\d{0,3}"; + public static final String DECIMAL3_PATTERN = "\\d{0,6}(\\.\\d{0,3})?"; /** * Pattern to use for decimal numeric values with 2 digits + 3 decimal digits in @@ -127,7 +127,7 @@ * * @since 1.0 */ - public static final String DECIMAL2_DIGITS_PATTERN = "\\d{0,2}|\\d{1,2}\\.\\d*"; + public static final String DECIMAL2_DIGITS_PATTERN = "\\d{0,2}(\\.\\d*)?"; public static final Font TEXTFIELD_NORMAL_FONT = UIManager.getDefaults().getFont("TextField.font");