Author: kmorin Date: 2013-04-02 16:08:05 +0200 (Tue, 02 Apr 2013) New Revision: 716 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/716 Log: - stop using nuiton-widget - fixes #2136 [ERGO] -Tableau - Cacher les colonnes - refs #1987 [PROTOCOLE] - Gestion des contr?\195?\180les/infos obligatoires en validation - debug NPE Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.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/catches/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-01 20:46:21 UTC (rev 715) +++ trunk/tutti-ui-swing/pom.xml 2013-04-02 14:08:05 UTC (rev 716) @@ -340,10 +340,6 @@ </dependency> <!-- swing widgets --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> <dependency> <groupId>org.swinglabs.swingx</groupId> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-01 20:46:21 UTC (rev 715) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-02 14:08:05 UTC (rev 716) @@ -48,6 +48,7 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.help.JAXXHelpBroker; import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -55,7 +56,6 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.UserI18nInitializer; -import org.nuiton.widget.SwingSession; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-01 20:46:21 UTC (rev 715) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-02 14:08:05 UTC (rev 716) @@ -45,27 +45,19 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; -import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.CloseableUI; -import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.*; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.widget.SwingSession; -import javax.swing.Icon; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JToolBar; -import java.awt.Cursor; +import javax.swing.*; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.net.URL; import java.util.Locale; 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-04-01 20:46:21 UTC (rev 715) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-04-02 14:08:05 UTC (rev 716) @@ -808,7 +808,11 @@ @Override public void setRecorderPerson(List<Person> recorderPerson) { - Object oldValue = Lists.newArrayList(getRecorderPerson()); + Object oldValue = null; + List<Person> oldRecorderPerson = getRecorderPerson(); + if (oldRecorderPerson != null) { + oldValue= Lists.newArrayList(oldRecorderPerson); + } editObject.setRecorderPerson(Lists.<Person>newArrayList()); if (recorderPerson != null) { getRecorderPerson().addAll(recorderPerson); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-01 20:46:21 UTC (rev 715) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-02 14:08:05 UTC (rev 716) @@ -28,12 +28,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.Attachment; -import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.data.*; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -41,12 +36,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategory; -import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent; -import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; +import fr.ifremer.tutti.ui.swing.content.operation.catches.*; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; @@ -77,14 +67,10 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.JOptionPane; -import javax.swing.RowFilter; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -276,13 +262,13 @@ if (species.getReferenceTaxonId().equals( speciesProtocol.getSpeciesReferenceTaxonId())) { - // TODO kmorin 20130329 check with Vincent what are exactly the countIfNoFrequencyEnabled - // and weight properties result = (!speciesProtocol.isSizeEnabled() || row.getSizeCategoryValue() != null) && (!speciesProtocol.isSexEnabled() || row.getSexCategoryValue() != null) && (!speciesProtocol.isMaturityEnabled() || row.getMaturityCategoryValue() != null) && (!speciesProtocol.isAgeEnabled() || row.getAgeCategoryValue() != null) - && (!speciesProtocol.isCountIfNoFrequencyEnabled() || !CollectionUtils.isEmpty(row.getFrequency())); + && (!speciesProtocol.isCountIfNoFrequencyEnabled() + || !CollectionUtils.isEmpty(row.getFrequency()) + || row.getNumber() != null); } } }