Author: kmorin Date: 2013-01-11 10:33:31 +0100 (Fri, 11 Jan 2013) New Revision: 169 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/169 Log: debug saississeurs dans le trait Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-10 16:23:59 UTC (rev 168) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-11 09:33:31 UTC (rev 169) @@ -43,30 +43,18 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUIModel; import fr.ifremer.tutti.ui.swing.util.CustomTab; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JLabel; -import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.beans.PropertyVetoException; -import java.beans.VetoableChangeListener; import java.util.List; import javax.swing.DefaultSingleSelectionModel; -import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.JTabbedPane; -import javax.swing.SingleSelectionModel; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import jaxx.runtime.validator.swing.SwingValidator; -import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; -import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** @@ -117,8 +105,8 @@ EditFishingOperationUIModel.PROPERTY_DUREE, EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, EditFishingOperationUIModel.PROPERTY_LOCATION, - EditFishingOperationUIModel.PROPERTY_COMMENT, - EditFishingOperationUIModel.PROPERTY_SAISISSEUR); + EditFishingOperationUIModel.PROPERTY_SAISISSEUR, + EditFishingOperationUIModel.PROPERTY_COMMENT); } @Override @@ -238,7 +226,7 @@ initBeanComboBox(ui.getSubStrataComboBox(), subStratas, subStrata); initBeanComboBox(ui.getLocationComboBox(), locations, location); - + model.setEmpty(true); changeValidatorContext(model.getValidationContext(), ui.getValidator()); @@ -345,9 +333,6 @@ model.fromBean(bean); - // to be sure saisisseurs are updated -// model.setSaisisseur(Lists.newArrayList(bean.getSaisisseur())); - // to be sure combo list will be reloaded model.setStrata(null); model.setSubStrata(null); @@ -370,10 +355,7 @@ // update saisissuer selection List<Person> saisisseur = model.getSaisisseur(); - if (log.isInfoEnabled()) { - log.info("Selected saisisseurs: " + (saisisseur == null ? 0 : saisisseur.size())); - log.info(saisisseur); - } + ui.getSaisisseurList().getModel().setSelected(saisisseur); // update model empty property model.setEmpty(empty); @@ -441,7 +423,6 @@ getModel().setModify(false); // persist current fishingOperation -// persistenceService.saveFishingOperation(toSave); parentUi.getHandler().saveFishingOperation(toSave); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-10 16:23:59 UTC (rev 168) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-01-11 09:33:31 UTC (rev 169) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -33,6 +34,8 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import java.util.Date; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -44,6 +47,8 @@ */ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<FishingOperation, EditFishingOperationUIModel> { + private static final Log log = LogFactory.getLog(EditFishingOperationUIModel.class); + private static final long serialVersionUID = 1L; public static final String TITLE = "tutti.label.tab.fishingOperation.general"; @@ -173,7 +178,7 @@ protected String comment; - protected List<Person> saisisseur; + protected List<Person> saisisseur = Lists.newArrayList(); protected FishingOperation fishingOperation; @@ -575,8 +580,8 @@ } public void setSaisisseur(List<Person> saisisseur) { - Object oldValue = getSaisisseur(); - this.saisisseur = saisisseur; + Object oldValue = Lists.newArrayList(getSaisisseur()); + this.saisisseur = Lists.newArrayList(saisisseur); firePropertyChange(PROPERTY_SAISISSEUR, oldValue, saisisseur); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-01-10 16:23:59 UTC (rev 168) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-01-11 09:33:31 UTC (rev 169) @@ -77,7 +77,7 @@ } public void setSelectedFishingOperation(FishingOperation selectedFishingOperation) { - Object oldValue = getSelectedFishingOperation(); + Object oldValue = Lists.newArrayList(getSelectedFishingOperation()); this.selectedFishingOperation = selectedFishingOperation; firePropertyChange(PROPERTY_SELECTED_FISHING_OPERATION, oldValue, selectedFishingOperation); }