This is an automated email from the git hooks/post-receive script. New commit to branch feature/7944 in repository tutti. See http://git.codelutin.com/tutti.git commit abb53af5a99be0542db418e0f972baadba60063a Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 26 17:44:04 2016 +0100 9 décimales pour a dans les rtp (fixes #7944) --- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 12 ++++++------ .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 9 ++++++++- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx index 58c9a5e..6b5a1f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx @@ -82,7 +82,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpMaleALabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpMaleAField'/> + <NumberEditor id='rtpMaleAField' styleClass="aEditor"/> </cell> </row> </Table> @@ -92,7 +92,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpMaleBLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpMaleBField'/> + <NumberEditor id='rtpMaleBField' styleClass="bEditor"/> </cell> </row> </Table> @@ -108,7 +108,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpFemaleALabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpFemaleAField'/> + <NumberEditor id='rtpFemaleAField' styleClass="aEditor"/> </cell> </row> </Table> @@ -118,7 +118,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpFemaleBLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpFemaleBField'/> + <NumberEditor id='rtpFemaleBField' styleClass="bEditor"/> </cell> </row> </Table> @@ -132,7 +132,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpUndefinedALabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpUndefinedAField'/> + <NumberEditor id='rtpUndefinedAField' styleClass="aEditor"/> </cell> </row> </Table> @@ -142,7 +142,7 @@ public void closeEditor() { handler.closeEditor(); } <JLabel id='rtpUndefinedBLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='rtpUndefinedBField'/> + <NumberEditor id='rtpUndefinedBField' styleClass="bEditor"/> </cell> </row> </Table> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss index 44f6dff..9bef8f9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss @@ -5,10 +5,17 @@ NumberEditor { bean: {model}; showReset: true; numberType: {Float.class}; - numberPattern: {DECIMAL4_PATTERN}; _selectOnFocus: {true}; } +.aEditor { + numberPattern: {DECIMAL9_PATTERN}; +} + +.bEditor { + numberPattern: {DECIMAL4_PATTERN}; +} + #rtpEditorDialog { undecorated: true; alwaysOnTop: true; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java index 3bcb39e..2b12b53 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java @@ -42,6 +42,13 @@ public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends Appl */ String SIGNED_DECIMAL4_PATTERN = "-?\\d{0,4}(\\.\\d{0,4})?"; + /** + * Pattern to use for unsigned decimal numeric values with 9 decimal digits in editors. + * + * @since 4.4 + */ + String DECIMAL9_PATTERN = "\\d{0,6}(\\.\\d{0,9})?"; + Font TEXTFIELD_NORMAL_FONT = UIManager.getDefaults().getFont("TextField.font"); Font TEXTFIELD_COMPUTED_FONT = UIManager.getDefaults().getFont("TextField.font").deriveFont(Font.ITALIC); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.