- Tutti-commits - mailman.cloud.codelutin.com

r492 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . content/home
by kmorin＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: kmorin Date: 2013-02-27 16:56:12 +0100 (Wed, 27 Feb 2013) New Revision: 492 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/492 Log: refs #2031 [ERGO] - Ergonomie des listes d?\195?\169roulantes comportant des actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-27 10:26:29 UTC (rev 491) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-27 15:56:12 UTC (rev 492) @@ -470,10 +470,6 @@ // add data list to combo box list.init((JXPathDecorator<E>) decorator, data, selectedData); -// OneClicListSelectionModel.installModel(listHeader.getList()); - -// updateIndices(listHeader.getList(), selectedData); - if (log.isDebugEnabled()) { log.debug("Jlist [" + beanType.getName() + "] : " + list.getUniverseList().getModel().getSize()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 10:26:29 UTC (rev 491) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 15:56:12 UTC (rev 492) @@ -32,19 +32,26 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; +import java.awt.AWTEvent; +import java.awt.Event; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.List; +import javax.swing.Action; +import javax.swing.JComboBox; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.Action; -import javax.swing.JComboBox; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.List; - /** * Main ui content to select cruise. * @@ -151,6 +158,9 @@ initBeanComboBox(ui.getProtocolCombobox(), model.getProtocols(), model.getProtocol()); + + ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); + ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, new PropertyChangeListener() { @Override @@ -245,10 +255,10 @@ } clearValidators(); } - + public void startExistingProtocolAction(ActionEvent event) { if (!resetEditProtolAction) { - JComboBox newProtocolCombo = (JComboBox) event.getSource(); + JComboBox newProtocolCombo = (JComboBox) event.getSource(); Action selectedAction = (Action) newProtocolCombo.getSelectedItem(); // hide popup before performing the action, otherwise, if the action // opens a popup, the user must click a first time to hide the combobox

1 0

r491 - in trunk/tutti-ui-swing: . src/main/java/fr/ifremer/tutti/ui/swing/content/operation src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches src/main/resources/i18n
by kmorin＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: kmorin Date: 2013-02-27 11:26:29 +0100 (Wed, 27 Feb 2013) New Revision: 491 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/491 Log: fixes #2040 [TRAIT] - Comportement de l'annulation Added: trunk/tutti-ui-swing/tutti.config Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-27 10:26:29 UTC (rev 491) @@ -30,6 +30,8 @@ import org.apache.commons.logging.LogFactory; import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n._; @@ -61,6 +63,21 @@ _("tutti.action.cancel.editFishingOperation.tip"), true ); + + getModel().addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_ID, + new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + putValue(NAME, _("tutti.action.cancel.editFishingOperation")); + putValue(SHORT_DESCRIPTION, _("tutti.action.cancel.editFishingOperation.tip")); + + } else { + putValue(NAME, _("tutti.action.reset.editFishingOperation")); + putValue(SHORT_DESCRIPTION, _("tutti.action.reset.editFishingOperation.tip")); + } + } + }); } public EditFishingOperationAction getEditAction() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-02-27 10:26:29 UTC (rev 491) @@ -63,8 +63,8 @@ super(handler, "cancelEditCatchBatch", "cancel", - _("tutti.action.cancelEditCatchBatch"), - _("tutti.action.cancelEditCatchBatch.tip"), + _("tutti.action.reset.editCatchBatch"), + _("tutti.action.reset.editCatchBatch.tip"), true ); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 10:26:29 UTC (rev 491) @@ -11,13 +11,11 @@ tutti.action.cancel.editCruise=Annuler tutti.action.cancel.editCruise.tip=Annuler l'édition (ou la création) de la campagne tutti.action.cancel.editFishingOperation=Annuler -tutti.action.cancel.editFishingOperation.tip=Annuler l'édition (ou la création) du trait +tutti.action.cancel.editFishingOperation.tip=Annuler la création du trait tutti.action.cancel.editProgram=Annuler tutti.action.cancel.editProgram.tip=Annuler l'édition (ou la création) de la série de campagne tutti.action.cancel.editProtocol=Annuler tutti.action.cancel.editProtocol.tip=Annuler l'édition (ou la création) du protocole -tutti.action.cancelEditCatchBatch=Annuler -tutti.action.cancelEditCatchBatch.tip=Annuler l'édition de la capture tutti.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.action.chooseProtocolFile=Choisir le fichier de protocole tutti.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces @@ -133,6 +131,10 @@ tutti.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné tutti.action.renameSpeciesBatch=Corriger l'espèce tutti.action.renameSpeciesBatch.tip=Corriger l'espèce sur tout le lot sélectionné +tutti.action.reset.editCatchBatch=Réinitialiser +tutti.action.reset.editCatchBatch.tip=Réinitialiser l'édition de la capture +tutti.action.reset.editFishingOperation=Réinitialiser +tutti.action.reset.editFishingOperation.tip=Réinitialiser l'édition du trait tutti.action.reset.fishingOperationValidState=Réinitialiser tutti.action.save=Enregistrer tutti.action.saveCatchBatch=Sauver Added: trunk/tutti-ui-swing/tutti.config =================================================================== --- trunk/tutti-ui-swing/tutti.config (rev 0) +++ trunk/tutti-ui-swing/tutti.config 2013-02-27 10:26:29 UTC (rev 491) @@ -0,0 +1,6 @@ +#Last saved Mon Feb 11 18:03:07 CET 2013 +#Mon Feb 11 18:03:07 CET 2013 +tutti.cruiseId=100001 +tutti.programId=CAM-PELGAS +tutti.protocolId=15cf939f-cf87-42d2-9999-25222d1d823f +tutti.ui.coordinateEditorType=DD

