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

r991 - in trunk/tutti-ui-swing/src: license main/filtered-resources main/java/fr/ifremer/tutti/ui/swing/content/operation/catches main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/sp
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 13:28:29 +0200 (Thu, 23 May 2013) New Revision: 991 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/991 Log: fixes #2489: [IMPORT PUPITRI] lien ?\195?\160 mettre sur un autre onglet fix missing svn properties + license header Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java Removed: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 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/AbstractExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.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/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-05-23 11:28:29 UTC (rev 991) @@ -5,10 +5,13 @@ # - Affero General Public License (AGPL) # - Apache License # - BSD License +# - BSD-style license # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 +# - GNU Affero General Public License v3 # - GNU General Public License - Version 2 with the class path exception +# - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License @@ -25,11 +28,12 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 16 20:56:57 CEST 2013 +#Thu May 23 12:15:03 CEST 2013 antlr--antlr--2.7.6=BSD License commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=Common Development and Distribution License (CDDL) v1.0 org.andromda--andromda-core--3.3.1=BSD License org.andromda--andromda-utils--3.3.1=BSD License 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-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-23 11:28:29 UTC (rev 991) @@ -91,7 +91,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tutti.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions +tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields 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-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-23 11:28:29 UTC (rev 991) @@ -91,7 +91,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tutti.editCatchBatch.action.importPupitri.help=editCatchBatch.html\#actions +tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.service.DecoratorService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-05-23 11:28:29 UTC (rev 991) @@ -316,15 +316,6 @@ border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.individualObservation"))}; } -#importPupitriButton { - actionIcon: pupitri-import; - text: "tutti.editCatchBatch.action.importPupitri"; - toolTipText: "tutti.editCatchBatch.action.importPupitri.tip"; - i18nMnemonic: "tutti.editCatchBatch.action.importPupitri.mnemonic"; - _tuttiAction: {ImportPupitriAction.class}; - _help: {"tutti.editCatchBatch.action.importPupitri.help"}; -} - #saveButton { actionIcon: save; text: "tutti.editCatchBatch.action.saveCatchBatch"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-05-23 11:28:29 UTC (rev 991) @@ -112,7 +112,6 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.editCatchBatch.help"'/> <JToolBar id='catchesCaracteristicsTabToolBar'> - <JButton id='importPupitriButton'/> <ButtonAttachment id='catchesCaracteristicsAttachmentsButton' constructorParams='getHandler().getContext(), getModel()'/> </JToolBar> Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,143 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.operation.catches; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; -import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JOptionPane; -import java.io.File; - -import static org.nuiton.i18n.I18n._; - -/** - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0 - */ -public class ImportPupitriAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { - - private Log log = LogFactory.getLog(ImportPupitriAction.class); - - protected File importedTrunkFile; - - protected File importedCarrouselFile; - - protected ImportPupitriPopupUI importPupitriDialog; - - protected TuttiProtocol currentProtocol; - - protected PersistenceService persistenceService; - - protected EditFishingOperationAction editAction; - - public ImportPupitriAction(EditCatchesUIHandler handler) { - super(handler, false); - persistenceService = getContext().getPersistenceService(); - importPupitriDialog = new ImportPupitriPopupUI(handler.getContext()); - } - - public EditFishingOperationAction getEditAction() { - if (editAction == null) { - editAction = TuttiActionHelper.createLogicAction(getHandler().getParentHandler(), - EditFishingOperationAction.class); - } - return editAction; - } - - @Override - protected boolean prepareAction() throws Exception { - boolean result = true; - currentProtocol = getDataContext().getProtocol(); - - SpeciesBatchUIModel speciesBatchUIModel = getUI().getSpeciesTabContent().getModel(); - if (speciesBatchUIModel.getRowCount() > 0) { - String htmlMessage = String.format( - AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.importPupitri.existingData.message"), - _("tutti.editCatchBatch.action.importPupitri.existingData.help")); - - int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - htmlMessage, - _("tutti.editCatchBatch.action.importPupitri.existingData.title"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.WARNING_MESSAGE); - - result = answer == JOptionPane.OK_OPTION; - } - - if (result) { - importPupitriDialog.open(); - importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); - importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); - result = importedTrunkFile != null - && importedCarrouselFile != null; - } - - return result; - } - - @Override - protected void doAction() throws Exception { - TuttiPupitriImportExportService pupitriImportExportService = - getContext().getTuttiPupitriImportExportService(); - - EditCatchesUIModel model = getModel(); - - FishingOperation operation = model.getFishingOperation(); - CatchBatch catchBatch = model.getCatchBatch(); - - // import - int rejectedSpeciesNb = - pupitriImportExportService.importPupitri(importedTrunkFile, - importedCarrouselFile, - operation, - catchBatch); - - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); - - sendMessage(_("tutti.editCatchBatch.action.importPupitri.success", getUI().getSpeciesTabContent().getModel().getRootNumber(), rejectedSpeciesNb)); - } - - @Override - protected void releaseAction() { - super.releaseAction(); - importedTrunkFile = null; - importedCarrouselFile = null; - currentProtocol = null; - } - -} Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.css 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.css 2013-05-23 11:28:29 UTC (rev 991) @@ -1,67 +0,0 @@ -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% -*/ - -#importPupitriDialog { - modal: true; - title: "tutti.importPupitri.title"; -} - -#trunkFileLabel { - text: "tutti.importPupitri.field.trunkFile"; - labelFor: {trunkFile}; -} - -#trunkFile { - directoryEnabled: false; - exts: {_("tutti.importPupitri.trunkFile.extension")}; - extsDescription: {_("tutti.importPupitri.trunkFile.extension.description")}; - acceptAllFileFilterUsed: false; -} - -#carrouselFileLabel { - text: "tutti.importPupitri.field.carrouselFile"; - labelFor: {carrouselFile}; -} - -#carrouselFile { - directoryEnabled: false; - exts: {_("tutti.importPupitri.carrouselFile.extension")}; - extsDescription: {_("tutti.importPupitri.carrouselFile.extension.description")}; - acceptAllFileFilterUsed: false; -} - -#cancelButton { - actionIcon: cancel; - text: "tutti.common.cancel"; - toolTipText: "tutti.common.cancel"; - i18nMnemonic: "tutti.common.cancel.mnemonic"; -} - -#validateButton { - actionIcon: add; - text: "tutti.common.validate"; - toolTipText: "tutti.common.validate"; - i18nMnemonic: "tutti.common.validate.mnemonic"; -} - Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx 2013-05-23 11:28:29 UTC (rev 991) @@ -1,94 +0,0 @@ - -<JDialog id='importPupitriDialog' layout='{new BorderLayout()}'> - - <import> - fr.ifremer.tutti.ui.swing.TuttiUIContext - - jaxx.runtime.swing.editor.FileEditor - org.jdesktop.swingx.JXTitledPanel - javax.swing.JComponent - </import> - - <script><![CDATA[ - -public ImportPupitriPopupUI(TuttiUIContext context) { - super(context.getMainUI()); - setContextValue(context); - ImportPupitriPopupUIHandler handler = new ImportPupitriPopupUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); -} - -protected void $afterCompleteSetup() { - getHandler().afterInitUI(); -} - -public void open() { - handler.open(); -} - ]]></script> - -  - <Boolean id='editable' javaBean='true'/> - -  -  - - <ImportPupitriPopupUIHandler id='handler' - initializer='getContextValue(ImportPupitriPopupUIHandler.class)'/> - - <Table id='mainPanel' fill='both'> - - <row> - <cell> - <JLabel id='trunkFileLabel'/> - </cell> - <cell weightx='1'> - <FileEditor id='trunkFile'/> - </cell> - </row> - - <row> - <cell> - <JLabel id='carrouselFileLabel'/> - </cell> - <cell weightx='1'> - <FileEditor id='carrouselFile'/> - </cell> - </row> - - <row> - <cell columns='2'> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='validateButton' onActionPerformed='handler.validate()'/> - </JPanel> - </cell> - </row> - - </Table> - -</JDialog> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,96 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.operation.catches; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JOptionPane; - -import static org.nuiton.i18n.I18n._; - -/** - * @author kmorin <morin(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ImportPupitriPopupUIHandler { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportPupitriPopupUIHandler.class); - - protected final ImportPupitriPopupUI ui; - - protected final TuttiUIContext context; - - public ImportPupitriPopupUIHandler(TuttiUIContext context, - ImportPupitriPopupUI ui) { - this.context = context; - this.ui = ui; - } - - protected void beforeInitUI() { - } - - protected void afterInitUI() { - ui.getTrunkFile().setDialogOwner(ui); - ui.getCarrouselFile().setDialogOwner(ui); - ui.pack(); - ui.setResizable(true); - } - - protected void resetFields() { - ui.getTrunkFile().setSelectedFile((String) null); - ui.getCarrouselFile().setSelectedFile((String) null); - } - - public void open() { - resetFields(); - SwingUtil.center(context.getMainUI(), ui); - ui.setVisible(true); - } - - public void cancel() { - resetFields(); - ui.dispose(); - } - - public void validate() { - if (ui.getTrunkFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile() != null) { - ui.dispose(); - - } else { - JOptionPane.showMessageDialog(ui, - _("tutti.importPupitri.error.fileMissing.message"), - _("tutti.importPupitri.error.fileMissing.title"), - JOptionPane.ERROR_MESSAGE); - } - } - -} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2013-05-23 11:28:29 UTC (rev 991) @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #importMultiPostLogDialog { title: "tutti.multiPostImportLog.title"; modal: true; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2013-05-23 11:28:29 UTC (rev 991) @@ -1,3 +1,26 @@ + <JDialog id='importMultiPostLogDialog' layout='{new BorderLayout()}'> <JTextArea id="message" constraints='BorderLayout.NORTH'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ImportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ImportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.catches.multipost.TuttiMultiPostImportExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ImportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractImportMultiPostAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractExportMultiPostAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java (from rev 984, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-23 11:28:29 UTC (rev 991) @@ -0,0 +1,140 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationAction; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; + +import javax.swing.JOptionPane; +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { + + protected File importedTrunkFile; + + protected File importedCarrouselFile; + + protected ImportPupitriPopupUI importPupitriDialog; + + protected TuttiProtocol currentProtocol; + + protected PersistenceService persistenceService; + + protected EditFishingOperationAction editAction; + + public ImportPupitriAction(SpeciesBatchUIHandler handler) { + super(handler, false); + persistenceService = getContext().getPersistenceService(); + importPupitriDialog = new ImportPupitriPopupUI(handler.getContext()); + } + + public EditFishingOperationAction getEditAction() { + if (editAction == null) { + editAction = TuttiActionHelper.createLogicAction(getHandler().getParentUi().getHandler(), + EditFishingOperationAction.class); + } + return editAction; + } + + @Override + protected boolean prepareAction() throws Exception { + boolean result = true; + currentProtocol = getDataContext().getProtocol(); + + SpeciesBatchUIModel speciesBatchUIModel = getUI().getModel(); + if (speciesBatchUIModel.getRowCount() > 0) { + String htmlMessage = String.format( + AbstractTuttiUIHandler.CONFIRMATION_FORMAT, + _("tutti.editSpeciesBatch.action.importPupitri.existingData.message"), + _("tutti.editSpeciesBatch.action.importPupitri.existingData.help")); + + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + htmlMessage, + _("tutti.editSpeciesBatch.action.importPupitri.existingData.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); + + result = answer == JOptionPane.OK_OPTION; + } + + if (result) { + importPupitriDialog.open(); + importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); + importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); + result = importedTrunkFile != null + && importedCarrouselFile != null; + } + + return result; + } + + @Override + protected void doAction() throws Exception { + TuttiPupitriImportExportService pupitriImportExportService = + getContext().getTuttiPupitriImportExportService(); + + EditCatchesUIModel model = getUI().getHandler().getParentUi().getModel(); + + FishingOperation operation = model.getFishingOperation(); + CatchBatch catchBatch = model.getCatchBatch(); + + // import + int rejectedSpeciesNb = + pupitriImportExportService.importPupitri(importedTrunkFile, + importedCarrouselFile, + operation, + catchBatch); + + String fishingOperationText = getEditAction().getFishingOperationTitle(operation); + + getEditAction().loadCatchBatch(operation, fishingOperationText, true); + + sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.success", + getModel().getRootNumber(), rejectedSpeciesNb)); + } + + @Override + protected void releaseAction() { + super.releaseAction(); + importedTrunkFile = null; + importedCarrouselFile = null; + currentProtocol = null; + } + +} Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css (from rev 984, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.css) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css 2013-05-23 11:28:29 UTC (rev 991) @@ -0,0 +1,67 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% +*/ + +#importPupitriDialog { + modal: true; + title: "tutti.importPupitri.title"; +} + +#trunkFileLabel { + text: "tutti.importPupitri.field.trunkFile"; + labelFor: {trunkFile}; +} + +#trunkFile { + directoryEnabled: false; + exts: {_("tutti.importPupitri.trunkFile.extension")}; + extsDescription: {_("tutti.importPupitri.trunkFile.extension.description")}; + acceptAllFileFilterUsed: false; +} + +#carrouselFileLabel { + text: "tutti.importPupitri.field.carrouselFile"; + labelFor: {carrouselFile}; +} + +#carrouselFile { + directoryEnabled: false; + exts: {_("tutti.importPupitri.carrouselFile.extension")}; + extsDescription: {_("tutti.importPupitri.carrouselFile.extension.description")}; + acceptAllFileFilterUsed: false; +} + +#cancelButton { + actionIcon: cancel; + text: "tutti.common.cancel"; + toolTipText: "tutti.common.cancel"; + i18nMnemonic: "tutti.common.cancel.mnemonic"; +} + +#validateButton { + actionIcon: add; + text: "tutti.common.validate"; + toolTipText: "tutti.common.validate"; + i18nMnemonic: "tutti.common.validate.mnemonic"; +} + Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx (from rev 984, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx 2013-05-23 11:28:29 UTC (rev 991) @@ -0,0 +1,94 @@ + +<JDialog id='importPupitriDialog' layout='{new BorderLayout()}'> + + <import> + fr.ifremer.tutti.ui.swing.TuttiUIContext + + jaxx.runtime.swing.editor.FileEditor + org.jdesktop.swingx.JXTitledPanel + javax.swing.JComponent + </import> + + <script><![CDATA[ + +public ImportPupitriPopupUI(TuttiUIContext context) { + super(context.getMainUI()); + setContextValue(context); + ImportPupitriPopupUIHandler handler = new ImportPupitriPopupUIHandler(context, this); + setContextValue(handler); + handler.beforeInitUI(); +} + +protected void $afterCompleteSetup() { + getHandler().afterInitUI(); +} + +public void open() { + handler.open(); +} + ]]></script> + +  + <Boolean id='editable' javaBean='true'/> + +  +  + + <ImportPupitriPopupUIHandler id='handler' + initializer='getContextValue(ImportPupitriPopupUIHandler.class)'/> + + <Table id='mainPanel' fill='both'> + + <row> + <cell> + <JLabel id='trunkFileLabel'/> + </cell> + <cell weightx='1'> + <FileEditor id='trunkFile'/> + </cell> + </row> + + <row> + <cell> + <JLabel id='carrouselFileLabel'/> + </cell> + <cell weightx='1'> + <FileEditor id='carrouselFile'/> + </cell> + </row> + + <row> + <cell columns='2'> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> + <JButton id='validateButton' onActionPerformed='handler.validate()'/> + </JPanel> + </cell> + </row> + + </Table> + +</JDialog> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java (from rev 984, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2013-05-23 11:28:29 UTC (rev 991) @@ -0,0 +1,96 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JOptionPane; + +import static org.nuiton.i18n.I18n._; + +/** + * @author kmorin <morin(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ImportPupitriPopupUIHandler { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ImportPupitriPopupUIHandler.class); + + protected final ImportPupitriPopupUI ui; + + protected final TuttiUIContext context; + + public ImportPupitriPopupUIHandler(TuttiUIContext context, + ImportPupitriPopupUI ui) { + this.context = context; + this.ui = ui; + } + + protected void beforeInitUI() { + } + + protected void afterInitUI() { + ui.getTrunkFile().setDialogOwner(ui); + ui.getCarrouselFile().setDialogOwner(ui); + ui.pack(); + ui.setResizable(true); + } + + protected void resetFields() { + ui.getTrunkFile().setSelectedFile((String) null); + ui.getCarrouselFile().setSelectedFile((String) null); + } + + public void open() { + resetFields(); + SwingUtil.center(context.getMainUI(), ui); + ui.setVisible(true); + } + + public void cancel() { + resetFields(); + ui.dispose(); + } + + public void validate() { + if (ui.getTrunkFile().getSelectedFile() != null + && ui.getCarrouselFile().getSelectedFile() != null) { + ui.dispose(); + + } else { + JOptionPane.showMessageDialog(ui, + _("tutti.importPupitri.error.fileMissing.message"), + _("tutti.importPupitri.error.fileMissing.title"), + JOptionPane.ERROR_MESSAGE); + } + } + +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 11:28:29 UTC (rev 991) @@ -52,6 +52,15 @@ borderPainted: false; } +#importPupitriButton { + actionIcon: pupitri-import; + text: "tutti.editSpeciesBatch.action.importPupitri"; + toolTipText: "tutti.editSpeciesBatch.action.importPupitri.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importPupitri.mnemonic"; + _tuttiAction: {ImportPupitriAction.class}; + _help: {"tutti.editSpeciesBatch.action.importPupitri.help"}; +} + #importMultiPostButton { actionIcon: import; text: "tutti.editSpeciesBatch.action.importMultiPost"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 11:28:29 UTC (rev 991) @@ -27,6 +27,7 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.editor.TuttiComputedOrNotDataEditor @@ -43,7 +44,7 @@ <script><![CDATA[ -public SpeciesBatchUI(TuttiUI<?,?> parentUI) { +public SpeciesBatchUI(EditCatchesUI parentUI) { JAXXUtil.initContext(this, parentUI); SpeciesBatchUIHandler handler = new SpeciesBatchUIHandler(parentUI, this); setContextValue(handler); @@ -69,6 +70,7 @@ constructorParams='"tutti.editSpeciesBatch.help"'/> <JToolBar id='speciesBatchTabToolBar'> + <JButton id='importPupitriButton'/> <JButton id='importMultiPostButton'/> <JButton id='exportMultiPostButton'/> </JToolBar> 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-05-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-23 11:28:29 UTC (rev 991) @@ -54,7 +54,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; 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.attachment.AttachmentCellEditor; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; @@ -134,7 +133,9 @@ protected ValidationService validationService = getContext().getValidationService(); - public SpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, + protected final EditCatchesUI parentUi; + + public SpeciesBatchUIHandler(EditCatchesUI parentUi, SpeciesBatchUI ui) { super(parentUi, ui, SpeciesBatchRowModel.PROPERTY_SPECIES, @@ -154,6 +155,7 @@ SpeciesBatchRowModel.PROPERTY_ATTACHMENT, SpeciesBatchRowModel.PROPERTY_FREQUENCY, SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); + this.parentUi = parentUi; tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { @@ -192,6 +194,10 @@ }); } + public EditCatchesUI getParentUi() { + return parentUi; + } + //------------------------------------------------------------------------// //-- AbstractTuttiBatchTableUIHandler methods --// //------------------------------------------------------------------------// 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-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 11:28:29 UTC (rev 991) @@ -434,15 +434,6 @@ tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= tutti.editCatchBatch.action.computeWeights.tip= -tutti.editCatchBatch.action.importPupitri= -tutti.editCatchBatch.action.importPupitri.existingData.help= -tutti.editCatchBatch.action.importPupitri.existingData.message= -tutti.editCatchBatch.action.importPupitri.existingData.title= -tutti.editCatchBatch.action.importPupitri.mnemonic= -tutti.editCatchBatch.action.importPupitri.noProtocol.message= -tutti.editCatchBatch.action.importPupitri.noProtocol.title= -tutti.editCatchBatch.action.importPupitri.success= -tutti.editCatchBatch.action.importPupitri.tip= tutti.editCatchBatch.action.saveCatchBatch= tutti.editCatchBatch.action.saveCatchBatch.mnemonic= tutti.editCatchBatch.action.saveCatchBatch.tip= @@ -860,6 +851,15 @@ tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title= tutti.editSpeciesBatch.action.importMultiPost.success= tutti.editSpeciesBatch.action.importMultiPost.tip= +tutti.editSpeciesBatch.action.importPupitri= +tutti.editSpeciesBatch.action.importPupitri.existingData.help= +tutti.editSpeciesBatch.action.importPupitri.existingData.message= +tutti.editSpeciesBatch.action.importPupitri.existingData.title= +tutti.editSpeciesBatch.action.importPupitri.mnemonic= +tutti.editSpeciesBatch.action.importPupitri.noProtocol.message= +tutti.editSpeciesBatch.action.importPupitri.noProtocol.title= +tutti.editSpeciesBatch.action.importPupitri.success= +tutti.editSpeciesBatch.action.importPupitri.tip= tutti.editSpeciesBatch.action.removeBatch= tutti.editSpeciesBatch.action.removeBatch.confirm.message= tutti.editSpeciesBatch.action.removeBatch.confirm.title= 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-23 10:17:31 UTC (rev 990) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 11:28:29 UTC (rev 991) @@ -421,13 +421,6 @@ tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Élever les poids -tutti.editCatchBatch.action.importPupitri=Import Pupitri -tutti.editCatchBatch.action.importPupitri.existingData.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas importer les données Pupitri et conserver les espèces saisies</li><li><strong>OK</strong> pour supprimer les espèces existantes et les remplacer par les données de Pupitri</li></ul> -tutti.editCatchBatch.action.importPupitri.existingData.message=Des espèces ont déjà été saisies dans la capture. Si vous continuez, elles vont être écrasées. -tutti.editCatchBatch.action.importPupitri.existingData.title=Données existantes -tutti.editCatchBatch.action.importPupitri.mnemonic=I -tutti.editCatchBatch.action.importPupitri.success=Import Pupitri réussi \: %1s espèces importées, %2s espèces rejetées -tutti.editCatchBatch.action.importPupitri.tip=Import Pupitri tutti.editCatchBatch.action.saveCatchBatch=Enregistrer tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S tutti.editCatchBatch.action.saveCatchBatch.tip=Enregistrer la capture @@ -825,6 +818,13 @@ tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title=Importer des lots d'espèces tutti.editSpeciesBatch.action.importMultiPost.success=Des lots d'espèces ont été importés depuis le fichier %s tutti.editSpeciesBatch.action.importMultiPost.tip=Importer des lots d'espèces créés sur un poste satellite +tutti.editSpeciesBatch.action.importPupitri=Import Pupitri +tutti.editSpeciesBatch.action.importPupitri.existingData.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas importer les données Pupitri et conserver les espèces saisies</li><li><strong>OK</strong> pour supprimer les espèces existantes et les remplacer par les données de Pupitri</li></ul> +tutti.editSpeciesBatch.action.importPupitri.existingData.message=Des espèces ont déjà été saisies dans la capture. Si vous continuez, elles vont être écrasées. +tutti.editSpeciesBatch.action.importPupitri.existingData.title=Données existantes +tutti.editSpeciesBatch.action.importPupitri.mnemonic=I +tutti.editSpeciesBatch.action.importPupitri.success=Import Pupitri réussi \: %1s espèces importées, %2s espèces rejetées +tutti.editSpeciesBatch.action.importPupitri.tip=Import Pupitri tutti.editSpeciesBatch.action.removeBatch=Supprimer le lot tutti.editSpeciesBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot d'espèces. Êtes-vous sur de vouloir le supprimer ? tutti.editSpeciesBatch.action.removeBatch.confirm.title=Suppression d'un lot d'espèces

