This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3513ff503d4c9d1de1fc88731612a4f5029ffc98 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 16 19:05:01 2014 +0200 fixes #5807: [TRAIT] si on décoche trait rectiligne, vider le champ distance de la valeur calculée quand on avait coché trait rectiligne --- .../operation/EditFishingOperationUIHandler.java | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index c42a163..3105fe4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -25,11 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.operation; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.tutti.util.DateTimes; -import fr.ifremer.tutti.util.Distances; -import org.nuiton.jaxx.application.ApplicationDataUtil; -import org.nuiton.jaxx.application.swing.tab.TabHandler; -import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -40,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.action.CancelEditFishingOperationAction; import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; @@ -48,12 +44,17 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUI import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.GearCaracteristicListCellRenderer; +import fr.ifremer.tutti.util.DateTimes; +import fr.ifremer.tutti.util.Distances; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXDatePicker; +import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; +import org.nuiton.jaxx.application.swing.tab.TabHandler; import javax.swing.JButton; import javax.swing.JComboBox; @@ -410,13 +411,21 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa Lists.<Vessel>newArrayList(), model.getSecondaryVessel()); - model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_NUMBER, + // reset TrawlDistance when fishingOperationRectiligne pass to false + // see https://forge.codelutin.com/issues/5807 + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_RECTILIGNE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { + EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); + Boolean newValue = (Boolean) evt.getNewValue(); + if (BooleanUtils.isFalse(newValue)) { + source.setTrawlDistance(null); + } } }); + // Change vessel list and gear list when vessel type changes model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL_TYPE, new PropertyChangeListener() { @@ -560,13 +569,13 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa public void setDate(ActionEvent event, String property) { JXDatePicker field = (JXDatePicker) event.getSource(); Date value = field.getDate(); - Date date = (Date) ApplicationDataUtil.getProperty(getModel(), property); + Date date = (Date) JavaBeanObjectUtil.getProperty(getModel(), property); if (value != null && date != null) { Calendar cal = DateUtils.toCalendar(date); value = DateUtils.setHours(value, cal.get(Calendar.HOUR_OF_DAY)); value = DateUtils.setMinutes(value, cal.get(Calendar.MINUTE)); } - ApplicationDataUtil.setProperty(getModel(), property, value); + JavaBeanObjectUtil.setProperty(getModel(), property, value); } //------------------------------------------------------------------------// -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.