This is an automated email from the git hooks/post-receive script. New change to branch feature/7594-LLVerifEcranDesActivitésDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git at 4577011 Ajout de trace dans les appels des services. This branch includes the following new commits: new 38f37ca Ne pas proposer d'ajouté la calé si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) new db2f75c correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". new 4577011 Ajout de trace dans les appels des services. The 3 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 4577011797df3e33261601087e89eb580d22ec4b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:55:39 2016 +0100 Ajout de trace dans les appels des services. commit db2f75cf4575f92f07ebda0006d6f1d8dd7d11c3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:54:20 2016 +0100 correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". commit 38f37ca4b97fcd6ca55ba677524323640141e26a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:48:29 2016 +0100 Ne pas proposer d'ajouté la calé si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) -- 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/7594-LLVerifEcranDesActivitésDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit 38f37ca4b97fcd6ca55ba677524323640141e26a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:48:29 2016 +0100 Ne pas proposer d'ajouté la calé si l'activité n'est pas sauvegardée. (de la même façon que l'on ne propose pas la création d'une nouvelle activité si celle courante est modifée) --- .../fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 355f424..086e87f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -95,5 +95,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid() && model.isSetOperation() && ! bean.isHasSetLongline()}; + enabled:{!model.isModified() && model.isValid() && model.isSetOperation() && ! bean.isHasSetLongline()}; } -- 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/7594-LLVerifEcranDesActivitésDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit db2f75cf4575f92f07ebda0006d6f1d8dd7d11c3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:54:20 2016 +0100 correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". --- .../impl/longline/ActivityLonglineUIModel.java | 21 ++++++++++++++------- .../longline/VesselActivityLonglineDtos.java | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java index a490de1..7f450c0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -22,14 +22,15 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDtos; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.DateUtil; -import org.nuiton.util.beans.BinderModelBuilder; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Date; /** @@ -42,8 +43,7 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong private static final long serialVersionUID = 1L; - //FIXME à mettre ailleurs - private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + public static final String PROPERTY_SET_OPERATION = "setOperation"; public static final String PROPERTY_DATE = "date"; @@ -51,12 +51,19 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong public ActivityLonglineUIModel() { super(ActivityLonglineDto.class); + + getBean().addPropertyChangeListener(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean oldValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getOldValue()); + boolean newValue = VesselActivityLonglineDtos.isSetOperation((ReferentialReference<VesselActivityLonglineDto>) evt.getNewValue()); + firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); + } + }); } public boolean isSetOperation() { - ReferentialReference<VesselActivityLonglineDto> vesselActivityLongline = bean.getVesselActivityLongline(); - return vesselActivityLongline != null - && VESSEL_ACTIVITY_ID_FOR_SET.equals(vesselActivityLongline.getId()); + return VesselActivityLonglineDtos.isSetOperation(bean.getVesselActivityLongline()); } public Date getDate() { diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java new file mode 100644 index 0000000..d7a1772 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDtos.java @@ -0,0 +1,22 @@ +package fr.ird.observe.services.dto.referential.longline; + +import fr.ird.observe.services.dto.referential.ReferentialReference; + +public class VesselActivityLonglineDtos extends AbstractVesselActivityLonglineDtos { + + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + + public static boolean isSetOpreration(String id) { + return VESSEL_ACTIVITY_ID_FOR_SET.equals(id); + } + + public static boolean isSetOperation(VesselActivityLonglineDto vesselActivityLonglineDto) { + return vesselActivityLonglineDto != null && isSetOpreration(vesselActivityLonglineDto.getId()); + } + + public static boolean isSetOperation(ReferentialReference<VesselActivityLonglineDto> vesselActivityLonglineRef) { + return vesselActivityLonglineRef != null && isSetOpreration(vesselActivityLonglineRef.getId()); + } + + +} //VesselActivityLonglineDtos -- 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/7594-LLVerifEcranDesActivitésDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit 4577011797df3e33261601087e89eb580d22ec4b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 15:55:39 2016 +0100 Ajout de trace dans les appels des services. --- .../longline/ActivityLonglineServiceTopia.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 9d5524e..05a465e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.longline; * #L% */ +import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; @@ -40,6 +41,8 @@ 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.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.Calendar; @@ -51,8 +54,13 @@ import java.util.List; */ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLonglineService { + private static final Log log = LogFactory.getLog(ActivityLonglineServiceTopia.class); + @Override public DataReferenceSet<ActivityLonglineDto> getActivityLonglineByTripLongline(String tripLonglineId) { + if (log.isTraceEnabled()) { + log.trace("getActivityLonglineByTripLongline(" + tripLonglineId + ")"); + } ActivityLonglineTopiaDao dao = getTopiaPersistenceContext().getActivityLonglineDao(); List<ActivityLongline> allStubByTripId = dao.findAllStubByTripId(tripLonglineId, getReferentialLocale().ordinal()); @@ -63,6 +71,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public int getActivityLonglinePositionInTripLongline(String tripLonglineId, String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("getActivityLonglinePositionInTripLongline(" + tripLonglineId + ", " + activityLonglineId + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); ActivityLongline activityLongline = tripLongline.getActivityLonglineByTopiaId(activityLonglineId); @@ -74,6 +85,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public DataReference<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadReferenceToRead(" + activityLonglineId + ")"); + } ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, activityLonglineId); @@ -84,6 +98,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public ActivityLonglineDto loadDto(String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadDto(" + activityLonglineId + ")"); + } return loadEntityToDataDto(ActivityLonglineDto.class, activityLonglineId); @@ -91,6 +108,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public boolean exists(String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("exists(" + activityLonglineId + ")"); + } return existsEntity(ActivityLongline.class, activityLonglineId); @@ -98,6 +118,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public Form<ActivityLonglineDto> loadForm(String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + activityLonglineId + ")"); + } ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, activityLonglineId); @@ -113,6 +136,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public Form<ActivityLonglineDto> preCreate(String tripLonglineId) { + if (log.isTraceEnabled()) { + log.trace("preCreate(" + tripLonglineId + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); @@ -160,6 +186,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + tripLonglineId + ", " + dto.getId() + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); @@ -188,6 +217,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public boolean delete(String tripLonglineId, String activityLonglineId) { + if (log.isTraceEnabled()) { + log.trace("delete(" + tripLonglineId + ", " + activityLonglineId + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); @@ -209,6 +241,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public int moveActivityLonglineToTripLongline(String activityLonglineId, String tripLonglineId) { + if (log.isTraceEnabled()) { + log.trace("moveActivityLonglineToTripLongline(" + activityLonglineId + ", " + tripLonglineId + ")"); + } ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, activityLonglineId); TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); @@ -222,6 +257,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public List<Integer> moveActivityLonglinesToTripLongline(List<String> activityLonglineIds, String tripLonglineId) { + if (log.isTraceEnabled()) { + log.trace("moveActivityLonglinesToTripLongline([" + Joiner.on(", ").join(activityLonglineIds) + "], " + tripLonglineId + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm