Author: tchemit Date: 2013-10-03 10:27:10 +0200 (Thu, 03 Oct 2013) New Revision: 1269 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1269 Log: fixes #3419: [CAPTURES] Impossible de saisir des mensurations si pas de protocole renseign?\195?\169 improve logs Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 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/individualobservation/create/CreateIndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 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-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -73,6 +73,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.AllFileSelector; import org.apache.commons.vfs2.FileObject; +import org.nuiton.util.TimeLog; import org.nuiton.util.Version; import java.io.File; @@ -534,11 +535,15 @@ return null; } + public static final TimeLog TIME_LOG = new TimeLog(PersistenceService.class); + @Override public void init() { - if (log.isInfoEnabled()) { - log.info("Open persistence service"); + long t0 = TimeLog.getTime(); + + if (log.isDebugEnabled()) { + log.debug("Opening persistence service..."); } TuttiServiceConfig serviceConfig = context.getConfig(); @@ -562,25 +567,33 @@ driver.init(); } - if (log.isInfoEnabled()) { - log.info("Persistence driver *" + - driver.getImplementationName() + "* opened."); - } +// if (log.isInfoEnabled()) { +// log.info("Persistence driver *" + +// driver.getImplementationName() + "* opened."); +// } + + TIME_LOG.log(t0,"Persistence driver *" + + driver.getImplementationName() + "* opened."); } @Override public void close() throws IOException { - if (log.isInfoEnabled()) { - log.info("Close persistence Service"); + long t0 = TimeLog.getTime(); + + if (log.isDebugEnabled()) { + log.debug("Closing persistence Service..."); } IOUtils.closeQuietly(driver); - if (log.isInfoEnabled()) { - log.info("Persistence driver *" + - driver.getImplementationName() + "* closed."); - } +// if (log.isInfoEnabled()) { +// log.info("Persistence driver *" + +// driver.getImplementationName() + "* closed."); +// } + + TIME_LOG.log(t0,"Persistence driver *" + + driver.getImplementationName() + "* closed."); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -601,22 +601,22 @@ } } - protected String buildReminderLabelTitle(Species species, - Iterable<SampleCategory<?>> categories, - String prefix, - String suffix) { - StringBuilder title = new StringBuilder(prefix); - - title.append(" - [").append(decorate(species)).append("]"); - - for (SampleCategory<?> sampleCategory : categories) { - if (sampleCategory.getCategoryValue() != null) { - title.append(" - "); - title.append(decorate(sampleCategory.getCategoryValue())); - } - } - - title.append(" - ").append(suffix); - return title.toString(); - } +// public String buildReminderLabelTitle(Species species, +// Iterable<SampleCategory<?>> categories, +// String prefix, +// String suffix) { +// StringBuilder title = new StringBuilder(prefix); +// +// title.append(" - [").append(decorate(species)).append("]"); +// +// for (SampleCategory<?> sampleCategory : categories) { +// if (sampleCategory.getCategoryValue() != null) { +// title.append(" - "); +// title.append(decorate(sampleCategory.getCategoryValue())); +// } +// } +// +// title.append(" - ").append(suffix); +// return title.toString(); +// } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -41,6 +41,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; @@ -59,7 +60,6 @@ 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.service.WeightUnit; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; @@ -356,14 +356,17 @@ if (rowMonitor.wasModified()) { // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + row + " was modified, will save it"); + if (log.isDebugEnabled()) { + log.debug("Row " + row + " was modified, will save it"); } - showInformationMessage( - "[ Captures - Benthos ] " + - "Sauvegarde des modifications de " + row + '.'); + String title = buildReminderLabelTitle(row.getSpecies(), + row, + "Sauvegarde du lot Capture - Benthos : ", + "Ligne :" + getTableModel().getRowIndex(row)); + showInformationMessage(title); + rowMonitor.setBean(null); saveRow(row); rowMonitor.setBean(row); @@ -1398,16 +1401,16 @@ parentBatchId = batchParent.getId(); } - if (log.isInfoEnabled()) { - log.info("Persist new species batch with parentId: " + - parentBatchId); + if (log.isDebugEnabled()) { + log.debug("Persist new species batch with parentId: " + + parentBatchId); } entityToSave = persistenceService.createBenthosBatch(entityToSave, parentBatchId); row.setId(entityToSave.getId()); } else { - if (log.isInfoEnabled()) { - log.info("Persist existing species batch: " + entityToSave.getId() + " (parent : " + entityToSave.getParentBatch() + ")"); + if (log.isDebugEnabled()) { + log.debug("Persist existing species batch: " + entityToSave.getId() + " (parent : " + entityToSave.getParentBatch() + ")"); } persistenceService.saveBenthosBatch(entityToSave); } @@ -1419,8 +1422,8 @@ frequencyRows, entityToSave); - if (log.isInfoEnabled()) { - log.info("Will save " + frequency.size() + " frequencies."); + if (log.isDebugEnabled()) { + log.debug("Will save " + frequency.size() + " frequencies."); } frequency = persistenceService.saveBenthosBatchFrequency( entityToSave.getId(), frequency); 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-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -227,20 +227,10 @@ if (context.isProtocolFilled()) { -// // get loaded protocol -// protocol = getDataContext().getProtocol(); -// Preconditions.checkNotNull(protocol, -// "Could not find protocol in ui context"); - // FIXME 20130128 kmorin: the species have no technical id speciesProtocol = getContext().getPersistenceService().toBenthosProtocolMap(); -// speciesProtocol = Maps.newHashMap(); -// for (SpeciesProtocol sp : protocol.getBenthos()) { -// speciesProtocol.put(sp.getSpeciesReferenceTaxonId(), sp); -// } - } else { speciesProtocol = Maps.newHashMap(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-10-03 08:27:10 UTC (rev 1269) @@ -59,7 +59,6 @@ #individualObservationWeightField { property: weight; model: {model.getWeight()}; - /*numberPattern: {DECIMAL3_PATTERN};*/ } #individualObservationSizeLabel { @@ -72,7 +71,6 @@ #individualObservationSizeField { property: size; model: {model.getSize()}; - /*numberPattern: {DECIMAL3_PATTERN};*/ } #individualObservationLengthStepCaracteristicLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-10-03 08:27:10 UTC (rev 1269) @@ -86,7 +86,6 @@ #marineLitterWeightField { property: weight; model: {model.getWeight()}; - /*numberPattern: {DECIMAL3_PATTERN};*/ } #saveAndContinueButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -41,6 +41,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; @@ -58,7 +59,6 @@ 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.service.WeightUnit; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; @@ -359,14 +359,17 @@ if (rowMonitor.wasModified()) { // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + row + " was modified, will save it"); + if (log.isDebugEnabled()) { + log.debug("Row " + row + " was modified, will save it"); } - showInformationMessage( - "[ Captures - Espèces ] " + - "Sauvegarde des modifications de " + row + '.'); + String title = buildReminderLabelTitle(row.getSpecies(), + row, + "Sauvegarde des modifications du lot Capture - Espèces : ", + "Ligne :" + getTableModel().getRowIndex(row)); + showInformationMessage(title); + rowMonitor.setBean(null); saveRow(row); rowMonitor.setBean(row); @@ -1413,16 +1416,16 @@ parentBatchId = parent.getId(); } - if (log.isInfoEnabled()) { - log.info("Persist new species batch with parentId: " + - parentBatchId); + if (log.isDebugEnabled()) { + log.debug("Persist new species batch with parentId: " + + parentBatchId); } catchBean = persistenceService.createSpeciesBatch(catchBean, parentBatchId); row.setId(catchBean.getId()); } else { - if (log.isInfoEnabled()) { - log.info("Persist existing species batch: " + catchBean.getId() + " (parent : " + catchBean.getParentBatch() + ")"); + if (log.isDebugEnabled()) { + log.debug("Persist existing species batch: " + catchBean.getId() + " (parent : " + catchBean.getParentBatch() + ")"); } persistenceService.saveSpeciesBatch(catchBean); } @@ -1434,8 +1437,8 @@ frequencyRows, catchBean); - if (log.isInfoEnabled()) { - log.info("Will save " + frequency.size() + " frequencies."); + if (log.isDebugEnabled()) { + log.debug("Will save " + frequency.size() + " frequencies."); } frequency = persistenceService.saveSpeciesBatchFrequency( catchBean.getId(), frequency); 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-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Lists; +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.SampleCategoryModel; @@ -224,18 +225,11 @@ if (context.isProtocolFilled()) { -// // get loaded protocol -// protocol = getDataContext().getProtocol(); -// Preconditions.checkNotNull(protocol, -// "Could not find protocol in ui context"); - // FIXME 20130128 kmorin: the species have no technical id speciesProtocol = persistenceService.toSpeciesProtocolMap(); -// speciesProtocol = Maps.newHashMap(); -// for (SpeciesProtocol sp : protocol.getSpecies()) { -// speciesProtocol.put(sp.getSpeciesReferenceTaxonId(), sp); -// } + } else { + speciesProtocol = Maps.newHashMap(); } Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-10-02 23:39:48 UTC (rev 1268) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-10-03 08:27:10 UTC (rev 1269) @@ -29,6 +29,8 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.persistence.entities.TuttiEntity; +import fr.ifremer.tutti.persistence.entities.data.SampleCategory; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.WeightUnit; @@ -1136,4 +1138,22 @@ } + protected String buildReminderLabelTitle(Species species, + Iterable<SampleCategory<?>> categories, + String prefix, + String suffix) { + StringBuilder title = new StringBuilder(prefix); + + title.append(" - [").append(decorate(species)).append("]"); + + for (SampleCategory<?> sampleCategory : categories) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(suffix); + return title.toString(); + } }