1 0

r990 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: kmorin Date: 2013-05-23 12:17:31 +0200 (Thu, 23 May 2013) New Revision: 990 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/990 Log: fixes #2493 [ESPECES] Message d'erreur lors de l'application d'un MELAG sans poids saisi Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 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-23 10:08:12 UTC (rev 989) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 10:17:31 UTC (rev 990) @@ -162,7 +162,7 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot -tutti.createBenthosMelag.error.message=Erreur à la ligne %s +tutti.createBenthosMelag.error.message=Erreur à la ligne %s : le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createBenthosMelag.error.title=Erreur tutti.createIndividualObservationBatch.action.addSpecies=... tutti.createIndividualObservationBatch.action.addSpecies.mnemonic=. @@ -217,7 +217,7 @@ tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG -tutti.createSpeciesMelag.error.message=Erreur à la ligne %s +tutti.createSpeciesMelag.error.message=Erreur à la ligne %s : le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur tutti.createSpeciesMelag.message=Combien pesait le MELAG (kg) ? tutti.createSpeciesMelag.title=Poids du MELAG (kg)

1 0

r989 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter java/fr/ifremer/tutti/ui/swing/content/operation/catches/species resources/i18n
by kmorin＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: kmorin Date: 2013-05-23 12:08:12 +0200 (Thu, 23 May 2013) New Revision: 989 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/989 Log: fixes #2491 [ERGO] Suppression lot : avoir un message de confirmation Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java 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/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 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/RemoveSpeciesSubBatchAction.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/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java 2013-05-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -31,6 +31,10 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; + +import static org.nuiton.i18n.I18n._; + /** * @author kmorin <kmorin(a)codelutin.com> * @since 1.4 @@ -47,6 +51,21 @@ int rowIndex; @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editAccidentalBatch.action.removeBatch.confirm.message"), + _("tutti.editAccidentalBatch.action.removeBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; + } + + @Override protected void doAction() throws Exception { JXTable table = handler.getTable(); 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-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -35,8 +35,11 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * To remove a species batch and all his children. * @@ -49,12 +52,23 @@ private static final Log log = LogFactory.getLog(RemoveBenthosBatchAction.class); - protected RemoveBenthosSubBatchAction removeSpeciesSubBatchAction; - public RemoveBenthosBatchAction(BenthosBatchUIHandler handler) { super(handler, false); + } - removeSpeciesSubBatchAction = new RemoveBenthosSubBatchAction(handler); + @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editBenthosBatch.action.removeBatch.confirm.message"), + _("tutti.editBenthosBatch.action.removeBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-05-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -32,8 +32,11 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import org.jdesktop.swingx.JXTable; +import javax.swing.*; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * To remove a species batch children. * @@ -47,6 +50,21 @@ } @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editBenthosBatch.action.removeSubBatch.confirm.message"), + _("tutti.editBenthosBatch.action.removeSubBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; + } + + @Override protected void doAction() throws Exception { TuttiPersistence persistenceService = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-05-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -31,6 +31,10 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; + +import static org.nuiton.i18n.I18n._; + /** * @author kmorin <kmorin(a)codelutin.com> * @since 1.4 @@ -48,6 +52,21 @@ int rowIndex; @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editIndividualObservationBatch.action.removeBatch.confirm.message"), + _("tutti.editIndividualObservationBatch.action.removeBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; + } + + @Override protected void doAction() throws Exception { JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-05-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -34,6 +34,10 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; + +import static org.nuiton.i18n.I18n._; + /** * To remove a selected marine litter batch in the table. * @@ -55,6 +59,21 @@ int rowIndex; @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editMarineLitterBatch.action.removeBatch.confirm.message"), + _("tutti.editMarineLitterBatch.action.removeBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; + } + + @Override protected void doAction() throws Exception { JXTable table = handler.getTable(); 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-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -35,8 +35,11 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * To remove a species batch and all his children. * @@ -49,12 +52,23 @@ private static final Log log = LogFactory.getLog(RemoveSpeciesBatchAction.class); - protected RemoveSpeciesSubBatchAction removeSpeciesSubBatchAction; - public RemoveSpeciesBatchAction(SpeciesBatchUIHandler handler) { super(handler, false); + } - removeSpeciesSubBatchAction = new RemoveSpeciesSubBatchAction(handler); + @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editSpeciesBatch.action.removeBatch.confirm.message"), + _("tutti.editSpeciesBatch.action.removeBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-05-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-05-23 10:08:12 UTC (rev 989) @@ -32,8 +32,11 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import org.jdesktop.swingx.JXTable; +import javax.swing.*; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * To remove a species batch children. * @@ -47,6 +50,21 @@ } @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + if (result) { + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.editSpeciesBatch.action.removeSubBatch.confirm.message"), + _("tutti.editSpeciesBatch.action.removeSubBatch.confirm.title"), + JOptionPane.YES_NO_OPTION); + result = answer == JOptionPane.YES_OPTION; + } + + return result; + } + + @Override protected void doAction() throws Exception { TuttiPersistence persistenceService = 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-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 10:08:12 UTC (rev 989) @@ -278,6 +278,8 @@ tutti.editAccidentalBatch.action.importMultiPost.success= tutti.editAccidentalBatch.action.importMultiPost.tip= tutti.editAccidentalBatch.action.removeBatch= +tutti.editAccidentalBatch.action.removeBatch.confirm.message= +tutti.editAccidentalBatch.action.removeBatch.confirm.title= tutti.editAccidentalBatch.action.removeBatch.mnemonic= tutti.editAccidentalBatch.action.removeBatch.tip= tutti.editAccidentalBatch.table.header.comment= @@ -317,9 +319,13 @@ tutti.editBenthosBatch.action.importMultiPost.success= tutti.editBenthosBatch.action.importMultiPost.tip= tutti.editBenthosBatch.action.removeBatch= +tutti.editBenthosBatch.action.removeBatch.confirm.message= +tutti.editBenthosBatch.action.removeBatch.confirm.title= tutti.editBenthosBatch.action.removeBatch.mnemonic= tutti.editBenthosBatch.action.removeBatch.tip= tutti.editBenthosBatch.action.removeSubBatch= +tutti.editBenthosBatch.action.removeSubBatch.confirm.message= +tutti.editBenthosBatch.action.removeSubBatch.confirm.title= tutti.editBenthosBatch.action.removeSubBatch.mnemonic= tutti.editBenthosBatch.action.removeSubBatch.tip= tutti.editBenthosBatch.action.renameBatch= @@ -643,6 +649,8 @@ tutti.editIndividualObservationBatch.action.importMultiPost.success= tutti.editIndividualObservationBatch.action.importMultiPost.tip= tutti.editIndividualObservationBatch.action.removeBatch= +tutti.editIndividualObservationBatch.action.removeBatch.confirm.message= +tutti.editIndividualObservationBatch.action.removeBatch.confirm.title= tutti.editIndividualObservationBatch.action.removeBatch.mnemonic= tutti.editIndividualObservationBatch.action.removeBatch.tip= tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode= @@ -688,6 +696,8 @@ tutti.editMarineLitterBatch.action.importMultiPost.success= tutti.editMarineLitterBatch.action.importMultiPost.tip= tutti.editMarineLitterBatch.action.removeBatch= +tutti.editMarineLitterBatch.action.removeBatch.confirm.message= +tutti.editMarineLitterBatch.action.removeBatch.confirm.title= tutti.editMarineLitterBatch.action.removeBatch.mnemonic= tutti.editMarineLitterBatch.action.removeBatch.tip= tutti.editMarineLitterBatch.field.marineLitterTotalWeight= @@ -851,9 +861,13 @@ tutti.editSpeciesBatch.action.importMultiPost.success= tutti.editSpeciesBatch.action.importMultiPost.tip= tutti.editSpeciesBatch.action.removeBatch= +tutti.editSpeciesBatch.action.removeBatch.confirm.message= +tutti.editSpeciesBatch.action.removeBatch.confirm.title= tutti.editSpeciesBatch.action.removeBatch.mnemonic= tutti.editSpeciesBatch.action.removeBatch.tip= tutti.editSpeciesBatch.action.removeSubBatch= +tutti.editSpeciesBatch.action.removeSubBatch.confirm.message= +tutti.editSpeciesBatch.action.removeSubBatch.confirm.title= tutti.editSpeciesBatch.action.removeSubBatch.mnemonic= tutti.editSpeciesBatch.action.removeSubBatch.tip= tutti.editSpeciesBatch.action.renameBatch= 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-23 10:07:41 UTC (rev 988) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 10:08:12 UTC (rev 989) @@ -272,6 +272,8 @@ tutti.editAccidentalBatch.action.importMultiPost.success=Des lots de captures accidentelles ont été importés depuis le fichier %s tutti.editAccidentalBatch.action.importMultiPost.tip=Importer des captures accidentelles créées sur un poste satellite tutti.editAccidentalBatch.action.removeBatch=Supprimer la capture courante +tutti.editAccidentalBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer une capture accidentelle. Êtes-vous sur de vouloir la supprimer ? +tutti.editAccidentalBatch.action.removeBatch.confirm.title=Suppression d'une capture accidentelle tutti.editAccidentalBatch.action.removeBatch.mnemonic=S tutti.editAccidentalBatch.action.removeBatch.tip=Supprimer la capture courante (celle de la ligne sélectionnée) tutti.editAccidentalBatch.table.header.comment=Commentaire @@ -311,9 +313,13 @@ tutti.editBenthosBatch.action.importMultiPost.success=Des lots de benthos ont été importés depuis le fichier %s tutti.editBenthosBatch.action.importMultiPost.tip=Importer des lots de benthos créés sur un poste satellite tutti.editBenthosBatch.action.removeBatch=Supprimer le lot +tutti.editBenthosBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot de benthos. Êtes-vous sur de vouloir le supprimer ? +tutti.editBenthosBatch.action.removeBatch.confirm.title=Suppression d'un lot de benthos tutti.editBenthosBatch.action.removeBatch.mnemonic=S tutti.editBenthosBatch.action.removeBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils tutti.editBenthosBatch.action.removeSubBatch=Supprimer les lots fils +tutti.editBenthosBatch.action.removeSubBatch.confirm.message=Vous êtes sur le point de supprimer les fils d'un lot de benthos. Êtes-vous sur de vouloir les supprimer ? +tutti.editBenthosBatch.action.removeSubBatch.confirm.title=Suppression des fils d'un lot de benthos tutti.editBenthosBatch.action.removeSubBatch.mnemonic=f tutti.editBenthosBatch.action.removeSubBatch.tip=Supprimer tous les lots fils du lot sélectionné tutti.editBenthosBatch.action.renameBatch=Corriger l'espèce @@ -626,6 +632,8 @@ tutti.editIndividualObservationBatch.action.importMultiPost.success=Des lots d'observations individuelles ont été importés depuis le fichier %s tutti.editIndividualObservationBatch.action.importMultiPost.tip=Importer des observations créées sur un poste satellite tutti.editIndividualObservationBatch.action.removeBatch=Supprimer la ligne sélectionnée +tutti.editIndividualObservationBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer une observation individuelle. Êtes-vous sur de vouloir la supprimer ? +tutti.editIndividualObservationBatch.action.removeBatch.confirm.title=Suppression d'une observation individuelle tutti.editIndividualObservationBatch.action.removeBatch.mnemonic=S tutti.editIndividualObservationBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée tutti.editIndividualObservationBatch.table.header.calcifiedPieceSamplingCode=Code de prélèvement pièce calcifiée @@ -671,6 +679,8 @@ tutti.editMarineLitterBatch.action.importMultiPost.success=Des lots de déchets ont été importés depuis le fichier %s tutti.editMarineLitterBatch.action.importMultiPost.tip=Importer des lots de déchets créés sur un poste satellite tutti.editMarineLitterBatch.action.removeBatch=Supprimer la ligne sélectionnée +tutti.editMarineLitterBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot de déchets. Êtes-vous sur de vouloir le supprimer ? +tutti.editMarineLitterBatch.action.removeBatch.confirm.title=Suppression d'un lot de déchets tutti.editMarineLitterBatch.action.removeBatch.mnemonic=S tutti.editMarineLitterBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée tutti.editMarineLitterBatch.field.marineLitterTotalWeight=Poids total (Kg) @@ -816,9 +826,13 @@ tutti.editSpeciesBatch.action.importMultiPost.success=Des lots d'espèces ont été importés depuis le fichier %s tutti.editSpeciesBatch.action.importMultiPost.tip=Importer des lots d'espèces créés sur un poste satellite tutti.editSpeciesBatch.action.removeBatch=Supprimer le lot +tutti.editSpeciesBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot d'espèces. Êtes-vous sur de vouloir le supprimer ? +tutti.editSpeciesBatch.action.removeBatch.confirm.title=Suppression d'un lot d'espèces tutti.editSpeciesBatch.action.removeBatch.mnemonic=S tutti.editSpeciesBatch.action.removeBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils tutti.editSpeciesBatch.action.removeSubBatch=Supprimer les lots fils +tutti.editSpeciesBatch.action.removeSubBatch.confirm.message=Vous êtes sur le point de supprimer les fils d'un lot d'espèces. Êtes-vous sur de vouloir les supprimer ? +tutti.editSpeciesBatch.action.removeSubBatch.confirm.title=Suppression des fils d'un lot d'espèces tutti.editSpeciesBatch.action.removeSubBatch.mnemonic=f tutti.editSpeciesBatch.action.removeSubBatch.tip=Supprimer tous les lots fils du lot sélectionné tutti.editSpeciesBatch.action.renameBatch=Corriger l'espèce

1 0

r988 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 12:07:41 +0200 (Thu, 23 May 2013) New Revision: 988 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/988 Log: fixes #2496: [MENSURATIONS] Am?\195?\169liorations de la saisie 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-23 10:01:12 UTC (rev 987) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 10:07:41 UTC (rev 988) @@ -41,6 +41,7 @@ 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.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -398,6 +399,9 @@ Lists.newArrayList(rowsByStep.values()); model.setRows(rows); + + // select first cell in table (see http://forge.codelutin.com/issues/2496) + AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 0); } public void applyRafaleStep(Float step) { 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-23 10:01:12 UTC (rev 987) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 10:07:41 UTC (rev 988) @@ -39,6 +39,7 @@ 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.*; +import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -395,6 +396,9 @@ Lists.newArrayList(rowsByStep.values()); model.setRows(rows); + + // select first cell in table (see http://forge.codelutin.com/issues/2496) + AbstractSelectTableAction.doSelectCell(getUI().getTable(), 0, 0); } public void applyRafaleStep(Float step) {

1 0

r987 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/create species/create
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 12:01:12 +0200 (Thu, 23 May 2013) New Revision: 987 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/987 Log: fixes #2497: [ESPECES] Cr?\195?\169ation des lots : inverser les champs V/HV et Poids du lot Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-05-23 09:36:17 UTC (rev 986) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-05-23 10:01:12 UTC (rev 987) @@ -89,29 +89,28 @@ </cell> </row> -  +  <row> <cell anchor='west'> - <JLabel id='sortedUnsortedCategoryLabel'/> + <JLabel id='batchWeightLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + <NumberEditor id='batchWeightField' constructorParams='this'/> </cell> </row> -  +  <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='sortedUnsortedCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchWeightField' constructorParams='this'/> + <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> - - + </Table>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-23 09:36:17 UTC (rev 986) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-05-23 10:01:12 UTC (rev 987) @@ -89,29 +89,28 @@ </cell> </row> -  +  <row> <cell anchor='west'> - <JLabel id='sortedUnsortedCategoryLabel'/> + <JLabel id='batchWeightLabel'/> </cell> <cell weightx='1.0' columns='2'> - <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + <NumberEditor id='batchWeightField' constructorParams='this'/> </cell> </row> -  +  <row> <cell anchor='west'> - <JLabel id='batchWeightLabel'/> + <JLabel id='sortedUnsortedCategoryLabel'/> </cell> <cell weightx='1.0' columns='2'> - <NumberEditor id='batchWeightField' constructorParams='this'/> + <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> - - + </Table>

