Author: tchemit Date: 2013-12-17 17:25:15 +0100 (Tue, 17 Dec 2013) New Revision: 1467 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1467 Log: fixes #4035: [MENSURATIONS] Am?\195?\169liorer la gestion du focus Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java 2013-12-17 16:25:15 UTC (rev 1467) @@ -0,0 +1,38 @@ +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% + */ + +/** +* Created on 12/17/13. +* +* @author Tony Chemit <chemit@codelutin.com> +* @since 3.0 +*/ +public enum FrequencyConfigurationMode { + SIMPLE, + AUTO_GEN, + RAFALE, + SIMPLE_COUNTING +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-12-17 16:25:15 UTC (rev 1467) @@ -29,6 +29,7 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -81,13 +82,13 @@ <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> <JRadioButton id='simpleModeButton' - onActionPerformed='model.setConfigurationMode(BenthosFrequencyUIModel.ConfigurationMode.SIMPLE)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.SIMPLE)'/> <JRadioButton id='autoGenModeButton' - onActionPerformed='model.setConfigurationMode(BenthosFrequencyUIModel.ConfigurationMode.AUTO_GEN)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.AUTO_GEN)'/> <JRadioButton id='rafaleModeButton' - onActionPerformed='model.setConfigurationMode(BenthosFrequencyUIModel.ConfigurationMode.RAFALE)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.RAFALE)'/> <JRadioButton id='simpleCountingModeButton' - onActionPerformed='model.setConfigurationMode(BenthosFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.SIMPLE_COUNTING)'/> </VBox> <JPanel id='modeConfigurationPanel' constraints='BorderLayout.CENTER'> 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-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-12-17 16:25:15 UTC (rev 1467) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -52,6 +53,7 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTextField; +import javax.swing.SwingUtilities; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -283,6 +285,25 @@ } }); + // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); + SwingUtilities.invokeLater( + new Runnable() { + @Override + public void run() { + JComponent componentToFocus = getComponentToFocus(newValue); + if (componentToFocus != null) { + componentToFocus.grabFocus(); + } + } + } + ); + } + }); + JXTable table = getTable(); // create table column model @@ -332,7 +353,12 @@ @Override protected JComponent getComponentToFocus() { - return getUI().getLengthStepCaracteristicComboBox(); + FrequencyConfigurationMode configurationMode = getModel().getConfigurationMode(); + JComponent componentToFocus = getComponentToFocus(configurationMode); + if (componentToFocus == null) { + componentToFocus = getUI().getLengthStepCaracteristicComboBox(); + } + return componentToFocus; } @Override @@ -621,20 +647,22 @@ editFrequency.size() + " frequency"); } - BenthosFrequencyUIModel.ConfigurationMode mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE; + FrequencyConfigurationMode mode = FrequencyConfigurationMode.SIMPLE; // if (lengthStepCaracteristic == null && protocol != null) { if (lengthStepCaracteristic == null) { Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); SpeciesProtocol speciesProtocol = this.speciesProtocol.get(taxonId); if (speciesProtocol == null || speciesProtocol.getLengthStepPmfmId() == null) { - mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; + mode = FrequencyConfigurationMode.SIMPLE_COUNTING; } } Integer number = speciesBatch.getNumber(); if (number != null && editFrequency.isEmpty()) { - mode = BenthosFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; + mode = FrequencyConfigurationMode.SIMPLE_COUNTING; model.setSimpleCount(number); } + // make sure configuration mode will be rebind + model.setConfigurationMode(null); model.setConfigurationMode(mode); // connect model to validator @@ -761,4 +789,43 @@ model.setTotalNumber(totalNumber); model.setTotalWeight(totalWeight); } + + protected JComponent getComponentToFocus(FrequencyConfigurationMode mode) { + JComponent componentToFocus = null; + if (mode != null) { + boolean withLengthStepCaracteristic = + getModel().getLengthStepCaracteristic() != null; + switch (mode) { + case SIMPLE: + if (!withLengthStepCaracteristic) { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + break; + case AUTO_GEN: + if (withLengthStepCaracteristic) { + + componentToFocus = ui.getMinStepField(); + } else { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + break; + case RAFALE: + + if (withLengthStepCaracteristic) { + + componentToFocus = ui.getRafaleStepField(); + } else { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + + break; + case SIMPLE_COUNTING: + componentToFocus = ui.getSimpleCountingField(); + break; + default: + componentToFocus = null; + } + } + return componentToFocus; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2013-12-17 16:25:15 UTC (rev 1467) @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -74,19 +75,12 @@ public static final String PROPERTY_NEXT_EDITABLE_ROW_INDEX = "nextEditableRowIndex"; - public static enum ConfigurationMode { - SIMPLE, - AUTO_GEN, - RAFALE, - SIMPLE_COUNTING - } - /** * Fill mode. * * @since 0.2 */ - protected ConfigurationMode configurationMode; + protected FrequencyConfigurationMode configurationMode; /** * Batch that contains frequencies. @@ -186,11 +180,11 @@ setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet()); } - public ConfigurationMode getConfigurationMode() { + public FrequencyConfigurationMode getConfigurationMode() { return configurationMode; } - public void setConfigurationMode(ConfigurationMode configurationMode) { + public void setConfigurationMode(FrequencyConfigurationMode configurationMode) { Object oldValue = getConfigurationMode(); this.configurationMode = configurationMode; firePropertyChange(PROPERTY_CONFIGURATION_MODE, oldValue, configurationMode); @@ -264,19 +258,19 @@ } public boolean isSimpleMode() { - return ConfigurationMode.SIMPLE == configurationMode; + return FrequencyConfigurationMode.SIMPLE == configurationMode; } public boolean isAutoGenMode() { - return ConfigurationMode.AUTO_GEN == configurationMode; + return FrequencyConfigurationMode.AUTO_GEN == configurationMode; } public boolean isRafaleMode() { - return ConfigurationMode.RAFALE == configurationMode; + return FrequencyConfigurationMode.RAFALE == configurationMode; } public boolean isSimpleCountingMode() { - return ConfigurationMode.SIMPLE_COUNTING == configurationMode; + return FrequencyConfigurationMode.SIMPLE_COUNTING == configurationMode; } public boolean isCanGenerate() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-12-17 16:25:15 UTC (rev 1467) @@ -29,6 +29,7 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -81,13 +82,13 @@ <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> <JRadioButton id='simpleModeButton' - onActionPerformed='model.setConfigurationMode(SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.SIMPLE)'/> <JRadioButton id='autoGenModeButton' - onActionPerformed='model.setConfigurationMode(SpeciesFrequencyUIModel.ConfigurationMode.AUTO_GEN)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.AUTO_GEN)'/> <JRadioButton id='rafaleModeButton' - onActionPerformed='model.setConfigurationMode(SpeciesFrequencyUIModel.ConfigurationMode.RAFALE)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.RAFALE)'/> <JRadioButton id='simpleCountingModeButton' - onActionPerformed='model.setConfigurationMode(SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING)'/> + onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.SIMPLE_COUNTING)'/> </VBox> <JPanel id='modeConfigurationPanel' constraints='BorderLayout.CENTER'> 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-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-12-17 16:25:15 UTC (rev 1467) @@ -36,6 +36,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIModel; 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.TuttiBeanMonitor; @@ -53,6 +55,7 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTextField; +import javax.swing.SwingUtilities; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -282,6 +285,25 @@ } }); + // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); + SwingUtilities.invokeLater( + new Runnable() { + @Override + public void run() { + JComponent componentToFocus = getComponentToFocus(newValue); + if (componentToFocus != null) { + componentToFocus.grabFocus(); + } + } + } + ); + } + }); + JXTable table = getTable(); // create table column model @@ -330,7 +352,12 @@ @Override protected JComponent getComponentToFocus() { - return getUI().getLengthStepCaracteristicComboBox(); + FrequencyConfigurationMode configurationMode = getModel().getConfigurationMode(); + JComponent componentToFocus = getComponentToFocus(configurationMode); + if (componentToFocus == null) { + componentToFocus = getUI().getLengthStepCaracteristicComboBox(); + } + return componentToFocus; } @Override @@ -620,20 +647,22 @@ editFrequency.size() + " frequency"); } - SpeciesFrequencyUIModel.ConfigurationMode mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE; + FrequencyConfigurationMode mode = FrequencyConfigurationMode.SIMPLE; // if (lengthStepCaracteristic == null && protocol != null) { if (lengthStepCaracteristic == null) { Integer taxonId = speciesBatch.getSpecies().getReferenceTaxonId(); SpeciesProtocol speciesProtocol = this.speciesProtocol.get(taxonId); if (speciesProtocol == null || speciesProtocol.getLengthStepPmfmId() == null) { - mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; + mode = FrequencyConfigurationMode.SIMPLE_COUNTING; } } Integer number = speciesBatch.getNumber(); if (number != null && editFrequency.isEmpty()) { - mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE_COUNTING; + mode = FrequencyConfigurationMode.SIMPLE_COUNTING; model.setSimpleCount(number); } + // make sure configuration mode will be rebind + model.setConfigurationMode(null); model.setConfigurationMode(mode); // connect model to validator @@ -758,4 +787,43 @@ model.setTotalNumber(totalNumber); model.setTotalWeight(totalWeight); } + + protected JComponent getComponentToFocus(FrequencyConfigurationMode mode) { + JComponent componentToFocus = null; + if (mode != null) { + boolean withLengthStepCaracteristic = + getModel().getLengthStepCaracteristic() != null; + switch (mode) { + case SIMPLE: + if (!withLengthStepCaracteristic) { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + break; + case AUTO_GEN: + if (withLengthStepCaracteristic) { + + componentToFocus = ui.getMinStepField(); + } else { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + break; + case RAFALE: + + if (withLengthStepCaracteristic) { + + componentToFocus = ui.getRafaleStepField(); + } else { + componentToFocus = ui.getLengthStepCaracteristicComboBox(); + } + + break; + case SIMPLE_COUNTING: + componentToFocus = ui.getSimpleCountingField(); + break; + default: + componentToFocus = null; + } + } + return componentToFocus; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-12-17 16:25:15 UTC (rev 1467) @@ -27,6 +27,7 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -74,19 +75,12 @@ public static final String PROPERTY_NEXT_EDITABLE_ROW_INDEX = "nextEditableRowIndex"; - public static enum ConfigurationMode { - SIMPLE, - AUTO_GEN, - RAFALE, - SIMPLE_COUNTING - } - /** * Fill mode. * * @since 0.2 */ - protected ConfigurationMode configurationMode; + protected FrequencyConfigurationMode configurationMode; /** * Batch that contains frequencies. @@ -186,11 +180,11 @@ setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet()); } - public ConfigurationMode getConfigurationMode() { + public FrequencyConfigurationMode getConfigurationMode() { return configurationMode; } - public void setConfigurationMode(ConfigurationMode configurationMode) { + public void setConfigurationMode(FrequencyConfigurationMode configurationMode) { Object oldValue = getConfigurationMode(); this.configurationMode = configurationMode; firePropertyChange(PROPERTY_CONFIGURATION_MODE, oldValue, configurationMode); @@ -264,19 +258,19 @@ } public boolean isSimpleMode() { - return ConfigurationMode.SIMPLE == configurationMode; + return FrequencyConfigurationMode.SIMPLE == configurationMode; } public boolean isAutoGenMode() { - return ConfigurationMode.AUTO_GEN == configurationMode; + return FrequencyConfigurationMode.AUTO_GEN == configurationMode; } public boolean isRafaleMode() { - return ConfigurationMode.RAFALE == configurationMode; + return FrequencyConfigurationMode.RAFALE == configurationMode; } public boolean isSimpleCountingMode() { - return ConfigurationMode.SIMPLE_COUNTING == configurationMode; + return FrequencyConfigurationMode.SIMPLE_COUNTING == configurationMode; } public boolean isCanGenerate() { 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-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-17 16:25:15 UTC (rev 1467) @@ -1040,6 +1040,7 @@ tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.message= tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.title= tutti.editSpeciesBatch.action.importPupitri.mnemonic= +tutti.editSpeciesBatch.action.importPupitri.no.matching.data= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title= tutti.editSpeciesBatch.action.importPupitri.success= 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-12-17 15:11:02 UTC (rev 1466) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-17 16:25:15 UTC (rev 1467) @@ -1030,8 +1030,8 @@ tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.message=<html><body>Le modèle de catégorisation n'est pas compatible pour un import pupitri.<br> Il manque les catégories suivantes \: <ul>%s</ul><hr/>Veuillez ajouter cette catégorie dans la configuration de catégorisation (menu administration).</body></html> tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.title=Modèle de catégorisation non compatible tutti.editSpeciesBatch.action.importPupitri.mnemonic=I +tutti.editSpeciesBatch.action.importPupitri.no.matching.data=Import pupitri non réalisé (Les identifiants de Station et/ ou de Date du trait ne correspondent pas) tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation=L'application n'a pas trouvé dans les fichiers Trunk et Carrousel les identifiants de Station et/ou de Date du trait en cours de saisie.<br/>Aucun lot n'a donc été importé. -tutti.editSpeciesBatch.action.importPupitri.no.matching.data=Import pupitri non réalisé (Les identifiants de Station et/ ou de Date du trait ne correspondent pas) tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title=Import Pupitri 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