branch feature/7944-2 created (now 06c55a4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7944-2 in repository tutti. See http://git.codelutin.com/tutti.git at 06c55a4 rtp.a en double au lieu de float pour la précision (refs #7944) This branch includes the following new commits: new 06c55a4 rtp.a en double au lieu de float pour la précision (refs #7944) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 06c55a4e0b8705113185eafd3c2b16fc8d6823f4 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 3 14:37:12 2016 +0100 rtp.a en double au lieu de float pour la précision (refs #7944) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7944-2 in repository tutti. See http://git.codelutin.com/tutti.git commit 06c55a4e0b8705113185eafd3c2b16fc8d6823f4 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 3 14:37:12 2016 +0100 rtp.a en double au lieu de float pour la précision (refs #7944) --- .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 ++++++------ .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 12 ++++++------ .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java index 81b4048..2ee8181 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java @@ -26,7 +26,7 @@ package fr.ifremer.tutti.persistence.entities.protocol; public class Rtps extends AbstractRtps { - public static Rtp newRtp(float a, float b) { + public static Rtp newRtp(double a, float b) { Rtp rtp = newRtp(); rtp.setA(a); rtp.setB(b); diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 1545a4d..a6e2a4d 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java index 4ccba57..59a9aa6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java @@ -253,7 +253,7 @@ public class SpeciesRow implements Serializable { delegate.setRtpUndefined(rtpUndefined); } - public Float getRtpMaleA() { + public Double getRtpMaleA() { return withRtpMale() ? getRtpMale().getA() : null; } @@ -261,7 +261,7 @@ public class SpeciesRow implements Serializable { return withRtpMale() ? getRtpMale().getB() : null; } - public Float getRtpFemaleA() { + public Double getRtpFemaleA() { return withRtpFemale() ? getRtpFemale().getA() : null; } @@ -269,7 +269,7 @@ public class SpeciesRow implements Serializable { return withRtpFemale() ? getRtpFemale().getB() : null; } - public Float getRtpUndefinedA() { + public Double getRtpUndefinedA() { return withRtpUndefined() ? getRtpUndefined().getA() : null; } @@ -277,7 +277,7 @@ public class SpeciesRow implements Serializable { return withRtpUndefined() ? getRtpUndefined().getB() : null; } - public void setRtpMaleA(Float a) { + public void setRtpMaleA(Double a) { getRtpMale().setA(a); } @@ -285,7 +285,7 @@ public class SpeciesRow implements Serializable { getRtpMale().setB(b); } - public void setRtpFemaleA(Float a) { + public void setRtpFemaleA(Double a) { getRtpFemale().setA(a); } @@ -293,7 +293,7 @@ public class SpeciesRow implements Serializable { getRtpFemale().setB(b); } - public void setRtpUndefinedA(Float a) { + public void setRtpUndefinedA(Double a) { getRtpUndefined().setA(a); } 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 9bef8f9..51d4a55 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 @@ -4,15 +4,16 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - numberType: {Float.class}; _selectOnFocus: {true}; } .aEditor { + numberType: {Double.class}; numberPattern: {DECIMAL9_PATTERN}; } .bEditor { + numberType: {Float.class}; numberPattern: {DECIMAL4_PATTERN}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java index cc2981b..5eb564d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIModel.java @@ -97,11 +97,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci return rtpFemale; } - public Float getRtpMaleA() { + public Double getRtpMaleA() { return rtpMale.getA(); } - public void setRtpMaleA(Float a) { + public void setRtpMaleA(Double a) { rtpMale.setA(a); firePropertyChanged(PROPERTY_RTP_MALE_A, null, a); } @@ -115,11 +115,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci firePropertyChanged(PROPERTY_RTP_MALE_B, null, b); } - public Float getRtpFemaleA() { + public Double getRtpFemaleA() { return rtpFemale.getA(); } - public void setRtpFemaleA(Float a) { + public void setRtpFemaleA(Double a) { rtpFemale.setA(a); firePropertyChanged(PROPERTY_RTP_FEMALE_A, null, a); } @@ -133,11 +133,11 @@ public class RtpEditorUIModel extends AbstractTuttiBeanUIModel<EditProtocolSpeci firePropertyChanged(PROPERTY_RTP_FEMALE_B, null, b); } - public Float getRtpUndefinedA() { + public Double getRtpUndefinedA() { return rtpUndefined.getA(); } - public void setRtpUndefinedA(Float a) { + public void setRtpUndefinedA(Double a) { rtpUndefined.setA(a); firePropertyChanged(PROPERTY_RTP_UNDEFINED_A, null, a); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java index 01cc974..5f4443c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/actions/CopyMaleRtpAction.java @@ -42,7 +42,7 @@ public class CopyMaleRtpAction extends SimpleActionSupport<RtpEditorUI> { protected void onActionPerformed(RtpEditorUI rtpEditorUI) { RtpEditorUIModel model = rtpEditorUI.getModel(); - Float rtpMaleA = model.getRtpMaleA(); + Double rtpMaleA = model.getRtpMaleA(); model.setRtpFemaleA(rtpMaleA); model.setRtpUndefinedA(rtpMaleA); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 8ce0e99..9fcd5f6 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1111,7 +1111,7 @@ tutti.editRtp.field.rtpUndefinedA.tip=Paramètre A tutti.editRtp.field.rtpUndefinedB=B tutti.editRtp.field.rtpUndefinedB.tip=Paramètre B tutti.editRtp.malePanel=Mâle -tutti.editRtp.tooltip=<ul><li><strong>Mâle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Femelle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Inconnu \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li></ul> +tutti.editRtp.tooltip=<ul><li><strong>Mâle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Femelle \:</strong> <em>a \: </em>%3$s - <em>b \: </em>%4$s</li><li><strong>Inconnu \:</strong> <em>a \: </em>%5$s - <em>b \: </em>%6$s</li></ul> tutti.editRtp.undefinedPanel=Sexe inconnu tutti.editRtp.withRtp.tip=RTP renseignés tutti.editRtp.withoutRtp.tip=RTP non renseignés -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm