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

r981 - in trunk: tutti-service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by tchemit＠users.forge.codelutin.com 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 11:19:40 +0200 (Wed, 22 May 2013) New Revision: 981 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/981 Log: optimize dependencies + fix java 1.7 code Modified: trunk/tutti-service/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-22 09:11:54 UTC (rev 980) +++ trunk/tutti-service/pom.xml 2013-05-22 09:19:40 UTC (rev 981) @@ -125,11 +125,6 @@ <artifactId>xwork-core</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </dependency> -  <dependency> 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-05-22 09:11:54 UTC (rev 980) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-22 09:19:40 UTC (rev 981) @@ -39,13 +39,14 @@ import fr.ifremer.tutti.ui.swing.util.CloseableUI; import fr.ifremer.tutti.ui.swing.util.TuttiUI; 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 org.jdesktop.swingx.JXTable; -import javax.swing.*; -import java.awt.*; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.SwingUtilities; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -242,7 +243,7 @@ boolean viewMenuEnabled = false; if (gear != null) { editMenuEnabled = !getModel().isCreate() && !getModel().isModify() - && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); viewMenuEnabled = true; ui.setContextValue(gear); } @@ -271,14 +272,14 @@ // get the point in the middle lower of the cell Point p = new Point(r.x + r.width / 2, r.y + r.height); - List<Gear> gears = source.getSelectedValuesList(); + Gear[] gears = (Gear[]) source.getSelectedValues(); boolean editMenuEnabled = false; boolean viewMenuEnabled = false; - if (gears != null && gears.size() == 1) { - Gear gear = gears.get(0); + if (gears != null && gears.length == 1) { + Gear gear = gears[0]; editMenuEnabled = !getModel().isCreate() && !getModel().isModify() - && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); viewMenuEnabled = true; ui.setContextValue(gear); }

1 0

r980 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service resources/i18n
by tchemit＠users.forge.codelutin.com 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 11:11:54 +0200 (Wed, 22 May 2013) New Revision: 980 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/980 Log: add missing i18n Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-05-22 09:09:52 UTC (rev 979) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-05-22 09:11:54 UTC (rev 980) @@ -139,6 +139,7 @@ n_("tutti.property.protocol"); n_("tutti.property.label"); n_("tutti.property.name"); + n_("tutti.property.person"); n_("tutti.property.firstName"); n_("tutti.property.lastName"); n_("tutti.property.department"); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 09:09:52 UTC (rev 979) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 09:11:54 UTC (rev 980) @@ -34,6 +34,7 @@ tutti.property.multirigAggregation= tutti.property.name= tutti.property.parameterName= +tutti.property.person= tutti.property.program= tutti.property.protocol= tutti.property.refTaxCode= 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-05-22 09:09:52 UTC (rev 979) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 09:11:54 UTC (rev 980) @@ -32,6 +32,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=Protocole de saisie tutti.property.refTaxCode=Code RefTax

1 0

r979 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com 22 May '13

22 May '13

Author: kmorin Date: 2013-05-22 11:09:52 +0200 (Wed, 22 May 2013) New Revision: 979 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/979 Log: fixes #2485 [DONNEES] Les noms et pr?\195?\169noms des personnes sont invers?\195?\169s dans l'UI 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-05-22 08:42:35 UTC (rev 978) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-22 09:09:52 UTC (rev 979) @@ -905,8 +905,8 @@ protected Person loadPerson(Object[] source) { Person target = TuttiBeanFactory.newPerson(); target.setId(String.valueOf(source[0])); - target.setFirstName((String) source[1]); - target.setLastName((String) source[2]); + target.setLastName((String) source[1]); + target.setFirstName((String) source[2]); target.setDepartment((String) source[3]); setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); return target;

1 0

r978 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/util resources/i18n
by tchemit＠users.forge.codelutin.com 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 10:42:35 +0200 (Wed, 22 May 2013) New Revision: 978 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/978 Log: fixes #2473: [TECHN] Message indiquant que le serveur de MAJ n'est pas dispo possibilite d'utiliser du html dans les businessException messages Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.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/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-22 08:42:35 UTC (rev 978) @@ -57,11 +57,11 @@ public void showErrorDialog(String message, Throwable cause) { if (cause == null) { - JOptionPane.showMessageDialog(context.getMainUI(), message, + JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+message+"</body></html>", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else if (cause instanceof TuttiBusinessException) { - JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(), + JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+cause.getMessage()+"</body></html>", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-05-22 08:42:35 UTC (rev 978) @@ -357,9 +357,9 @@ public static void tryToConnectToUpdateUrl(String url, String i18nKey) { try { URLConnection urlConnection = new URL(url).openConnection(); - urlConnection.setConnectTimeout(5000); + urlConnection.setConnectTimeout(10000); urlConnection.connect(); - } catch (IOException e) { + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not connect to " + url, e); } 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-05-22 08:23:24 UTC (rev 977) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-22 08:42:35 UTC (rev 978) @@ -902,11 +902,11 @@ tutti.editSpeciesFrequencies.table.header.number=Nombre tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) tutti.editSpeciesFrequencies.title=Mensuration -tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) +tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url %s n'est pas joignable) tutti.error.errorpane.htmlmessage=<html><body>Une erreur s'est produite\: %s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur -tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url %s n'est pas joignable) +tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url %s n'est pas joignable) tutti.exportCruise.action.success=La campagne %s a été exportée dans le fichier %s. tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatra.action.success=Les captures ont correctement été exporté dans le fichier %s

1 0

r977 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch tutti-service/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 10:23:24 +0200 (Wed, 22 May 2013) New Revision: 977 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/977 Log: refs #2474: [TECHN] Gestion des logs : info trac?\195?\169es fixes #2457: [CAMPAGNE] Probl?\195?\168me changement de responsable de campagne non pris en compte fixes #2446: [CAMPAGNE] Le responsable salle de tri n'est pas sauvegard?\195?\169 fixes #2450: [TRAIT] Doublon en tant que saisisseur Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -116,8 +116,8 @@ target.setSpecies(species); entityToBenthosBatch(source, target); result.addChildren(target); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); } } } @@ -141,8 +141,8 @@ entityToBenthosBatch(source, target); result.addChildren(target); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); } } } @@ -388,8 +388,8 @@ BenthosBatch targetChild = TuttiBeanFactory.newBenthosBatch(); targetChild.setSpecies(target.getSpecies()); entityToBenthosBatch(sourceChild, targetChild); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -966,17 +966,18 @@ if (CollectionUtils.isNotEmpty(source.getRecorderPerson())) { for (Person person : source.getRecorderPerson()) { Integer personId = person.getIdAsInt(); - vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures(vesselPersonFeaturesMap, - personId, - target, - recorderPersonRole); + vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures( + vesselPersonFeaturesMap, + personId, + target, + recorderPersonRole); } } - if (fishingTrip.getVesselPersonFeatures() == null) { - fishingTrip.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet()); + if (target.getVesselPersonFeatures() == null) { + target.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet()); } - fishingTrip.getVesselPersonFeatures().clear(); - fishingTrip.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values()); + target.getVesselPersonFeatures().clear(); + target.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values()); // Comment target.setComments(source.getComment()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977) @@ -38,7 +38,6 @@ import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; @@ -430,8 +429,8 @@ SpeciesBatch targetChild = TuttiBeanFactory.newSpeciesBatch(); targetChild.setSpecies(target.getSpecies()); entityToSpeciesBatch(sourceChild, targetChild); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild); @@ -480,8 +479,6 @@ Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); - boolean createEntity = TuttiEntities.isNew(source); - Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977) @@ -24,14 +24,19 @@ * #L% */ +import fr.ifremer.adagio.core.dao.administration.user.Person; import fr.ifremer.adagio.core.dao.administration.user.PersonImpl; import fr.ifremer.adagio.core.dao.data.operation.FishingOperation; import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip; import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeatures; +import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeaturesDao; import fr.ifremer.adagio.core.dao.referential.VesselPersonRole; import fr.ifremer.adagio.core.dao.referential.VesselPersonRoleImpl; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Date; import java.util.Map; @@ -44,6 +49,13 @@ @Component("vesselPersonFeaturesPersistenceHelper") public class VesselPersonFeaturesPersistenceHelper extends AbstractPersistenceService { + /** Logger. */ + private static final Log log = + LogFactory.getLog(VesselPersonFeaturesPersistenceHelper.class); + + @Resource(name = "vesselPersonFeaturesDao") + protected VesselPersonFeaturesDao vesselPersonFeaturesDao; + public VesselPersonFeaturesPersistenceHelper() { } @@ -67,23 +79,30 @@ VesselPersonFeatures vesselPersonFeatures = vesselPersonFeaturesPerPerson.get(personId); if (vesselPersonFeatures == null) { + + PersonImpl person = load(PersonImpl.class, personId); + + if (log.isDebugEnabled()) { + log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname()); + } + vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance(); vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures); - } + vesselPersonFeatures.setPerson(person); - PersonImpl person = load(PersonImpl.class, personId); - vesselPersonFeatures.setFishingTrip(fishingTrip); - vesselPersonFeatures.setPerson(person); - vesselPersonFeatures.getVesselPersonRoles().add(role); + vesselPersonFeatures.setFishingTrip(fishingTrip); + vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime()); + vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime()); + vesselPersonFeatures.setVessel(fishingTrip.getVessel()); + vesselPersonFeatures.setProgram(fishingTrip.getProgram()); - vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime()); - vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime()); - vesselPersonFeatures.setVessel(fishingTrip.getVessel()); - vesselPersonFeatures.setProgram(fishingTrip.getProgram()); + vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate()); + vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag()); + vesselPersonFeatures.setRankOrder((short) 1); +// vesselPersonFeaturesDao.create(vesselPersonFeatures); + } - vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate()); - vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag()); - vesselPersonFeatures.setRankOrder((short) 1); + addRole(role, vesselPersonFeatures); } public void fillVesselPersonFeatures(Map<Integer, VesselPersonFeatures> vesselPersonFeaturesPerPerson, @@ -94,23 +113,45 @@ VesselPersonFeatures vesselPersonFeatures = vesselPersonFeaturesPerPerson.get(personId); if (vesselPersonFeatures == null) { + + PersonImpl person = load(PersonImpl.class, personId); + if (log.isDebugEnabled()) { + log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname()); + } + vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance(); vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures); + vesselPersonFeatures.setOperation(fishingOperation); + vesselPersonFeatures.setPerson(person); + vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime()); + vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime()); + vesselPersonFeatures.setVessel(fishingOperation.getVessel()); + vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram()); + + vesselPersonFeatures.setCreationDate(new Date()); + vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag()); + vesselPersonFeatures.setRankOrder((short) 1); +// vesselPersonFeaturesDao.create(vesselPersonFeatures); } - PersonImpl person = load(PersonImpl.class, personId); + addRole(role, vesselPersonFeatures); + } - vesselPersonFeatures.setOperation(fishingOperation); - vesselPersonFeatures.setPerson(person); - vesselPersonFeatures.getVesselPersonRoles().add(role); + protected void addRole(VesselPersonRole role, + VesselPersonFeatures vesselPersonFeatures) { + Person person = vesselPersonFeatures.getPerson(); + if (vesselPersonFeatures.getVesselPersonRoles().contains(role)) { + if (log.isWarnEnabled()) { + log.warn("vessel person feature for person: " + person.getId() + " with role: " + role.getName() + " already exist, do not add it twice."); + } + } else { - vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime()); - vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime()); - vesselPersonFeatures.setVessel(fishingOperation.getVessel()); - vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram()); + // add this new role + if (log.isInfoEnabled()) { + log.info("Add vessel person feature for person: " + person.getId() + " with role: " + role.getName()); + } + vesselPersonFeatures.getVesselPersonRoles().add(role); - vesselPersonFeatures.setCreationDate(new Date()); - vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag()); - vesselPersonFeatures.setRankOrder((short) 1); + } } } \ No newline at end of file Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977) @@ -505,8 +505,8 @@ params[3 * i + 2] = sortingQualitativeValueId; } SortingBatch result = catchBatchDao.getSortingBatch(childs, params); - if (result != null && debugMessage != null && log.isInfoEnabled()) { - log.info("Loaded " + debugMessage + ": " + result.getId()); + if (result != null && debugMessage != null && log.isDebugEnabled()) { + log.debug("Loaded " + debugMessage + ": " + result.getId()); } return result; } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:23:24 UTC (rev 977) @@ -75,6 +75,7 @@ tutti.service.exportCruise.exportMarineLitters= tutti.service.exportCruise.exportOperations= tutti.service.exportCruise.exportParameters= +tutti.service.exportCruise.exportSpecies= tutti.service.exportCruise.exportSurvey= tutti.service.exportSumatra.error.species.null= tutti.service.exportSumatra.error.station.null= 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-05-22 08:21:51 UTC (rev 976) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 08:23:24 UTC (rev 977) @@ -69,11 +69,11 @@ tutti.service.exportCruise.checkCruise=Vérification de la campagne %s tutti.service.exportCruise.exportAccidentalCatches=Export du fichier accidentalCatch.csv pour la campagne %s tutti.service.exportCruise.exportCatches=Export du fichier catch.csv pour la campagne %s -tutti.service.exportCruise.exportSpecies=Export du fichier species.csv pour la campagne %s tutti.service.exportCruise.exportIndividualObservations=Export du fichier individualObservation.csv pour la campagne %s tutti.service.exportCruise.exportMarineLitters=Export du fichier marineLitter.csv pour la campagne %s tutti.service.exportCruise.exportOperations=Export du fichier operations.csv pour la campagne %s tutti.service.exportCruise.exportParameters=Export du fichier parameters.csv pour la campagne %s +tutti.service.exportCruise.exportSpecies=Export du fichier species.csv pour la campagne %s tutti.service.exportCruise.exportSurvey=Export du fichier survey.csv pour la campagne %s tutti.service.exportSumatra.error.species.null=L'espèce est nulle tutti.service.exportSumatra.error.station.null=Le trait est nul