1 0

r986 - in trunk/tutti-persistence/src/main: java/fr/ifremer/tutti/persistence/service resources resources/i18n
by kmorin＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: kmorin Date: 2013-05-23 11:36:17 +0200 (Thu, 23 May 2013) New Revision: 986 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/986 Log: fixes #2464 [CAMPAGNE] erreur de suppression d'un engin utilis?\195?\169 dans des traits Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-05-23 08:14:40 UTC (rev 985) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-05-23 09:36:17 UTC (rev 986) @@ -38,11 +38,7 @@ import java.io.Serializable; import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.Iterator; -import java.util.List; +import java.util.*; /** * TODO @@ -150,7 +146,12 @@ String paramName = (String) params[3 * i]; Type paramType = (Type) params[3 * i + 1]; Object paramValue = params[3 * i + 2]; - query.setParameter(paramName, paramValue, paramType); + + if (paramValue != null && Collection.class.isAssignableFrom(paramValue.getClass())) { + query.setParameterList(paramName, (Collection)paramValue, paramType); + } else { + query.setParameter(paramName, paramValue, paramType); + } if (log.isDebugEnabled()) { log.debug("query [" + queryName + "] (param " + i + " [" + paramName + '=' + paramValue + "])"); 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-23 08:14:40 UTC (rev 985) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-23 09:36:17 UTC (rev 986) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -58,6 +59,8 @@ 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.TuttiBusinessException; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -75,6 +78,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; +import org.hibernate.type.ListType; +import org.hibernate.type.ObjectType; import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; @@ -90,6 +95,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.3 @@ -315,14 +322,9 @@ 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) { - FishingOperation modifiedOperation = fishingOperationService.getFishingOperation(operation.getId()); - modifiedOperation.setVessel(vessel); - operationsToSave.add(modifiedOperation); - } - fishingOperationService.saveFishingOperations(operationsToSave); + queryUpdate("updateOperationsVessel", + "cruiseId", IntegerType.INSTANCE, scientificCruise.getId(), + "vesselId", StringType.INSTANCE, scientificCruise.getVessel().getCode()); } return bean; @@ -437,6 +439,26 @@ // Remove deleted gear physical features if (fishingTrip.getGearPhysicalFeatures() != null && notChangedGearPhysicalFeatures.size() > 0) { + List<Integer> gearIds = Lists.transform(Lists.newArrayList(notChangedGearPhysicalFeatures), + new Function<GearPhysicalFeatures, Integer>() { + @Override + public Integer apply(GearPhysicalFeatures input) { + Integer result = null; + if (input != null && input.getGear() != null) { + result = input.getGear().getId(); + } + return result; + } + }); + Iterator<Object[]> list = queryList( + "allFishingOperationsWithGear", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(target.getId()), + "gearIds", IntegerType.INSTANCE, gearIds + ); + if (list.hasNext()) { + throw new TuttiBusinessException(_("tutti.persistence.cruise.gearUsedInOperations.error")); + } + for (GearPhysicalFeatures guf : notChangedGearPhysicalFeatures) { if (guf.getGearPhysicalMeasurements() != null) { guf.getGearPhysicalMeasurements().clear(); Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-05-23 08:14:40 UTC (rev 985) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-05-23 09:36:17 UTC (rev 986) @@ -33,6 +33,7 @@ tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= +tutti.persistence.cruise.gearUsedInOperations.error= tutti.persistence.dbMetadata.instanciation.error= tutti.persistence.loader.error= tutti.persistence.mkDir.error= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-05-23 08:14:40 UTC (rev 985) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-05-23 09:36:17 UTC (rev 986) @@ -33,6 +33,7 @@ tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données +tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<br/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne. tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL tutti.persistence.mkDir.error=Erreur lors de la création du dossier %s Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-23 08:14:40 UTC (rev 985) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-23 09:36:17 UTC (rev 986) @@ -173,6 +173,20 @@ <query-param name="pmfmIdTrawlNet" type="java.lang.Integer"/> </query> + <query cacheable="true" name="updateOperationsVessel"> + <![CDATA[ + UPDATE FishingOperationImpl o + SET o.vessel.id=:vesselId + WHERE + o IN ( + FROM FishingOperationImpl fo + WHERE fo.fishingTrip.scientificCruise.id=:cruiseId + ) + ]]> + <query-param name="cruiseId" type="java.lang.Integer"/> + <query-param name="vesselId" type="java.lang.String"/> + </query> + <query cacheable="true" name="gearCaracteristics"> <![CDATA[ SELECT @@ -231,6 +245,23 @@ <query-param name="pmfmIdMultirigAggregation" type="java.lang.Integer"/> </query> + <query cacheable="true" name="allFishingOperationsWithGear"> + <![CDATA[ + SELECT + o.id AS id + FROM + FishingOperationImpl o + LEFT OUTER JOIN o.gearUseFeatures guf + LEFT OUTER JOIN guf.gear g + WHERE + o.fishingTrip.scientificCruise.id=:cruiseId + AND + g.id in (:gearIds) + ]]> + <query-param name="cruiseId" type="java.lang.Integer"/> + <query-param name="gearIds" type="java.lang.Integer"/> + </query> + <query cacheable="true" name="fishingOperation"> <![CDATA[ SELECT