1 0

r490 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: kmorin Date: 2013-02-27 10:25:47 +0100 (Wed, 27 Feb 2013) New Revision: 490 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/490 Log: fixes #2060 [TRAIT] - Rapport de contr?\195?\180le - probl?\195?\168me de mise ?\195?\160 jour de l'affichage des contr?\195?\180les ?\195?\160 la saisie Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.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-02-27 07:34:32 UTC (rev 489) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-27 09:25:47 UTC (rev 490) @@ -438,7 +438,7 @@ @Override public void onShowTab(int currentIndex, int newIndex) { -// registerValidators(ui.getValidator()); + registerValidators(ui.getValidator()); } public void registerValidator() {

1 0

r489 - trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: tchemit Date: 2013-02-27 08:34:32 +0100 (Wed, 27 Feb 2013) New Revision: 489 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/489 Log: refs #2058: [REFERENTIEL] Taxon referent doubl?\195?\169 (was fixed in our db) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-02-27 07:12:48 UTC (rev 488) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-02-27 07:34:32 UTC (rev 489) @@ -211,13 +211,13 @@ Assert.assertEquals(fixtures.refSpeciesTaxonId(), species.getReferenceTaxonId()); } - @Test(expected = NonUniqueResultException.class) + @Test public void getBadSpeciesByReferenceTaxonId(/*String speciesReferenceTaxonId*/) { Integer taxonId = fixtures.refBadSpeciesTaxonId(); service.getSpeciesByReferenceTaxonId(taxonId); } - @Test(expected = NonUniqueResultException.class) + @Test public void getBad2SpeciesByReferenceTaxonId(/*String speciesReferenceTaxonId*/) { Integer taxonId = fixtures.refBad2SpeciesTaxonId(); service.getSpeciesByReferenceTaxonId(taxonId);

1 0