1 0

r976 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 22 May '13

22 May '13

Author: tchemit Date: 2013-05-22 10:21:51 +0200 (Wed, 22 May 2013) New Revision: 976 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/976 Log: fixes #2484: [CAMPAGNE] Changement du navire sur les op?\195?\169rations non n?\195?\169cessaire Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-21 17:12:55 UTC (rev 975) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976) @@ -51,7 +51,12 @@ import fr.ifremer.adagio.core.dao.referential.location.Location; import fr.ifremer.adagio.core.dao.referential.location.LocationDao; import fr.ifremer.adagio.core.dao.referential.location.LocationImpl; -import fr.ifremer.adagio.core.dao.referential.pmfm.*; +import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmDao; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; @@ -59,8 +64,14 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.persistence.entities.referential.*; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; +import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; @@ -72,7 +83,12 @@ import javax.annotation.Resource; import java.io.Serializable; import java.text.MessageFormat; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author tchemit <chemit(a)codelutin.com> @@ -282,16 +298,23 @@ ScientificCruise scientificCruise = scientificCruiseDao.load(Integer.valueOf(bean.getId())); if (scientificCruise == null) { - throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + bean.getId()); + throw new DataRetrievalFailureException( + "Could not retrieve cruise with id=" + bean.getId()); } - boolean vesselChanged = !bean.getVessel().equals(scientificCruise.getVessel()); + boolean vesselChanged = ObjectUtils.notEqual( + bean.getVessel().getId(), + scientificCruise.getVessel().getCode()); cruiseToEntity(bean, scientificCruise); scientificCruiseDao.update(scientificCruise); if (vesselChanged) { Vessel vessel = bean.getVessel(); + if (log.isInfoEnabled()) { + log.info("Change vessel to " + vessel.getId() + + " for cruise: " + bean.getId()); + } List<FishingOperation> operations = fishingOperationService.getAllFishingOperation(bean.getId()); List<FishingOperation> operationsToSave = Lists.newArrayList(); for (FishingOperation operation : operations) {

