This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 428c3a54c333291c9f139e628f10e4c383438131 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 14:21:29 2016 +0200 Arrondi à 4 décimales du poids de capture ciblé (UI) --- .../main/java/fr/ird/observe/application/swing/ui/UIHelper.java | 7 +++++++ .../swing/ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 4ccf4ef..a9ab74e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -129,6 +129,13 @@ public class UIHelper extends SwingUtil { * @since 2.3 */ public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,3}"; + /** + * Pattern to use for decimal numeric values with 4 decimal digits in + * editors. + * + * @since 5.0.3 + */ + public static final String DECIMAL4_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,4}"; /** * Components which must NOT be blocked by any layer in ui. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss index 7416750..25905db 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss @@ -57,7 +57,7 @@ property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL3_PATTERN}; + numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL4_PATTERN}; } #wellLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss index 8a04f03..9aabfc8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss @@ -69,7 +69,7 @@ property:{TargetCatchDto.PROPERTY_CATCH_WEIGHT}; model:{tableEditBean.getCatchWeight()}; useFloat:true; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL3_PATTERN}; + numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL4_PATTERN}; } #broughtOnDeckInformation { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.