This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595-PSVérifÉcranActivités in repository tutti. See http://git.codelutin.com/tutti.git commit 9829bb5f8661a67e0763d93186c0a62f5a72e112 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 16:29:47 2016 +0100 - correction du binding entre le type de l'activité et l'activation du bouton "ajouter l'opération de pêche". - correction du binding entre le type de l'activité et l'activation des champs "Zone FPA". --- .../open/impl/seine/ActivitySeineUIModel.java | 38 ++++++++++++++++++---- .../referential/seine/VesselActivitySeineDtos.java | 35 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index ccbc9d9..1972ecc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -23,9 +23,14 @@ package fr.ird.observe.ui.content.open.impl.seine; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Set; /** @@ -40,8 +45,9 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; - //FIXME à mettre ailleurs - public static final String ACTIVITY_CHANGED_ZONE = "21"; + public static final String PROPERTY_SET_OPERATION = "setOperation"; + + public static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(ActivitySeineDto.PROPERTY_TIME, @@ -69,6 +75,24 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public ActivitySeineUIModel() { super(ActivitySeineDto.class); + getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean oldValue = VesselActivitySeineDtos.isSetOperation((ReferentialReference<VesselActivitySeineDto>) evt.getOldValue()); + boolean newValue = VesselActivitySeineDtos.isSetOperation((ReferentialReference<VesselActivitySeineDto>) evt.getNewValue()); + firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); + } + }); + + getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + boolean oldValue = VesselActivitySeineDtos.isChangedZoneOperation((ReferentialReference<VesselActivitySeineDto>) evt.getOldValue()); + boolean newValue = VesselActivitySeineDtos.isChangedZoneOperation((ReferentialReference<VesselActivitySeineDto>) evt.getNewValue()); + firePropertyChange(PROPERTY_CHANGED_ZONE_OPERATION, oldValue, newValue); + } + }); + } public boolean isMeasurementsTabValid() { @@ -91,12 +115,12 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } + public boolean isSetOperation() { + return VesselActivitySeineDtos.isSetOperation(bean.getVesselActivitySeine()); + } + public boolean isChangedZoneOperation() { - //FIXME -// ReferentialReference<VesselActivitySeineDto> vesselActivitySeine = bean.getVesselActivitySeine(); -// Serializable code = vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE); -// return vesselActivitySeine != null && ACTIVITY_CHANGED_ZONE.equals(code); - return false; + return VesselActivitySeineDtos.isChangedZoneOperation(bean.getVesselActivitySeine()); } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java new file mode 100644 index 0000000..c28a393 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDtos.java @@ -0,0 +1,35 @@ +package fr.ird.observe.services.dto.referential.seine; + +import fr.ird.observe.services.dto.referential.ReferentialReference; + +public class VesselActivitySeineDtos extends AbstractVesselActivitySeineDtos { + + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586"; + + public static final String VESSEL_ACTIVITY_ID_CHANGED_ZONE = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1379684416896#0.38648073770690594"; + + public static boolean isSetOpreration(String id) { + return VESSEL_ACTIVITY_ID_FOR_SET.equals(id); + } + + public static boolean isSetOperation(VesselActivitySeineDto vesselActivitySeineDto) { + return vesselActivitySeineDto != null && isSetOpreration(vesselActivitySeineDto.getId()); + } + + public static boolean isSetOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + return vesselActivitySeineRef != null && isSetOpreration(vesselActivitySeineRef.getId()); + } + + public static boolean isChangedZoneOperation(String id) { + return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); + } + + public static boolean isChangedZoneOperation(VesselActivitySeineDto vesselActivitySeineDto) { + return vesselActivitySeineDto != null && isChangedZoneOperation(vesselActivitySeineDto.getId()); + } + + public static boolean isChangedZoneOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + return vesselActivitySeineRef != null && isChangedZoneOperation(vesselActivitySeineRef.getId()); + } + +} //VesselActivitySeineDtos -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.