1 0

r985 - trunk
by tchemit＠users.forge.codelutin.com May 23, 2013

May 23, 2013

Author: tchemit Date: 2013-05-23 10:14:40 +0200 (Thu, 23 May 2013) New Revision: 985 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/985 Log: downgrades swingx to 1.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-22 13:37:31 UTC (rev 984) +++ trunk/pom.xml 2013-05-23 08:14:40 UTC (rev 985) @@ -133,7 +133,7 @@ <hibernateVersion>3.6.10.Final</hibernateVersion> <jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion> - <swingXVersion>1.6.5-1</swingXVersion> + <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.14.1</xworkVersion> <slf4jVersion>1.7.5</slf4jVersion>

1 0

r984 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri
by kmorin＠users.forge.codelutin.com May 22, 2013

May 22, 2013

Author: kmorin Date: 2013-05-22 15:37:31 +0200 (Wed, 22 May 2013) New Revision: 984 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/984 Log: fixes #2483 [IMPORT PUPITRI] ambiguit?\195?\169 sur la clef de lecture Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 13:37:31 UTC (rev 984) @@ -58,7 +58,7 @@ public static final String PROPERTY_WEIGHT = "weight"; - protected Integer operationCode; + protected String operationCode; protected String rigNumber; @@ -73,11 +73,11 @@ public CarrouselRow() { } - public Integer getOperationCode() { + public String getOperationCode() { return operationCode; } - public void setOperationCode(Integer operationCode) { + public void setOperationCode(String operationCode) { this.operationCode = operationCode; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 13:37:31 UTC (rev 984) @@ -41,15 +41,7 @@ // import definition - newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() { - - public Integer parse(String string) throws ParseException { - String number = string.substring(1); - Integer i = Integer.parseInt(number); - return i; - } - - }); + newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER); newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID, new ValueParser<String>() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 13:37:31 UTC (rev 984) @@ -54,7 +54,7 @@ public static final String PROPERTY_EMPTY = ""; - protected Integer operationCode; + protected String operationCode; protected String rigNumber; @@ -65,11 +65,11 @@ public TrunkRow() { } - public Integer getOperationCode() { + public String getOperationCode() { return operationCode; } - public void setOperationCode(Integer operationCode) { + public void setOperationCode(String operationCode) { this.operationCode = operationCode; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 13:37:31 UTC (rev 984) @@ -40,15 +40,7 @@ // import definition - newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() { - - public Integer parse(String string) throws ParseException { - String number = string.substring(1); - Integer i = Integer.parseInt(number); - return i; - } - - }); + newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(TrunkRow.PROPERTY_RIG_NUMBER); newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, new ValueParser<Directions>() { @@ -70,7 +62,6 @@ newIgnoredColumn(TrunkRow.PROPERTY_DATE); newIgnoredColumn(TrunkRow.PROPERTY_TIME); newIgnoredColumn(TrunkRow.PROPERTY_BALANCE_ID); - newIgnoredColumn(TrunkRow.PROPERTY_EMPTY); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 13:37:31 UTC (rev 984) @@ -177,8 +177,7 @@ TrunkRow.PROPERTY_OPERATION_CODE + separator + TrunkRow.PROPERTY_RIG_NUMBER + separator + TrunkRow.PROPERTY_DIRECTION + separator + - TrunkRow.PROPERTY_WEIGHT + separator + - TrunkRow.PROPERTY_EMPTY; + TrunkRow.PROPERTY_WEIGHT; FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers)); log.info(FileUtils.readFileToString(fileWithHeaders)); @@ -191,7 +190,7 @@ Float sortedWeight = 0f; Float rejectedWeight = 0f; - Integer operationNumber = operation.getFishingOperationNumber(); + String operationNumber = operation.getStationNumber(); String rigNumber = operation.getMultirigAggregation(); for (TrunkRow bean : importer) { @@ -280,7 +279,7 @@ reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); carrouselImporter = Import.newImport(carrouselCsvModel, reader); - Integer operationNumber = operation.getFishingOperationNumber(); + String operationNumber = operation.getStationNumber(); String rigNumber = operation.getMultirigAggregation(); Float carrouselSortedWeight = 0f;