1 0

r975 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by kmorin＠users.forge.codelutin.com 21 May '13

21 May '13

Author: kmorin Date: 2013-05-21 19:12:55 +0200 (Tue, 21 May 2013) New Revision: 975 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/975 Log: fixes #2480 [ESPECES] Suppression d'un lot cat?\195?\169goris?\195?\169 : tous les lots du m?\195?\170me niveau sont supprim?\195?\169s Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-05-21 17:06:00 UTC (rev 974) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-05-21 17:12:55 UTC (rev 975) @@ -76,57 +76,41 @@ Preconditions.checkState(!TuttiEntities.isNew(selectedBatch), "Can't remove batch if batch is not persisted"); - if (!selectedBatch.isBatchRoot()) { + // remove selected batch and all his children - // remove all sub batches of his parent - BenthosBatchRowModel parentBatch = selectedBatch.getParentBatch(); + // remove parent batch (will destroy all his childs from db) + persistenceService.deleteBenthosBatch(selectedBatch.getId()); - // get parent row index - int parentIndex = tableModel.getRowIndex(parentBatch); - - // select it - table.setRowSelectionInterval(parentIndex, parentIndex); - - // remove all his children - TuttiActionHelper.runInternalAction(removeSpeciesSubBatchAction); - - } else { - - // remove selected batch and all his children - - // remove parent batch (will destroy all his childs from db) - persistenceService.deleteBenthosBatch(selectedBatch.getId()); - + if (selectedBatch.isBatchRoot()) { // update speciesUsed handler.removeFromSpeciesUsed(selectedBatch); + } - // collect of rows to remove from model - Set<BenthosBatchRowModel> rowToRemove = - Sets.newHashSet(selectedBatch); + // collect of rows to remove from model + Set<BenthosBatchRowModel> rowToRemove = + Sets.newHashSet(selectedBatch); - handler.collectChildren(selectedBatch, rowToRemove); + handler.collectChildren(selectedBatch, rowToRemove); - table.clearSelection(); + table.clearSelection(); - // remove all rows from the model - getModel().getRows().removeAll(rowToRemove); + // remove all rows from the model + getModel().getRows().removeAll(rowToRemove); - // refresh table from parent batch row index to the end - tableModel.fireTableDataChanged(); + // refresh table from parent batch row index to the end + tableModel.fireTableDataChanged(); - if (!getModel().getRows().isEmpty()) { + if (!getModel().getRows().isEmpty()) { - // select first row - AbstractSelectTableAction.doSelectCell(table, 0, 0); + // select first row + AbstractSelectTableAction.doSelectCell(table, 0, 0); - } + } - if (table.isEditing()) { + if (table.isEditing()) { - // but no edit it - table.getCellEditor().stopCellEditing(); - } - + // but no edit it + table.getCellEditor().stopCellEditing(); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-05-21 17:06:00 UTC (rev 974) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-05-21 17:12:55 UTC (rev 975) @@ -76,58 +76,43 @@ Preconditions.checkState(!TuttiEntities.isNew(selectedBatch), "Can't remove batch if batch is not persisted"); - if (!selectedBatch.isBatchRoot()) { + // remove selected batch and all his children - // remove all sub batches of his parent - SpeciesBatchRowModel parentBatch = selectedBatch.getParentBatch(); + // remove parent batch (will destroy all his childs from db) + persistenceService.deleteSpeciesBatch(selectedBatch.getId()); - // get parent row index - int parentIndex = tableModel.getRowIndex(parentBatch); - - // select it - table.setRowSelectionInterval(parentIndex, parentIndex); - - // remove all his children - TuttiActionHelper.runInternalAction(removeSpeciesSubBatchAction); - - } else { - - // remove selected batch and all his children - - // remove parent batch (will destroy all his childs from db) - persistenceService.deleteSpeciesBatch(selectedBatch.getId()); - + if (selectedBatch.isBatchRoot()) { // update speciesUsed handler.removeFromSpeciesUsed(selectedBatch); + } - // collect of rows to remove from model - Set<SpeciesBatchRowModel> rowToRemove = - Sets.newHashSet(selectedBatch); + // collect of rows to remove from model + Set<SpeciesBatchRowModel> rowToRemove = + Sets.newHashSet(selectedBatch); - handler.collectChildren(selectedBatch, rowToRemove); + handler.collectChildren(selectedBatch, rowToRemove); - table.clearSelection(); + table.clearSelection(); - // remove all rows from the model - getModel().getRows().removeAll(rowToRemove); + // remove all rows from the model + getModel().getRows().removeAll(rowToRemove); - // refresh table from parent batch row index to the end - tableModel.fireTableDataChanged(); + // refresh table from parent batch row index to the end + tableModel.fireTableDataChanged(); - if (!getModel().getRows().isEmpty()) { + if (!getModel().getRows().isEmpty()) { - // select first row - AbstractSelectTableAction.doSelectCell(table, 0, 0); + // select first row + AbstractSelectTableAction.doSelectCell(table, 0, 0); - } + } - if (table.isEditing()) { + if (table.isEditing()) { - // but no edit it - table.getCellEditor().stopCellEditing(); - } - + // but no edit it + table.getCellEditor().stopCellEditing(); } + } }

