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 de7ec844610f7f125d27ca1cdbfea398d4c2b597 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:48:05 2016 +0100 renommage champs source en computed (ui) --- .../ui/content/table/impl/seine/AbstractSampleUI.jcss | 8 ++++---- .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 4 ++-- .../table/impl/seine/NonTargetSampleUIHandler.java | 16 ++++++++-------- .../content/table/impl/seine/NonTargetSampleUIModel.java | 4 ++-- .../ui/content/table/impl/seine/TargetSampleUI.jaxx | 4 ++-- .../content/table/impl/seine/TargetSampleUIHandler.java | 16 ++++++++-------- .../ui/content/table/impl/seine/TargetSampleUIModel.java | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss index dab0bac..c208566 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss @@ -58,8 +58,8 @@ JToolBar { #lengthSourceInformation { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; - enabled: {tableEditBean.isLengthSource()}; - toolTipText:{getLengthDataTip(tableEditBean.isLengthSource())}; + enabled: {tableEditBean.isIsLengthComputed()}; + toolTipText:{getLengthDataTip(tableEditBean.isIsLengthComputed())}; } #weightLabel { @@ -77,8 +77,8 @@ JToolBar { #weightSourceInformation { disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; - enabled: {tableEditBean.isWeightSource()}; - toolTipText:{getWeightDataTip(tableEditBean.isWeightSource())}; + enabled: {tableEditBean.isIsWeightComputed()}; + toolTipText:{getWeightDataTip(tableEditBean.isIsWeightComputed())}; } #comment { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 60764b8..81581f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -148,7 +148,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <cell anchor='east'> <JToolBar id='lengthSourceAction'> <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetLengthSource()'/> + onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -164,7 +164,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <cell anchor='east'> <JToolBar id='weightSourceAction'> <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetWeightSource()'/> + onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 48e70f5..3e58c87 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -67,7 +67,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam /** * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getWeight()}, - * et repasser alors le flag {@link NonTargetLengthDto#isWeightSource()} à + * et repasser alors le flag {@link NonTargetLengthDto#isIsWeightComputed()} à * {@code false}. * * @since 3.0 @@ -76,7 +76,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam /** * Ecoute les modifications de la propriété {@link NonTargetLengthDto#getLength()}, - * et repasser alors le flag {@link NonTargetLengthDto#isLengthSource()} à + * et repasser alors le flag {@link NonTargetLengthDto#isIsLengthComputed()} à * {@code false}. * * @since 3.0 @@ -87,11 +87,11 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam super(ui, DataContextType.SetSeine); weightChanged = evt -> { NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setWeightSource(false); + source.setIsWeightComputed(false); }; lengthChanged = evt -> { NonTargetLengthDto source = (NonTargetLengthDto) evt.getSource(); - source.setLengthSource(false); + source.setIsLengthComputed(false); }; } @@ -100,13 +100,13 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam return (NonTargetSampleUI) super.getUi(); } - public void resetWeightSource() { - getTableEditBean().setWeightSource(false); + public void resetIsWeightComputed() { + getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } - public void resetLengthSource() { - getTableEditBean().setLengthSource(false); + public void resetIsLengthComputed() { + getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java index 8422035..495344b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -54,9 +54,9 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD NonTargetSampleDto.PROPERTY_COMMENT}, new String[]{NonTargetLengthDto.PROPERTY_SPECIES, NonTargetLengthDto.PROPERTY_LENGTH, - NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, + NonTargetLengthDto.PROPERTY_IS_LENGTH_COMPUTED, NonTargetLengthDto.PROPERTY_WEIGHT, - NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, + NonTargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, NonTargetLengthDto.PROPERTY_SEX, NonTargetLengthDto.PROPERTY_COUNT, NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index 0e0e2c6..a0092bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -138,7 +138,7 @@ public String getLengthDataTip(boolean computed) { <cell anchor='east'> <JToolBar id='lengthSourceAction'> <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetLengthSource()'/> + onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -154,7 +154,7 @@ public String getLengthDataTip(boolean computed) { <cell anchor='east'> <JToolBar id='weightSourceAction'> <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetWeightSource()'/> + onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 3ca2115..4f4fcdb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -73,7 +73,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()}, - * et repasser alors le flag {@link TargetLengthDto#isWeightSource()} à + * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à * {@code false}. * * @since 3.0 @@ -82,7 +82,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto /** * Ecoute les modifications de la propriété {@link TargetLengthDto#getLength()}, - * et repasser alors le flag {@link TargetLengthDto#isLengthSource()} à + * et repasser alors le flag {@link TargetLengthDto#isIsLengthComputed()} à * {@code false}. * * @since 3.0 @@ -95,11 +95,11 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto this.discarded = discarded; weightChanged = evt -> { TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setWeightSource(false); + source.setIsWeightComputed(false); }; lengthChanged = evt -> { TargetLengthDto source = (TargetLengthDto) evt.getSource(); - source.setLengthSource(false); + source.setIsLengthComputed(false); }; } @@ -108,13 +108,13 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto return (TargetSampleUI) super.getUi(); } - public void resetWeightSource() { - getTableEditBean().setWeightSource(false); + public void resetIsWeightComputed() { + getTableEditBean().setIsWeightComputed(false); getUi().getWeight().grabFocus(); } - public void resetLengthSource() { - getTableEditBean().setLengthSource(false); + public void resetIsLengthComputed() { + getTableEditBean().setIsLengthComputed(false); getUi().getLength().grabFocus(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 27f4dd1..605ed3c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -55,9 +55,9 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta new String[]{ TargetLengthDto.PROPERTY_SPECIES, TargetLengthDto.PROPERTY_LENGTH, - TargetLengthDto.PROPERTY_LENGTH_SOURCE, + TargetLengthDto.PROPERTY_IS_LENGTH_COMPUTED, TargetLengthDto.PROPERTY_WEIGHT, - TargetLengthDto.PROPERTY_WEIGHT_SOURCE, + TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, TargetLengthDto.PROPERTY_MEASURE_TYPE, TargetLengthDto.PROPERTY_ACQUISITION_MODE}); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.