This is an automated email from the git hooks/post-receive script. New commit to branch feature/8145 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit d30824b47d3cfb9b4cba1fba76177458ba023f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 19 16:33:39 2016 +0100 Ajout méthodes utiles + un toString digne de ce nom --- .../CalcifiedPiecesSamplingDefinitionBean.java | 30 ++++++++++++++++++++-- .../CalcifiedPiecesSamplingDefinitions.java | 21 +++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitionBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitionBean.java index fed6c1e..f512b24 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitionBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitionBean.java @@ -24,6 +24,8 @@ package fr.ifremer.tutti.persistence.entities.protocol; * #L% */ +import com.google.common.base.MoreObjects; + import java.util.Objects; public class CalcifiedPiecesSamplingDefinitionBean extends AbstractCalcifiedPiecesSamplingDefinitionBean { @@ -34,8 +36,8 @@ public class CalcifiedPiecesSamplingDefinitionBean extends AbstractCalcifiedPiec if (o == null || getClass() != o.getClass()) return false; CalcifiedPiecesSamplingDefinitionBean that = (CalcifiedPiecesSamplingDefinitionBean) o; return minSize == that.minSize && - Objects.equals(maxSize, that.maxSize) && - Objects.equals(maturity, that.maturity); + Objects.equals(maxSize, that.maxSize) && + Objects.equals(maturity, that.maturity); } @Override @@ -43,4 +45,28 @@ public class CalcifiedPiecesSamplingDefinitionBean extends AbstractCalcifiedPiec return Objects.hash(minSize, maxSize, maturity); } + @Override + public String toString() { + MoreObjects.ToStringHelper toStringHelper = + MoreObjects.toStringHelper(CalcifiedPiecesSamplingDefinition.class) + .add(PROPERTY_MIN_SIZE, minSize) + .add(PROPERTY_MAX_SIZE, maxSize == null ? "∞" : maxSize) + .add(PROPERTY_SEX, sex) + .add(PROPERTY_SAMPLING_INTERVAL, samplingInterval); + + if (maturity != null) { + toStringHelper.add(PROPERTY_MATURITY, maturity); + } + if (maxByLenghtStep != null && maxByLenghtStep > 0) { + toStringHelper.add(PROPERTY_MAX_BY_LENGHT_STEP, maxByLenghtStep); + } + if (operationLimitation != null && operationLimitation > 0) { + toStringHelper.add(PROPERTY_OPERATION_LIMITATION, operationLimitation); + } + if (zoneLimitation != null && zoneLimitation > 0) { + toStringHelper.add(PROPERTY_ZONE_LIMITATION, zoneLimitation); + } + + return toStringHelper.toString(); + } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java new file mode 100644 index 0000000..a4cd053 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java @@ -0,0 +1,21 @@ +package fr.ifremer.tutti.persistence.entities.protocol; + +public class CalcifiedPiecesSamplingDefinitions extends AbstractCalcifiedPiecesSamplingDefinitions { + + public static boolean isOperationValueUpperMax(CalcifiedPiecesSamplingDefinition cpsDef, int value) { + return isValueUpperMax(value, cpsDef.getOperationLimitation()); + } + + public static boolean isZoneValueUpperMax(CalcifiedPiecesSamplingDefinition cpsDef, int value) { + return isValueUpperMax(value, cpsDef.getZoneLimitation()); + } + + public static boolean isCruiseValueUpperMax(CalcifiedPiecesSamplingDefinition cpsDef, int value) { + return isValueUpperMax(value, cpsDef.getMaxByLenghtStep()); + } + + static boolean isValueUpperMax(int value, Integer max) { + return max != null && max > 0 && value > max; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.