1 0

r974 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by kmorin＠users.forge.codelutin.com 21 May '13

21 May '13

Author: kmorin Date: 2013-05-21 19:06:00 +0200 (Tue, 21 May 2013) New Revision: 974 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/974 Log: fixes #2472 [MENSURATIONS] ajouter somme des individus et des poids saisis Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-21 17:06:00 UTC (rev 974) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue May 07 16:11:30 CEST 2013 +#Tue May 21 18:54:28 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -86,6 +86,8 @@ tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields +tutti.editBenthosFrequencies.field.totalNumber.help= +tutti.editBenthosFrequencies.field.totalWeight.help= tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions @@ -232,6 +234,8 @@ tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.totalNumber.help= +tutti.editSpeciesFrequencies.field.totalWeight.help= tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.deleteFishingOperation.help= tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-21 17:06:00 UTC (rev 974) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue May 07 16:11:30 CEST 2013 +#Tue May 21 18:54:28 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -86,6 +86,8 @@ tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields +tutti.editBenthosFrequencies.field.totalNumber.help= +tutti.editBenthosFrequencies.field.totalWeight.help= tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions @@ -232,6 +234,8 @@ tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.totalNumber.help= +tutti.editSpeciesFrequencies.field.totalWeight.help= tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html tutti.fishingOperations.action.deleteFishingOperation.help= tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-05-21 17:06:00 UTC (rev 974) @@ -72,8 +72,37 @@ numberPattern: {DECIMAL1_PATTERN}; bean: {model}; enabled: {!model.isSimpleCountingMode()}; + _selectOnFocus: true; } +#totalNumberLabel { + text: "tutti.editBenthosFrequencies.field.totalNumber"; + toolTipText: "tutti.editBenthosFrequencies.field.totalNumber.tip"; + labelFor: {totalNumberField}; + enabled: {!model.isSimpleCountingMode()}; + _help: {"tutti.editBenthosFrequencies.field.totalNumber.help"}; +} + +#totalNumberField { + text: {getStringValue(model.getTotalNumber())}; + enabled: false; + _computed: true; +} + +#totalWeightLabel { + text: "tutti.editBenthosFrequencies.field.totalWeight"; + toolTipText: "tutti.editBenthosFrequencies.field.totalWeight.tip"; + labelFor: {totalWeightField}; + enabled: {model.getTotalWeight() != null}; + _help: {"tutti.editBenthosFrequencies.field.totalWeight.help"}; +} + +#totalWeightField { + text: {getStringValue(model.getTotalWeight())}; + enabled: false; + _computed: true; +} + #lengthStepCaracteristicLabel { text: "tutti.editBenthosFrequencies.field.lengthStepCaracteristic"; toolTipText: "tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-05-21 17:06:00 UTC (rev 974) @@ -196,7 +196,7 @@ <cell anchor='west'> <JLabel id='lengthStepCaracteristicLabel'/> </cell> - <cell weightx='1.0'> + <cell weightx='1.0' columns='5'> <BeanFilterableComboBox id='lengthStepCaracteristicComboBox' constructorParams='this' genericType='Caracteristic'/> @@ -210,6 +210,18 @@ <cell weightx='1.0'> <NumberEditor id='stepField' constructorParams='this'/> </cell> + <cell anchor='west'> + <JLabel id='totalNumberLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='totalNumberField'/> + </cell> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='totalWeightField'/> + </cell> </row> </Table> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-21 17:06:00 UTC (rev 974) @@ -133,12 +133,27 @@ // the other ones do not need to have a weight to be valid recomputeAllRows = withWeightRows.isEmpty(); } - if (recomputeAllRows) { - List<BenthosFrequencyRowModel> rows = getModel().getRows(); - for (BenthosFrequencyRowModel r : rows) { + + + List<BenthosFrequencyRowModel> rows = getModel().getRows(); + Integer totalNumber = 0; + Float totalWeight = 0f; + for (BenthosFrequencyRowModel r : rows) { + if (recomputeAllRows) { recomputeRowValidState(r); } - } else { + if (r.isValid()) { + totalNumber += r.getNumber(); + Float weight = r.getWeight(); + if (weight != null) { + totalWeight += weight; + } + } + } + getModel().setTotalNumber(totalNumber); + getModel().setTotalWeight(totalWeight); + + if (!recomputeAllRows) { recomputeRowValidState(row); } } @@ -427,6 +442,7 @@ tableModel.addNewRow(rowIndex, row); } + model.setTotalNumber(model.getTotalNumber() + 1); getTable().scrollRowToVisible(rowIndex); } @@ -434,6 +450,10 @@ public void editBatch(BenthosBatchRowModel speciesBatch, BenthosFrequencyCellComponent.FrequencyCellEditor editor) { withWeightRows.clear(); + BenthosFrequencyUIModel model = getModel(); + model.setTotalNumber(null); + model.setTotalWeight(null); + frequencyEditor = editor; Caracteristic lengthStepCaracteristic = null; @@ -450,6 +470,9 @@ if (CollectionUtils.isNotEmpty(frequency)) { + Integer totalNumber = 0; + Float totalWeight = 0f; + BenthosFrequencyTableModel tableModel = getTableModel(); for (BenthosFrequencyRowModel rowModel : frequency) { @@ -463,8 +486,14 @@ if (newRow.getWeight() != null) { withWeightRows.add(newRow); + totalWeight += newRow.getWeight(); + } else { + totalWeight = null; } + totalNumber += newRow.getNumber(); } + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); // use first frequency row length step caracteristics @@ -511,8 +540,6 @@ editFrequency.size() + " frequency"); } - BenthosFrequencyUIModel model = getModel(); - BenthosFrequencyUIModel.ConfigurationMode mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE; if (lengthStepCaracteristic == null && protocol != null) { Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); @@ -521,9 +548,10 @@ mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; } } - if (speciesBatch.getNumber() != null && editFrequency.isEmpty()) { + Integer number = speciesBatch.getNumber(); + if (number != null && editFrequency.isEmpty()) { mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; - model.setSimpleCount(speciesBatch.getNumber()); + model.setSimpleCount(number); } model.setConfigurationMode(mode); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-05-21 17:06:00 UTC (rev 974) @@ -61,6 +61,10 @@ public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; + + public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static enum ConfigurationMode { SIMPLE, AUTO_GEN, @@ -117,6 +121,18 @@ */ protected Integer simpleCount; + /** + * Sum of the number of each valid row + * @since 2.3 + */ + protected Integer totalNumber; + + /** + * Sum of the weight of each valid row + * @since 2.3 + */ + protected Float totalWeight; + public BenthosFrequencyUIModel() { super(SpeciesBatchRowModel.class, null, null); } @@ -225,20 +241,26 @@ return result; } - public boolean isOneRowValid() { - boolean result = getRowCount() > 0; - if (result) { - result = false; - for (BenthosFrequencyRowModel row : rows) { - if (row.isValid()) { - result = true; - break; - } - } - } - return result; + public Integer getTotalNumber() { + return totalNumber; } + public void setTotalNumber(Integer totalNumber) { + Object oldValue = getTotalNumber(); + this.totalNumber = totalNumber; + firePropertyChange(PROPERTY_TOTAL_NUMBER, oldValue, totalNumber); + } + + public Float getTotalWeight() { + return totalWeight; + } + + public void setTotalWeight(Float totalWeight) { + Object oldValue = getTotalWeight(); + this.totalWeight = totalWeight; + firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); + } + @Override protected SpeciesBatchRowModel newEntity() { return new SpeciesBatchRowModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-05-21 17:06:00 UTC (rev 974) @@ -72,8 +72,37 @@ numberPattern: {DECIMAL1_PATTERN}; bean: {model}; enabled: {!model.isSimpleCountingMode()}; + _selectOnFocus: true; } +#totalNumberLabel { + text: "tutti.editSpeciesFrequencies.field.totalNumber"; + toolTipText: "tutti.editSpeciesFrequencies.field.totalNumber.tip"; + labelFor: {totalNumberField}; + enabled: {!model.isSimpleCountingMode()}; + _help: {"tutti.editSpeciesFrequencies.field.totalNumber.help"}; +} + +#totalNumberField { + text: {getStringValue(model.getTotalNumber())}; + enabled: false; + _computed: true; +} + +#totalWeightLabel { + text: "tutti.editSpeciesFrequencies.field.totalWeight"; + toolTipText: "tutti.editSpeciesFrequencies.field.totalWeight.tip"; + labelFor: {totalWeightField}; + enabled: {model.getTotalWeight() != null}; + _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; +} + +#totalWeightField { + text: {getStringValue(model.getTotalWeight())}; + enabled: false; + _computed: true; +} + #lengthStepCaracteristicLabel { text: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic"; toolTipText: "tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-05-21 17:06:00 UTC (rev 974) @@ -196,7 +196,7 @@ <cell anchor='west'> <JLabel id='lengthStepCaracteristicLabel'/> </cell> - <cell weightx='1.0'> + <cell weightx='1.0' columns='5'> <BeanFilterableComboBox id='lengthStepCaracteristicComboBox' constructorParams='this' genericType='Caracteristic'/> @@ -210,6 +210,18 @@ <cell weightx='1.0'> <NumberEditor id='stepField' constructorParams='this'/> </cell> + <cell anchor='west'> + <JLabel id='totalNumberLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='totalNumberField'/> + </cell> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <JTextField id='totalWeightField'/> + </cell> </row> </Table> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 17:06:00 UTC (rev 974) @@ -38,10 +38,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; -import fr.ifremer.tutti.ui.swing.util.Cancelable; -import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -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.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -134,12 +131,26 @@ // the other ones do not need to have a weight to be valid recomputeAllRows = withWeightRows.isEmpty(); } - if (recomputeAllRows) { - List<SpeciesFrequencyRowModel> rows = getModel().getRows(); - for (SpeciesFrequencyRowModel r : rows) { + + List<SpeciesFrequencyRowModel> rows = getModel().getRows(); + Integer totalNumber = 0; + Float totalWeight = 0f; + for (SpeciesFrequencyRowModel r : rows) { + if (recomputeAllRows) { recomputeRowValidState(r); } - } else { + if (r.isValid()) { + totalNumber += r.getNumber(); + Float weight = r.getWeight(); + if (weight != null) { + totalWeight += weight; + } + } + } + getModel().setTotalNumber(totalNumber); + getModel().setTotalWeight(totalWeight); + + if (!recomputeAllRows) { recomputeRowValidState(row); } } @@ -428,6 +439,7 @@ tableModel.addNewRow(rowIndex, row); } + model.setTotalNumber(model.getTotalNumber() + 1); getTable().scrollRowToVisible(rowIndex); } @@ -435,6 +447,10 @@ public void editBatch(SpeciesBatchRowModel speciesBatch, FrequencyCellEditor editor) { withWeightRows.clear(); + SpeciesFrequencyUIModel model = getModel(); + model.setTotalNumber(null); + model.setTotalWeight(null); + frequencyEditor = editor; Caracteristic lengthStepCaracteristic = null; @@ -451,6 +467,9 @@ if (CollectionUtils.isNotEmpty(frequency)) { + Integer totalNumber = 0; + Float totalWeight = 0f; + SpeciesFrequencyTableModel tableModel = getTableModel(); for (SpeciesFrequencyRowModel rowModel : frequency) { @@ -464,8 +483,15 @@ if (newRow.getWeight() != null) { withWeightRows.add(newRow); + totalWeight += newRow.getWeight(); + + } else { + totalWeight = null; } + totalNumber += newRow.getNumber(); } + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); // use first frequency row length step caracteristics @@ -512,8 +538,6 @@ editFrequency.size() + " frequency"); } - SpeciesFrequencyUIModel model = getModel(); - SpeciesFrequencyUIModel.ConfigurationMode mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE; if (lengthStepCaracteristic == null && protocol != null) { Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); @@ -522,9 +546,10 @@ mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; } } - if (speciesBatch.getNumber() != null && editFrequency.isEmpty()) { + Integer number = speciesBatch.getNumber(); + if (number != null && editFrequency.isEmpty()) { mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; - model.setSimpleCount(speciesBatch.getNumber()); + model.setSimpleCount(number); } model.setConfigurationMode(mode); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-05-21 17:06:00 UTC (rev 974) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; +import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.util.List; @@ -62,6 +63,10 @@ public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; + + public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static enum ConfigurationMode { SIMPLE, AUTO_GEN, @@ -112,6 +117,18 @@ protected Caracteristic lengthStepCaracteristic; /** + * Sum of the number of each valid row + * @since 2.3 + */ + protected Integer totalNumber; + + /** + * Sum of the weight of each valid row + * @since 2.3 + */ + protected Float totalWeight; + + /** * Number in case of simple counting mode * * @since 1.0 @@ -226,25 +243,26 @@ return result; } - public boolean isOneRowValid() { - boolean result = getRowCount() > 0; - if (result) { - result = false; - for (SpeciesFrequencyRowModel row : rows) { - if (row.isValid()) { - result = true; - break; - } - } - } - return result; + public Integer getTotalNumber() { + return totalNumber; } - // method with an argument for the binding - public boolean isOneRowValid(List<SpeciesFrequencyRowModel> frequencies) { - return isOneRowValid(); + public void setTotalNumber(Integer totalNumber) { + Object oldValue = getTotalNumber(); + this.totalNumber = totalNumber; + firePropertyChange(PROPERTY_TOTAL_NUMBER, oldValue, totalNumber); } + public Float getTotalWeight() { + return totalWeight; + } + + public void setTotalWeight(Float totalWeight) { + Object oldValue = getTotalWeight(); + this.totalWeight = totalWeight; + firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); + } + @Override protected SpeciesBatchRowModel newEntity() { return new SpeciesBatchRowModel(); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-21 17:06:00 UTC (rev 974) @@ -404,6 +404,10 @@ tutti.editBenthosFrequencies.field.simpleCounting.tip= tutti.editBenthosFrequencies.field.step= tutti.editBenthosFrequencies.field.step.tip= +tutti.editBenthosFrequencies.field.totalNumber= +tutti.editBenthosFrequencies.field.totalNumber.tip= +tutti.editBenthosFrequencies.field.totalWeight= +tutti.editBenthosFrequencies.field.totalWeight.tip= tutti.editBenthosFrequencies.label.no.configuration= tutti.editBenthosFrequencies.simpleCountingAndFrequencies= tutti.editBenthosFrequencies.title= @@ -924,6 +928,10 @@ tutti.editSpeciesFrequencies.field.simpleCounting.tip= tutti.editSpeciesFrequencies.field.step= tutti.editSpeciesFrequencies.field.step.tip= +tutti.editSpeciesFrequencies.field.totalNumber= +tutti.editSpeciesFrequencies.field.totalNumber.tip= +tutti.editSpeciesFrequencies.field.totalWeight= +tutti.editSpeciesFrequencies.field.totalWeight.tip= tutti.editSpeciesFrequencies.label.no.configuration= tutti.editSpeciesFrequencies.simpleCountingAndFrequencies= tutti.editSpeciesFrequencies.table.header.lengthStep= 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-05-21 15:44:35 UTC (rev 973) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-21 17:06:00 UTC (rev 974) @@ -398,6 +398,10 @@ tutti.editBenthosFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editBenthosFrequencies.field.step=Pas de la classe de taille tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) +tutti.editBenthosFrequencies.field.totalNumber=Nombre total +tutti.editBenthosFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides +tutti.editBenthosFrequencies.field.totalWeight=Poids total +tutti.editBenthosFrequencies.field.totalWeight.tip=Poids total des lignes valides tutti.editBenthosFrequencies.label.no.configuration=< Pas de configuration > tutti.editBenthosFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editBenthosFrequencies.title=Mensuration @@ -888,6 +892,10 @@ tutti.editSpeciesFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille tutti.editSpeciesFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) +tutti.editSpeciesFrequencies.field.totalNumber=Nombre total +tutti.editSpeciesFrequencies.field.totalNumber.tip=Nombre total d'individus des lignes valides +tutti.editSpeciesFrequencies.field.totalWeight=Poids total +tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > tutti.editSpeciesFrequencies.simpleCountingAndFrequencies=Des mensurations ont été saisies dans le tableau. Saisir un simple dénombrement les effacera. tutti.editSpeciesFrequencies.table.header.lengthStep=Classe de taille

