This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 9b4e670c834bd71f4ad0a46eefd6f35ecaf44532 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 17:08:22 2015 +0100 ajout d'un equals sur les operations --- .../entities/data/FishingOperations.java | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java index efbebe4..c94ced4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java @@ -24,9 +24,11 @@ package fr.ifremer.tutti.persistence.entities.data; * #L% */ -import javax.annotation.Generated; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.nuiton.util.DateUtil; + +import java.util.Date; -@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Fri Dec 12 17:02:04 CET 2014") public class FishingOperations extends AbstractFishingOperations { public static final String PROPERTY_GEAR_SHOOTING_START_DAY = "gearShootingStartDay"; @@ -37,4 +39,20 @@ public class FishingOperations extends AbstractFishingOperations { public static final String PROPERTY_GEAR_SHOOTING_END_TIME = "gearShootingEndTime"; -} //FishingOperations + public static boolean equals(FishingOperation fishingOperation1, FishingOperation fishingOperation2) { + + EqualsBuilder equalsBuilder = new EqualsBuilder(); + + Date day1 = DateUtil.getDay(fishingOperation1.getGearShootingStartDate()); + Date day2 = DateUtil.getDay(fishingOperation2.getGearShootingStartDate()); + + equalsBuilder.append(day1, day2); + equalsBuilder.append(fishingOperation1.getStationNumber(), fishingOperation2.getStationNumber()); + equalsBuilder.append(fishingOperation1.getFishingOperationNumber(), fishingOperation2.getFishingOperationNumber()); + equalsBuilder.append(fishingOperation1.getMultirigAggregation(), fishingOperation2.getMultirigAggregation()); + + boolean equals = equalsBuilder.isEquals(); + return equals; + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.