1 0

r983 - in trunk: . tutti-persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro tutti-service/src/test/java/fr/ifremer/tutti/service/export tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swi
by tchemit＠users.forge.codelutin.com May 22, 2013

May 22, 2013

Author: tchemit Date: 2013-05-22 14:28:46 +0200 (Wed, 22 May 2013) New Revision: 983 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/983 Log: fixes #2474: [TECHN] Gestion des logs : info trac?\195?\169es updates to mavenpom, jaxx and adagio snapshots Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.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/synchro/ReferentialSynchronizeHelper.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.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/create/CreateBenthosBatchUIHandler.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/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.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/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 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/action/TuttiActionSwingWorker.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/pom.xml 2013-05-22 12:28:46 UTC (rev 983) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.10</version> + <version>3.4.11-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -127,18 +127,18 @@  <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion> - <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.7</xworkVersion> + <swingXVersion>1.6.5-1</swingXVersion> + <xworkVersion>2.3.14.1</xworkVersion> <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.3.6</adagioVersion> + <adagioVersion>3.3.7-SNAPSHOT</adagioVersion> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -154,13 +154,12 @@ <license.licenseName>gpl_v3</license.licenseName> <aspectj.version>1.6.6</aspectj.version> - <spring.version>3.1.3.RELEASE</spring.version> + <spring.version>3.2.3.RELEASE</spring.version> <slf4j.version>1.6.1</slf4j.version> <ehcache.version>2.3.0</ehcache.version> <javassist.version>3.12.1.GA</javassist.version> <hsqldb.version>2.2.9</hsqldb.version> - <jdbc.hsqldb.version>1.8.0.7</jdbc.hsqldb.version> - <jMockVersion>2.5.1</jMockVersion> + <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version>  <jreVersion>1.7.21</jreVersion> @@ -386,24 +385,11 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.0</version> + <version>1.9.5</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> - <version>${jMockVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>${jMockVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> <version>5.4.1</version> @@ -413,7 +399,7 @@ <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.1</version> + <version>9.0.2</version> <scope>compile</scope> </dependency> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/pom.xml 2013-05-22 12:28:46 UTC (rev 983) @@ -173,16 +173,6 @@ </dependency> <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock</artifactId> - </dependency> - - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -81,8 +81,8 @@ super.init(); dbAttachmentDirectory = config.getDbAttachmentDirectory(); - if (log.isInfoEnabled()) { - log.info("Db Attachment storage: " + dbAttachmentDirectory); + if (log.isDebugEnabled()) { + log.debug("Db Attachment storage: " + dbAttachmentDirectory); } } @@ -172,8 +172,8 @@ attachment.setPath(filePath); measurementFile.setPath(filePath); - if (log.isInfoEnabled()) { - log.info("Created attachment: " + attachment.getId() + + if (log.isDebugEnabled()) { + log.debug("Created attachment: " + attachment.getId() + ", path: " + filePath); } 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 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -214,8 +214,8 @@ // delete this child and all his children Integer childBatchId = childBatch.getId(); - if (log.isInfoEnabled()) { - log.info("Delete child [" + childBatchId + "] of species batch: " + id); + if (log.isDebugEnabled()) { + log.debug("Delete child [" + childBatchId + "] of species batch: " + id); } batchHelper.removeWithChildren(childBatchId); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -90,8 +90,8 @@ result.setId(source.getId()); result.setCatchTotalWeight(source.getWeight()); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch: " + result.getId()); + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch: " + result.getId()); } // Vrac Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -183,8 +183,8 @@ Integer batchId = Integer.valueOf(id); - if (log.isInfoEnabled()) { - log.info("Will delete individual observation batch: " + + if (log.isDebugEnabled()) { + log.debug("Will delete individual observation batch: " + batchId); } samplePersistenceHelper.deleteSample(batchId); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -109,8 +109,8 @@ entityToMarineLitterBatch(source, target); result.addChildren(target); - if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > MarineLetter > " + + if (log.isDebugEnabled()) { + log.debug("Loaded CatchBatch Hors Vrac > MarineLetter > " + target.getMarineLitterCategory().getName() + " / " + target.getMarineLitterSizeCategory().getName() + ": " + target.getId()); 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 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983) @@ -224,8 +224,8 @@ // delete this child and all his children Integer childBatchId = childBatch.getId(); - if (log.isInfoEnabled()) { - log.info("Delete child [" + childBatchId + "] of species batch: " + id); + if (log.isDebugEnabled()) { + log.debug("Delete child [" + childBatchId + "] of species batch: " + id); } batchHelper.removeWithChildren(childBatchId); } @@ -327,8 +327,8 @@ // push back id of created sortingBatch source.setId(target.getId()); - if (log.isInfoEnabled()) { - log.info("Create frequency sortingBatch(" + rankOrder + "): " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Create frequency sortingBatch(" + rankOrder + "): " + target.getId()); } } else { @@ -344,8 +344,8 @@ // Remove id from id to remove notUpdatedChildIds.remove(target.getId()); - if (log.isInfoEnabled()) { - log.info("Update frequency sortingBatch(" + rankOrder + "): " + target.getId()); + if (log.isDebugEnabled()) { + log.debug("Update frequency sortingBatch(" + rankOrder + "): " + target.getId()); } } } @@ -361,8 +361,8 @@ // Remove obsolete frequencies for (Integer batchId : notUpdatedChildIds) { - if (log.isInfoEnabled()) { - log.info("Remove obsolete frequency sortingBatch: " + batchId); + if (log.isDebugEnabled()) { + log.debug("Remove obsolete frequency sortingBatch: " + batchId); } batchHelper.removeWithChildren(batchId, catchBatch); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java 2013-05-22 12:28:46 UTC (rev 983) @@ -609,8 +609,8 @@ // gets existing ids in the target db Set<List<String>> existingIds = getExistingPrimaryKeys(localConnection, table); - if (log.isInfoEnabled()) { - log.info(tablePrefix + " existingIds: " + existingIds.size()); + if (log.isDebugEnabled()) { + log.debug(tablePrefix + " existingIds: " + existingIds.size()); } // update table content Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-22 12:28:46 UTC (rev 983) @@ -75,7 +75,7 @@ public static final String SURVEY_CONTENT = "Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire\n" + - "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;Vincent AURECHE;;;"; + "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;AURECHE Vincent;;;"; public static final String OPERATION_CONTENT = "Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Commentaire\n" + Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-22 12:28:46 UTC (rev 983) @@ -27,17 +27,19 @@ # Console output log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n # tutti levels log4j.logger.fr.ifremer.tutti=INFO -log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN -log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO -log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO +#log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN +#log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO +#log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=4 log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n +#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n +log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-22 12:28:46 UTC (rev 983) @@ -118,8 +118,8 @@ Point point = event.getPoint(); Component component = GetCompopentAtPointVisitor.get(tree, point); - if (log.isInfoEnabled()) { - log.info("Component at (" + point + "): " + component); + if (log.isDebugEnabled()) { + log.debug("Component at (" + point + "): " + component); } return component; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -107,8 +107,8 @@ 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"); } saveRow(row); @@ -197,8 +197,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } // close dialog @@ -281,8 +281,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } Gear gear = getModel().getGear(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -76,8 +76,8 @@ @Override public void beforeInitUI() { - if (log.isInfoEnabled()) { - log.info("for " + ui); + if (log.isDebugEnabled()) { + log.debug("for " + ui); } FishingOperationsUIModel model = new FishingOperationsUIModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -115,8 +115,8 @@ rows = null; } else { - if (log.isInfoEnabled()) { - log.info("Get accidental batch for fishingOperation: " + + if (log.isDebugEnabled()) { + log.debug("Get accidental batch for fishingOperation: " + bean.getId()); } rows = Lists.newArrayList(); @@ -277,8 +277,8 @@ @Override public void beforeInitUI() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); + if (log.isDebugEnabled()) { + log.debug("beforeInit: " + ui); } EditCatchesUIModel catchesUIModel = @@ -291,8 +291,8 @@ @Override public void afterInitUI() { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); + if (log.isDebugEnabled()) { + log.debug("afterInit: " + ui); } initUI(ui); @@ -489,8 +489,8 @@ FishingOperation fishingOperation = getModel().getFishingOperation(); catchBean.setFishingOperation(fishingOperation); - if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); + if (log.isDebugEnabled()) { + log.debug("Selected fishingOperation: " + fishingOperation.getId()); } if (TuttiEntities.isNew(catchBean)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -123,8 +123,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -146,8 +146,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); 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-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -755,8 +755,8 @@ } if (split) { - if (log.isInfoEnabled()) { - log.info("Open split batch ui for row [" + rowIndex + ']'); + if (log.isDebugEnabled()) { + log.debug("Open split batch ui for row [" + rowIndex + ']'); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -181,8 +181,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -225,8 +225,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); 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-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -359,8 +359,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } // close dialog @@ -402,8 +402,8 @@ public void applyRafaleStep(Float step) { - if (log.isInfoEnabled()) { - log.info("Will apply rafale step: " + step); + if (log.isDebugEnabled()) { + log.debug("Will apply rafale step: " + step); } BenthosFrequencyUIModel model = getModel(); BenthosFrequencyTableModel tableModel = getTableModel(); @@ -457,7 +457,7 @@ frequencyEditor = editor; Caracteristic lengthStepCaracteristic = null; - Float lengthStep = 1f; + Float lengthStep; List<BenthosFrequencyRowModel> editFrequency = Lists.newArrayList(); @@ -567,8 +567,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } frequencyEditor.validateEdition(getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -239,8 +239,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -317,8 +317,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); @@ -334,8 +334,8 @@ protected void computeSampleWeight(SplitBenthosBatchRowModel row) { - if (log.isInfoEnabled()) { - log.info("Will recompute sample weight from row: " + row); + if (log.isDebugEnabled()) { + log.debug("Will recompute sample weight from row: " + row); } Float result = null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -273,8 +273,8 @@ @Override public void beforeInitUI() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); + if (log.isDebugEnabled()) { + log.debug("beforeInit: " + ui); } EditCatchesUIModel catchesUIModel = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -158,8 +158,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -186,8 +186,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -275,8 +275,8 @@ @Override public void beforeInitUI() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); + if (log.isDebugEnabled()) { + log.debug("beforeInit: " + ui); } EditCatchesUIModel catchesUIModel = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -130,8 +130,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -161,8 +161,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -181,8 +181,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -224,8 +224,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); 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-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -356,8 +356,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } // close dialog @@ -565,8 +565,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } frequencyEditor.validateEdition(getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -241,8 +241,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } closeUI(ui); } @@ -319,8 +319,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); 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-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -276,8 +276,8 @@ @Override public void windowClosed(WindowEvent e) { Component ui = (Component) e.getSource(); - if (log.isInfoEnabled()) { - log.info("Destroy ui " + ui); + if (log.isDebugEnabled()) { + log.debug("Destroy ui " + ui); } JAXXUtil.destroy(ui); } @@ -524,8 +524,8 @@ data = Lists.newArrayList(); } - if (log.isInfoEnabled()) { - log.info("entity comboBox list [" + beanType.getName() + "] : " + + if (log.isDebugEnabled()) { + log.debug("entity comboBox list [" + beanType.getName() + "] : " + (data == null ? 0 : data.size())); } @@ -562,8 +562,8 @@ context.getDecoratorService(); Decorator<E> decorator = decoratorService.getDecoratorByType(beanType); - if (log.isInfoEnabled()) { - log.info("entity list [" + beanType.getName() + "] : " + + if (log.isDebugEnabled()) { + log.debug("entity list [" + beanType.getName() + "] : " + (data == null ? 0 : data.size())); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-05-22 12:28:46 UTC (rev 983) @@ -94,8 +94,8 @@ } error = e; } finally { - if (log.isInfoEnabled()) { - log.info("Task [" + this + "] done"); + if (log.isDebugEnabled()) { + log.debug("Task [" + this + "] done"); } } } @@ -106,8 +106,8 @@ protected void done() { super.done(); - if (log.isInfoEnabled()) { - log.info("Task [" + this + "] execute done method after all"); + if (log.isDebugEnabled()) { + log.debug("Task [" + this + "] execute done method after all"); } if (error == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-05-22 12:28:46 UTC (rev 983) @@ -84,7 +84,7 @@ public final void actionPerformed(final ActionEvent event) { if (log.isInfoEnabled()) { - log.info("Task [" + this + "] starting"); + log.info("Task [" + getLogicAction() + "] starting"); } // prepare action @@ -117,8 +117,8 @@ } }); - if (log.isInfoEnabled()) { - log.info("Before execute of action " + action); + if (log.isDebugEnabled()) { + log.debug("Before execute of action " + action); } // perform and release action @@ -141,8 +141,8 @@ } catch (InterruptedException e) { // don't care ? } - if (log.isInfoEnabled()) { - log.info("After execute of action " + action + " (worker done? " + worker.isDone() + ")"); + if (log.isDebugEnabled()) { + log.debug("After execute of action " + action + " (worker done? " + worker.isDone() + ")"); } if (worker.isFailed()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-05-22 12:28:46 UTC (rev 983) @@ -120,8 +120,8 @@ Preconditions.checkNotNull(model, "No model found in editor."); Object result = model.getAttachment(); - if (log.isInfoEnabled()) { - log.info("editor value: " + result); + if (log.isDebugEnabled()) { + log.debug("editor value: " + result); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-22 12:28:46 UTC (rev 983) @@ -184,8 +184,8 @@ Preconditions.checkNotNull(editRow, "No editRow found."); - if (log.isInfoEnabled()) { - log.info("Will edit frequencies for row: " + rowIndex); + if (log.isDebugEnabled()) { + log.debug("Will edit frequencies for row: " + rowIndex); } // get the caracteristics set to the other rows Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -187,8 +187,8 @@ @Override public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Cancel UI " + ui); } // close dialog @@ -325,8 +325,8 @@ public void save() { - if (log.isInfoEnabled()) { - log.info("Save UI " + ui); + if (log.isDebugEnabled()) { + log.debug("Save UI " + ui); } caracteristicMapCellEditor.validateEdition(getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2013-05-22 12:28:46 UTC (rev 983) @@ -119,8 +119,8 @@ Preconditions.checkNotNull(model, "No model found in editor."); Object result = model.getComment(); - if (log.isInfoEnabled()) { - log.info("editor value: " + result); + if (log.isDebugEnabled()) { + log.debug("editor value: " + result); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-05-22 12:28:46 UTC (rev 983) @@ -111,14 +111,14 @@ this.rows = null; if (createEmptyRowIsEmpty && data.isEmpty()) { - if (log.isInfoEnabled()) { - log.info("Creates a first empty row on tableModel " + this); + if (log.isDebugEnabled()) { + log.debug("Creates a first empty row on tableModel " + this); } // add a first edit line data.add(createNewRow()); } - if (log.isInfoEnabled()) { - log.info("Set " + data.size() + " row(s) in table model " + this); + if (log.isDebugEnabled()) { + log.debug("Set " + data.size() + " row(s) in table model " + this); } this.rows = data; onRowsChanged(data); @@ -217,8 +217,8 @@ public final Object getValueAt(int rowIndex, int columnIndex) { R entry = getEntry(rowIndex); ColumnIdentifier<R> identifier = getIdentifier(columnIndex); - if (log.isInfoEnabled()) { - log.info("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName()); + if (log.isDebugEnabled()) { + log.debug("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName()); } Object result = identifier.getValue(entry); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-22 09:51:40 UTC (rev 982) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-22 12:28:46 UTC (rev 983) @@ -174,8 +174,8 @@ (Boolean) newValue); } else if (!propertiesToSkip.contains(propertyName)) { - if (log.isInfoEnabled()) { - log.info("row [" + rowIndex + "] property " + + if (log.isDebugEnabled()) { + log.debug("row [" + rowIndex + "] property " + propertyName + " changed from " + oldValue + " to " + newValue); } @@ -191,8 +191,8 @@ public void propertyChange(PropertyChangeEvent evt) { R oldValue = (R) evt.getOldValue(); R newValue = (R) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("Monitor row changed from " + + if (log.isDebugEnabled()) { + log.debug("Monitor row changed from " + oldValue + " to " + newValue); } if (oldValue != null) { @@ -214,8 +214,8 @@ } protected void onModelRowsChanged(List<R> rows) { - if (log.isInfoEnabled()) { - log.info("Will set " + (rows == null ? 0 : rows.size()) + + if (log.isDebugEnabled()) { + log.debug("Will set " + (rows == null ? 0 : rows.size()) + " rows on model."); } if (CollectionUtils.isNotEmpty(rows)) { @@ -232,8 +232,8 @@ R row, Boolean oldValue, Boolean newValue) { - if (log.isInfoEnabled()) { - log.info("row [" + rowIndex + "] modify state changed from " + + if (log.isDebugEnabled()) { + log.debug("row [" + rowIndex + "] modify state changed from " + oldValue + " to " + newValue); } } @@ -243,8 +243,8 @@ Boolean oldValue, Boolean newValue) { - if (log.isInfoEnabled()) { - log.info("row [" + rowIndex + "] valid state changed from " + + if (log.isDebugEnabled()) { + log.debug("row [" + rowIndex + "] valid state changed from " + oldValue + " to " + newValue); } @@ -257,8 +257,8 @@ R oldRow, int newRowIndex, R newRow) { - if (log.isInfoEnabled()) { - log.info("Selected row changed from [" + oldRowIndex + "] to [" + + if (log.isDebugEnabled()) { + log.debug("Selected row changed from [" + oldRowIndex + "] to [" + newRowIndex + "]"); } } @@ -379,8 +379,8 @@ } }; - if (log.isInfoEnabled()) { - log.info("Intall " + tableSelectionListener + " on tableModel " + getTableModel()); + if (log.isDebugEnabled()) { + log.debug("Intall " + tableSelectionListener + " on tableModel " + getTableModel()); } getTable().getSelectionModel().addListSelectionListener(tableSelectionListener); @@ -390,8 +390,8 @@ if (tableSelectionListener != null) { - if (log.isInfoEnabled()) { - log.info("Desintall " + tableSelectionListener); + if (log.isDebugEnabled()) { + log.debug("Desintall " + tableSelectionListener); } // there was a previous selection listener, remove it @@ -460,8 +460,8 @@ } }; - if (log.isInfoEnabled()) { - log.info("Intall " + keyAdapter); + if (log.isDebugEnabled()) { + log.debug("Intall " + keyAdapter); } table.addKeyListener(keyAdapter); @@ -481,8 +481,8 @@ if (keyAdapter != null) { - if (log.isInfoEnabled()) { - log.info("Desintall " + keyAdapter); + if (log.isDebugEnabled()) { + log.debug("Desintall " + keyAdapter); } getTable().removeKeyListener(keyAdapter); @@ -530,59 +530,4 @@ } } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// - -// public void autoSelectRowInTable(MouseEvent e, JPopupMenu popup) { -// -// boolean rightClick = SwingUtilities.isRightMouseButton(e); -// -// if (rightClick || SwingUtilities.isLeftMouseButton(e)) { -// -// // get the coordinates of the mouse click -// Point p = e.getPoint(); -// -// JXTable source = (JXTable) e.getSource(); -// -// int[] selectedRows = source.getSelectedRows(); -// -// // get the row index at this point -// int rowIndex = source.rowAtPoint(p); -// -// if (log.isDebugEnabled()) { -// log.debug("At point [" + p + "] found Row " + rowIndex); -// } -// -// boolean canContinue = true; -// -// if (source.isEditing()) { -// -// // stop editing -// boolean stopEdit = source.getCellEditor().stopCellEditing(); -// if (!stopEdit) { -// if (log.isWarnEnabled()) { -// log.warn("Could not stop edit cell..."); -// } -// canContinue = false; -// } -// } -// -// if (canContinue) { -// -// // select row (could empty selection) -// if (rowIndex == -1) { -// source.clearSelection(); -// } else if (!ArrayUtils.contains(selectedRows, rowIndex)) { -// source.setRowSelectionInterval(rowIndex, rowIndex); -// } -// -// if (rightClick) { -// -// // on right click show popup -// popup.show(source, e.getX(), e.getY()); -// } -// } -// } -// } }

