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>.