r488 - in trunk: tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch tutti-service/src/test/java/fr/ifremer/tutti/service/protocol
by tchemit＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: tchemit Date: 2013-02-27 08:12:48 +0100 (Wed, 27 Feb 2013) New Revision: 488 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/488 Log: ignore test (it really does not work :() + fix import Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java 2013-02-27 07:08:59 UTC (rev 487) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java 2013-02-27 07:12:48 UTC (rev 488) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; +@Ignore public class CatchBatchValidatorReadTest { @ClassRule Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-27 07:08:59 UTC (rev 487) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-27 07:12:48 UTC (rev 488) @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;

1 0

r487 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com Feb. 27, 2013

Feb. 27, 2013

Author: tchemit Date: 2013-02-27 08:08:59 +0100 (Wed, 27 Feb 2013) New Revision: 487 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/487 Log: fixes #2062: [ESPECE] Sauvegarge de mensuration impossible Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-27 07:08:59 UTC (rev 487) @@ -44,8 +44,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import org.hibernate.event.EvictEvent; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -67,6 +65,7 @@ /** * To clear all caches. + * * @since 1.0.1 */ void clearAllCaches(); @@ -177,6 +176,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -251,6 +251,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return referentialService.getAllNumericCaracteristic(); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { return referentialService.getSizeCategoryCaracteristic(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -122,6 +122,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + throw new RuntimeException("method not implemented"); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -163,6 +163,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -450,6 +450,18 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + List<Caracteristic> result = Lists.newArrayList(); + + for (Caracteristic caracteristic : getAllCaracteristic()) { + if (caracteristic.isNumericType()) { + result.add(caracteristic); + } + } + return result; + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { Integer pmfmId = enumeration.PMFM_ID_SIZE_CATEGORY; Caracteristic result = getCaracteristic(pmfmId); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -177,6 +177,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return driver.getAllNumericCaracteristic(); + } + + @Override public List<Zone> getAllProgramZone() { return driver.getAllProgramZone(); }

1 0

r486 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: cruise operation protocol
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:54:09 +0100 (Tue, 26 Feb 2013) New Revision: 486 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/486 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 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/protocol/EditProtocolUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -34,7 +34,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-26 17:54:09 UTC (rev 486) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Predicate; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -128,43 +129,7 @@ JAXXContextEntryDef<List<Gear>> SCIENTIFIC_GEARS_CONTEXT_ENTRY = JAXXUtil.newListContextEntryDef("scientificGear"); JAXXContextEntryDef<List<Gear>> FISHING_GEARS_CONTEXT_ENTRY = JAXXUtil.newListContextEntryDef("fishingGear"); - - protected List<Vessel> getVesselList(VesselTypeEnum vesselType) { - List<Vessel> result = Lists.newArrayList(); - switch (vesselType) { - - case ALL: - result.addAll(FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - result.addAll(SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case SCIENTIFIC: - result.addAll(SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case FISHING: - result.addAll(FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui)); - break; - } - return result; - } - - protected List<Gear> getGearList(VesselTypeEnum vesselType) { - List<Gear> result = Lists.newArrayList(); - switch (vesselType) { - - case ALL: - result.addAll(SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - result.addAll(FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case SCIENTIFIC: - result.addAll(SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - case FISHING: - result.addAll(FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui)); - break; - } - return result; - } - + @Override public void afterInitUI() { @@ -173,46 +138,71 @@ List<Person> users = persistenceService.getAllPerson(); EditCruiseUIModel model = getModel(); - - model.setVesselType(model.isCreate() ? VesselTypeEnum.SCIENTIFIC : VesselTypeEnum.ALL); - + + final List<Vessel> scientificVesselList = SCIENTIFIC_VESSELS_CONTEXT_ENTRY.getContextValue(ui); + final List<Vessel> fishingVesselList = FISHING_VESSELS_CONTEXT_ENTRY.getContextValue(ui); + final List<Vessel> allVesselList = Lists.newArrayList(); + allVesselList.addAll(scientificVesselList); + allVesselList.addAll(fishingVesselList); + + final List<Gear> scientificGearList = SCIENTIFIC_GEARS_CONTEXT_ENTRY.getContextValue(ui); + final List<Gear> fishingGearList = FISHING_GEARS_CONTEXT_ENTRY.getContextValue(ui); + final List<Gear> allGearList = Lists.newArrayList(); + allGearList.addAll(scientificGearList); + allGearList.addAll(fishingGearList); + // Change vessel list and gear list when vessel type changes model.addPropertyChangeListener(EditCruiseUIModel.PROPERTY_VESSEL_TYPE, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - EditCruiseUIModel source = (EditCruiseUIModel) evt.getSource(); + VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); - List<Vessel> selectedVessel = source.getVessel(); - List<Gear> selectedGear = source.getGear(); + Predicate<Vessel> vesselPredicate = null; + Predicate<Gear> gearPredicate = null; + + switch (vesselType) { + case FISHING: + vesselPredicate = new Predicate<Vessel>() { - VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); + public boolean apply(Vessel input) { + return !input.isScientificVessel(); + } + }; + gearPredicate = new Predicate<Gear>() { - List<Vessel> newVesselList = getVesselList(vesselType); - List<Gear> newGearList = getGearList(vesselType); + public boolean apply(Gear input) { + return !input.isScientificGear(); + } + }; + break; + + case SCIENTIFIC: + vesselPredicate = new Predicate<Vessel>() { - // compute new selected vessel list - List<Vessel> newSelectedVessel = Lists.newArrayList(); - if (selectedVessel != null) { - newSelectedVessel.addAll(selectedVessel); - } - newSelectedVessel.retainAll(newVesselList); + public boolean apply(Vessel input) { + return input.isScientificVessel(); + } + }; + gearPredicate = new Predicate<Gear>() { - // compute new selected gear list - List<Gear> newSelectedGear = Lists.newArrayList(); - if (selectedGear != null) { - newSelectedGear.addAll(selectedGear); + public boolean apply(Gear input) { + return input.isScientificGear(); + } + }; + break; + } - newSelectedGear.retainAll(newGearList); + ui.getVesselList().getHandler().clearFilters(); + ui.getGearList().getHandler().clearFilters(); + + if (vesselPredicate != null) { + ui.getVesselList().getHandler().addFilter(vesselPredicate); + } + if (gearPredicate != null) { + ui.getGearList().getHandler().addFilter(gearPredicate); + } - // reinit vessel list - ui.getVesselList().getModel().setUniverse(newVesselList); - ui.getVesselList().getModel().setSelected(newSelectedVessel); - - // reinit gear list - ui.getGearList().getModel().setUniverse(newGearList); - ui.getGearList().getModel().setSelected(newSelectedGear); - } }); @@ -224,27 +214,15 @@ persistenceService.getAllCountry(), model.getCountry()); + initBeanList(ui.getVesselList(), - getVesselList(model.getVesselType()), + allVesselList, model.getVessel()); initBeanList(ui.getGearList(), - getGearList(model.getVesselType()), + allGearList, model.getGear()); - //TODO kmorin 20130218 remove this sort when the double lists will be sortable - Collections.sort(users, new Comparator<Person>() { - - public int compare(Person o1, Person o2) { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.getFirstName().compareTo(o2.getFirstName()); - } - }); initBeanList(ui.getHeadOfMissionList(), users, model.getHeadOfMission()); @@ -258,6 +236,8 @@ // if new fishingOperation can already cancel his creation model.setModify(model.isCreate()); + + model.setVesselType(VesselTypeEnum.SCIENTIFIC); registerValidators(validator); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-02-26 17:54:09 UTC (rev 486) @@ -443,8 +443,8 @@ // update saisissuer selection List<Person> saisisseur = editFishingOperationUIModel.getSaisisseur(); - ui.getSaisisseurList().getModel().setSelected(saisisseur); - + ui.getSaisisseurList().getHandler().setSelected(saisisseur); + // update model empty property editFishingOperationUIModel.setEmpty(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -34,7 +34,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; } 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-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-26 17:54:09 UTC (rev 486) @@ -243,19 +243,6 @@ initUI(ui); List<Person> people = persistenceService.getAllPerson(); - //TODO kmorin 20130218 remove this sort when the double lists will be sortable - Collections.sort(people, new Comparator<Person>() { - - public int compare(Person o1, Person o2) { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.getFirstName().compareTo(o2.getFirstName()); - } - }); initBeanList(ui.getSaisisseurList(), people, model.getSaisisseur()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-26 17:53:40 UTC (rev 485) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-02-26 17:54:09 UTC (rev 486) @@ -28,7 +28,7 @@ BeanDoubleList { showReset: true; - /*i18nPrefix: "tutti.property.";*/ + i18nPrefix: "tutti.property."; bean: {model}; }

1 0

r485 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:53:40 +0100 (Tue, 26 Feb 2013) New Revision: 485 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/485 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:52:19 UTC (rev 484) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:53:40 UTC (rev 485) @@ -245,6 +245,7 @@ while (list.hasNext()) { Object[] source = list.next(); Vessel target = loadVessel(source); + target.setScientificVessel(true); result.add(target); } return result; @@ -263,6 +264,7 @@ while (list.hasNext()) { Object[] source = list.next(); Vessel target = loadVessel(source); + target.setScientificVessel(false); result.add(target); } return result; @@ -298,6 +300,7 @@ while (sources.hasNext()) { Object[] source = sources.next(); Gear target = loadGear(source); + target.setScientificGear(true); result.add(target); } return result; @@ -312,6 +315,7 @@ while (sources.hasNext()) { Object[] source = sources.next(); Gear target = loadGear(source); + target.setScientificGear(false); result.add(target); } return result;

1 0

r484 - trunk
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:52:19 +0100 (Tue, 26 Feb 2013) New Revision: 484 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/484 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-26 17:51:59 UTC (rev 483) +++ trunk/pom.xml 2013-02-26 17:52:19 UTC (rev 484) @@ -130,7 +130,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.10</jaxxVersion> + <jaxxVersion>2.5.11-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r483 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com Feb. 26, 2013

Feb. 26, 2013

Author: kmorin Date: 2013-02-26 18:51:59 +0100 (Tue, 26 Feb 2013) New Revision: 483 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/483 Log: refs #1971 [ERGO] - Gestion des listes d?\195?\169roulantes - Fonctionnalit?\195?\169 de filtrage / recherche Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-26 08:42:14 UTC (rev 482) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-26 17:51:59 UTC (rev 483) @@ -27,6 +27,7 @@ tutti.property.multirigAggregation=Numéro de poche tutti.property.name=Nom tutti.property.parameterName=Paramètre +tutti.property.person=Personne tutti.property.program=Série de campagne tutti.property.protocol=Protocol de saisie tutti.property.refTaxCode=Code RefTax

1 0