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 0df99f91b7227e8aa1ec4ce25c3c977338007041 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 10:51:28 2016 +0200 Suppression de GpsAble + assainissement du quadrant au niveau entite (en fait juste besoin de la lecture) --- .../java/fr/ird/observe/entities/Activity.java | 6 +- .../main/java/fr/ird/observe/entities/GPSAble.java | 59 -------------------- .../java/fr/ird/observe/entities/ObserveSet.java | 2 - .../entities/longline/ActivityLonglineImpl.java | 52 ++++++----------- .../observe/entities/longline/SetLonglineImpl.java | 11 ---- .../observe/entities/seine/ActivitySeineImpl.java | 62 ++++++--------------- .../ird/observe/entities/seine/SetSeineImpl.java | 4 -- entities/src/main/xmi/observe-seine.zargo | Bin 84619 -> 83234 bytes .../topia/binder/data/ActivityLonglineBinder.java | 1 - .../topia/binder/data/ActivitySeineBinder.java | 1 - .../longline/ActivityLonglineServiceTopia.java | 17 +----- .../service/seine/ActivitySeineServiceTopia.java | 17 +----- 12 files changed, 40 insertions(+), 192 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/Activity.java b/entities/src/main/java/fr/ird/observe/entities/Activity.java index d515441..01f40b4 100644 --- a/entities/src/main/java/fr/ird/observe/entities/Activity.java +++ b/entities/src/main/java/fr/ird/observe/entities/Activity.java @@ -24,15 +24,13 @@ package fr.ird.observe.entities; import org.nuiton.topia.persistence.TopiaEntity; -public interface Activity extends TopiaEntity{ +public interface Activity extends TopiaEntity { String PROPERTY_QUADRANT = "quadrant"; Integer getQuadrant(); - void setQuadrant(Integer quadrant); - - void initCoordinates(); +// void setQuadrant(Integer quadrant); boolean isSetOperation(); diff --git a/entities/src/main/java/fr/ird/observe/entities/GPSAble.java b/entities/src/main/java/fr/ird/observe/entities/GPSAble.java deleted file mode 100644 index e485482..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/GPSAble.java +++ /dev/null @@ -1,59 +0,0 @@ -package fr.ird.observe.entities; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import java.util.Date; - -public interface GPSAble { - -// String PROPERTY_QUADRANT = "quadrant"; - - String PROPERTY_LATITUDE = "latitude"; - - String PROPERTY_LONGITUDE = "longitude"; - - String PROPERTY_VITESSE = "vitesse"; - - String PROPERTY_TIME = "time"; - - Integer getQuadrant(); - - void setQuadrant(Integer quadrant); - - Float getLatitude(); - - void setLatitude(Float latitude); - - Float getLongitude(); - - void setLongitude(Float longitude); - - Float getVitesse(); - - void setVitesse(Float vitesse); - - Date getTime(); - - void setTime(Date time); - -} //GPSAble diff --git a/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java b/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java index e442680..b5dfca0 100644 --- a/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java +++ b/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java @@ -32,6 +32,4 @@ import org.nuiton.topia.persistence.TopiaEntity; */ public interface ObserveSet extends TopiaEntity { - void initCoordinates(); - } diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index b597167..39b44f8 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -24,8 +24,8 @@ package fr.ird.observe.entities.longline; import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.entities.gps.CoordinateHelper; +import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import org.nuiton.util.DateUtil; import java.util.Date; @@ -37,15 +37,6 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; - /** - * La valeur du quadrant (utilisé uniquement dans l'interface graphique) : - * en base on conserve cette information dans les coordonnées {@link #longitude} - * {@link #latitude} qui sont signés. - * - * @since 3.7 - */ - protected Integer quadrant; - @Override public Date getDate() { return timeStamp == null ? null : DateUtil.getDay(timeStamp); @@ -82,28 +73,19 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { } @Override - public void initCoordinates() { - - // compute quadrant - setQuadrant(CoordinateHelper.getQuadrant(longitude, latitude)); - - } - - @Override public Integer getQuadrant() { - return quadrant; -// return CoordinateHelper.getQuadrant(longitude, latitude); + return CoordinateHelper.getQuadrant(longitude, latitude); } - @Override - public synchronized void setQuadrant(Integer quadrant) { - if (!Objects.equals(this.quadrant, quadrant)){ - Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); - } - Integer old = this.quadrant; - this.quadrant = quadrant; - fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); - } +// @Override +// public synchronized void setQuadrant(Integer quadrant) { +// if (!Objects.equals(this.quadrant, quadrant)){ +// Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); +// } +// Integer old = this.quadrant; +// this.quadrant = quadrant; +// fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); +// } /** @return {@code true} si l'activite concerne une calée */ @Override @@ -139,11 +121,11 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("date", getDate()) - .add("time", getTime()) - .add("quadrant", quadrant) - .add("latitude", longitude) - .add("longitude", longitude) - .toString(); + .add("date", getDate()) + .add("time", getTime()) + .add("quadrant", getQuadrant()) + .add("latitude", longitude) + .add("longitude", longitude) + .toString(); } } diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java index 5b1a852..033106a 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java @@ -34,17 +34,6 @@ public class SetLonglineImpl extends SetLonglineAbstract { private static final long serialVersionUID = 1L; - @Override - public void initCoordinates() { - - setSettingStartQuadrant(getSettingStartQuadrant()); - setSettingEndQuadrant(getSettingEndQuadrant()); - - setHaulingStartQuadrant(getHaulingStartQuadrant()); - setHaulingEndQuadrant(getHaulingEndQuadrant()); - - } - public Integer getSettingStartQuadrant() { return CoordinateHelper.getQuadrant(settingStartLongitude, settingStartLatitude); } diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index 7ffc67f..a211260 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -24,8 +24,8 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.constants.seine.SchoolTypePersist; -import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.gps.CoordinateHelper; +import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.NumberUtil; @@ -61,15 +61,6 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { public static final String PROPERTY_SET_OPERATION = "setOperation"; - /** - * La valeur du quadrant (utilisé uniquement dans l'interface graphique) : - * en base on conserve cette information dans les coordonnées {@link #longitude} - * {@link #latitude} qui sont signés. - * - * @since 3.8 - */ - protected Integer quadrant; - // @Override // public OpenableEntity getOpenChild() { // // sur une activity, pas d'enfant OpenableEntity @@ -107,39 +98,20 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { } @Override - public void initCoordinates() { - - // compute quadrant - setQuadrant(CoordinateHelper.getQuadrant(longitude, latitude)); - - } - - @Override public Integer getQuadrant() { -// return CoordinateHelper.getQuadrant(longitude, latitude); - return quadrant; + return CoordinateHelper.getQuadrant(longitude, latitude); } - @Override - public void setQuadrant(Integer quadrant) { - if (!Objects.equals(this.quadrant, quadrant)) { - Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); - } - Integer old = this.quadrant; -// fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); - this.quadrant = quadrant; - fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); - } - - @Override - public Float getVitesse() { - return getVesselSpeed(); - } - - @Override - public void setVitesse(Float vitesse) { - setVesselSpeed(vitesse); - } +// @Override +// public void setQuadrant(Integer quadrant) { +// if (!Objects.equals(this.quadrant, quadrant)) { +// Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); +// } +// Integer old = this.quadrant; +//// fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); +// this.quadrant = quadrant; +// fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); +// } @Override public SchoolTypePersist getSchoolType() { @@ -220,11 +192,11 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("time", getTime()) - .add("quadrant", quadrant) - .add("latitude", longitude) - .add("longitude", longitude) - .toString(); + .add("time", getTime()) + .add("quadrant", getQuadrant()) + .add("latitude", longitude) + .add("longitude", longitude) + .toString(); } } diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java index 8ebba0c..156eeef 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java @@ -33,10 +33,6 @@ public class SetSeineImpl extends SetSeineAbstract { private static final long serialVersionUID = 1L; @Override - public void initCoordinates() { - } - - @Override public boolean hasTargetCatch() { if (isTargetCatchEmpty()) { return false; diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 4132971..5fddab0 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java index a3f46da..1ec3b38 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java @@ -51,7 +51,6 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, entity.setTimeStamp(dto.getTimeStamp()); entity.setLatitude(dto.getLatitude()); entity.setLongitude(dto.getLongitude()); - entity.setQuadrant(dto.getQuadrant()); entity.setSeaSurfaceTemperature(dto.getSeaSurfaceTemperature()); entity.setVesselActivityLongline(toEntity(dto.getVesselActivityLongline(), VesselActivityLongline.class)); entity.setFpaZone(toEntity(dto.getFpaZone(), FpaZone.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java index 2e2fabb..0e7fcee 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java @@ -57,7 +57,6 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi copyDtoDataFieldsToEntity(dto, entity); entity.setTime(dto.getTime()); - entity.setQuadrant(dto.getQuadrant()); entity.setLatitude(dto.getLatitude()); entity.setLongitude(dto.getLongitude()); entity.setVesselSpeed(dto.getVesselSpeed()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java index 70337c2..e2cc905 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/longline/ActivityLonglineServiceTopia.java @@ -24,14 +24,11 @@ package fr.ird.observe.services.topia.service.longline; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; -import fr.ird.observe.entities.gps.CoordinateHelper; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.ActivityLonglines; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -42,6 +39,8 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -156,18 +155,6 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } else { - // on recupère le quadrant de cette activity - // et on l'affecte à la nouvelle activity - Integer quadrant = CoordinateHelper.getQuadrant( - lastActivityLongline.getLongitude(), - lastActivityLongline.getLatitude()); - - if (quadrant != null) { - - preCreated.setQuadrant(quadrant); - - } - // on reprend la date et l'heure de la dernière activité timestamp = lastActivityLongline.getTimeStamp(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java index d564b4c..92713d9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java @@ -24,14 +24,11 @@ package fr.ird.observe.services.topia.service.seine; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; -import fr.ird.observe.entities.gps.CoordinateHelper; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineTopiaDao; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -41,6 +38,8 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; +import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -158,18 +157,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } else { - // on recupère le quadrant de cette activity - // et on l'affecte à la nouvelle activity - Integer quadrant = CoordinateHelper.getQuadrant( - lastActivitySeine.getLongitude(), - lastActivitySeine.getLatitude()); - - if (quadrant != null) { - - preCreated.setQuadrant(quadrant); - - } - // on reprend l'heure de la dernière activité time = lastActivitySeine.getTime(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.