1 0

r982 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com May 22, 2013

May 22, 2013

Author: tchemit Date: 2013-05-22 11:51:40 +0200 (Wed, 22 May 2013) New Revision: 982 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/982 Log: remove unused dao Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 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 09:19:40 UTC (rev 981) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 09:51:40 UTC (rev 982) @@ -29,14 +29,12 @@ 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; @@ -53,9 +51,6 @@ private static final Log log = LogFactory.getLog(VesselPersonFeaturesPersistenceHelper.class); - @Resource(name = "vesselPersonFeaturesDao") - protected VesselPersonFeaturesDao vesselPersonFeaturesDao; - public VesselPersonFeaturesPersistenceHelper() { } @@ -99,7 +94,6 @@ vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate()); vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag()); vesselPersonFeatures.setRankOrder((short) 1); -// vesselPersonFeaturesDao.create(vesselPersonFeatures); } addRole(role, vesselPersonFeatures); @@ -131,14 +125,13 @@ vesselPersonFeatures.setCreationDate(new Date()); vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag()); vesselPersonFeatures.setRankOrder((short) 1); -// vesselPersonFeaturesDao.create(vesselPersonFeatures); } addRole(role, vesselPersonFeatures); } protected void addRole(VesselPersonRole role, - VesselPersonFeatures vesselPersonFeatures) { + VesselPersonFeatures vesselPersonFeatures) { Person person = vesselPersonFeatures.getPerson(); if (vesselPersonFeatures.getVesselPersonRoles().contains(role)) { if (log.isWarnEnabled()) {

1 0