1 0

r973 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin＠users.forge.codelutin.com 21 May '13

21 May '13

Author: kmorin Date: 2013-05-21 17:44:35 +0200 (Tue, 21 May 2013) New Revision: 973 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/973 Log: fixes #2467 [MESNURATIONS] Indication de la ligne active Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-21 15:43:00 UTC (rev 972) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-21 15:44:35 UTC (rev 973) @@ -40,6 +40,7 @@ import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -47,6 +48,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import javax.swing.*; @@ -296,6 +299,20 @@ } @Override + protected void addHighlighters(JXTable table) { + super.addHighlighters(table); + + // highlight only the lengthstep column if the row is selected + Highlighter selectedHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.AndHighlightPredicate( + HighlightPredicate.IS_SELECTED, + new HighlightPredicate.IdentifierHighlightPredicate(BenthosFrequencyTableModel.LENGTH_STEP)), + UIManager.getColor("Table[Enabled+Selected].textBackground")); + + table.addHighlighter(selectedHighlighter); + } + + @Override protected JComponent getComponentToFocus() { return getUI().getLengthStepCaracteristicComboBox(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 15:43:00 UTC (rev 972) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 15:44:35 UTC (rev 973) @@ -29,7 +29,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -38,7 +37,6 @@ 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.species.SpeciesBatchRowModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -304,7 +302,8 @@ @Override protected void addHighlighters(JXTable table) { super.addHighlighters(table); - // highlight only the species column if the row is selected + + // highlight only the lengthstep column if the row is selected Highlighter selectedHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( HighlightPredicate.IS_SELECTED,

1 0

r972 - in trunk: tutti-service/src/test/java/fr/ifremer/tutti/service tutti-service/src/test/java/fr/ifremer/tutti/service/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency
by kmorin＠users.forge.codelutin.com 21 May '13

21 May '13

Author: kmorin Date: 2013-05-21 17:43:00 +0200 (Tue, 21 May 2013) New Revision: 972 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/972 Log: fixes #2467 [MESNURATIONS] Indication de la ligne active Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java (rev 0) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-21 15:43:00 UTC (rev 972) @@ -0,0 +1,8 @@ +package fr.ifremer.tutti.service.catches; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since x.x + */ +public class TuttiWeightComputingServiceTest { +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-21 14:58:05 UTC (rev 971) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-21 15:43:00 UTC (rev 972) @@ -131,9 +131,6 @@ // add new row to cache Float lengthStep = newValue.getLengthStep(); - Preconditions.checkNotNull(lengthStep, - "can't add a null lengthStep row"); - float roundLenghtValue = uiModel.getLengthStep(lengthStep); if (!rowCache.containsKey(roundLenghtValue)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 14:58:05 UTC (rev 971) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 15:43:00 UTC (rev 972) @@ -38,10 +38,12 @@ 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.species.SpeciesBatchRowModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -49,10 +51,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JComponent; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -299,6 +302,19 @@ } @Override + protected void addHighlighters(JXTable table) { + super.addHighlighters(table); + // highlight only the species column if the row is selected + Highlighter selectedHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.AndHighlightPredicate( + HighlightPredicate.IS_SELECTED, + new HighlightPredicate.IdentifierHighlightPredicate(SpeciesFrequencyTableModel.LENGTH_STEP)), + UIManager.getColor("Table[Enabled+Selected].textBackground")); + + table.addHighlighter(selectedHighlighter); + } + + @Override protected JComponent getComponentToFocus() { return getUI().getLengthStepCaracteristicComboBox(); }

1 0