This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 107d7ae2709893905ac20dfd17d9922c218fe710 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jun 27 17:27:26 2016 +0200 fixes #8314 (export espece ou export benthos, générer des noms différents) Il y avait un autre menu dans les observations individuelles --- .../actions/ExportMultiPostSpeciesFullAction.java | 17 +++++++++++++++-- .../ExportMultiPostSpeciesOnlyFrequenciesAction.java | 17 +++++++++++++++-- ...tiPostSpeciesOnlyIndividualObservationsAction.java | 17 +++++++++++++++-- .../actions/ImportMultiPostSpeciesFullAction.java | 17 +++++++++++++++-- .../ImportMultiPostSpeciesOnlyFrequenciesAction.java | 19 ++++++++++++++++--- ...tiPostSpeciesOnlyIndividualObservationsAction.java | 17 +++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +++ 8 files changed, 96 insertions(+), 13 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesFullAction.java index 3b0c99d..35d6b67 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesFullAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,18 +35,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesFullAction extends ExportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesFullAction(SpeciesFrequencyUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchFull"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchFull"); + } else { + fileExtension = "tuttiBenthosBatchFull"; + fileExtensionDescription = t("tutti.common.file.tuttiBenthosBatchFull"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesBatchFull"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchFull"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java index b701b57..ac431b9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,18 +35,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesOnlyFrequenciesAction extends ExportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesOnlyFrequenciesAction(SpeciesFrequencyUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchOnlyFrequencies"); + } else { + fileExtension = "tuttiBenthosBatchOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiBenthosBatchOnlyFrequencies"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesBatchOnlyFrequencies"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchOnlyFrequencies"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java index 21ba9d5..71d66aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,18 +35,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesOnlyIndividualObservationsAction extends ExportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesFrequencyUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchOnlyIndividualObservations"); + } else { + fileExtension = "tuttiBenthosBatchOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchOnlyIndividualObservations"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesBatchOnlyIndividualObservations"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchOnlyIndividualObservations"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesFullAction.java index 7603b0b..1b21ec3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesFullAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,8 +35,20 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesFullAction(SpeciesFrequencyUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchFull"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchFull"); + } else { + fileExtension = "tuttiBenthosBatchFull"; + fileExtensionDescription = t("tutti.common.file.tuttiBenthosBatchFull"); + } } @Override @@ -50,12 +63,12 @@ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupp @Override protected String getFileExtension() { - return "tuttiSpeciesBatchFull"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchFull"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java index 4375e7b..893d226 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,9 +35,21 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesOnlyFrequenciesAction(SpeciesFrequencyUIHandler handler) { super(handler); - } + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchOnlyFrequencies"); + } else { + fileExtension = "tuttiBenthosBatchOnlyFrequencies"; + fileExtensionDescription = t("tutti.common.file.tuttiBenthosBatchOnlyFrequencies"); + } + } @Override public boolean isImportFrequencies() { @@ -50,12 +63,12 @@ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPost @Override protected String getFileExtension() { - return "tuttiSpeciesBatchOnlyFrequencies"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchOnlyFrequencies"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java index 50afb5e..084764f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import java.io.File; @@ -34,8 +35,20 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends ImportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesFrequencyUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesBatchOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiSpeciesBatchOnlyIndividualObservations"); + } else { + fileExtension = "tuttiBenthosBatchOnlyIndividualObservations"; + fileExtensionDescription = t("tutti.common.file.tuttiBenthosBatchOnlyIndividualObservations"); + } } @Override @@ -50,12 +63,12 @@ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends Impo @Override protected String getFileExtension() { - return "tuttiSpeciesBatchOnlyIndividualObservations"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesBatchOnlyIndividualObservations"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 95c1637..5e2f89d 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -138,6 +138,8 @@ tutti.common.file.pdf= tutti.common.file.protocol= tutti.common.file.tuttiAccidental= tutti.common.file.tuttiBenthos= +tutti.common.file.tuttiBenthosBatchFull= +tutti.common.file.tuttiBenthosBatchOnlyIndividualObservations= tutti.common.file.tuttiBenthosFull= tutti.common.file.tuttiBenthosOnlyFrequencies= tutti.common.file.tuttiBenthosOnlyIndividualObservations= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 73be460..3d30729 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -111,6 +111,9 @@ tutti.common.file.pdf=Extension d'un fichier pdf tutti.common.file.protocol=Extension d'un fichier de protocole Allegro Campagne tutti.common.file.tuttiAccidental=Fichier d'import/export (multi-poste) des lots de captures accidentelles tutti.common.file.tuttiBenthos=Fichier d'import/export (multi-poste) des lots de benthos +tutti.common.file.tuttiBenthosBatchFull=Fichier d'import/export (multi-poste) des mensurations et observations individuelles d'un lot +tutti.common.file.tuttiBenthosBatchOnlyFrequencies=Fichier d'import/export (multi-poste) des mensurations d'un lot +tutti.common.file.tuttiBenthosBatchOnlyIndividualObservations=Fichier d'import/export (multi-poste) des observations individuelles d'un lot tutti.common.file.tuttiBenthosFull=Fichier d'import/export (multi-poste) des lots de benthos, mensurations et observations individuelles tutti.common.file.tuttiBenthosOnlyFrequencies=Fichier d'import/export (multi-poste) des lots de benthos et mensurations tutti.common.file.tuttiBenthosOnlyIndividualObservations=Fichier d'import/export (multi-poste) des lots de benthos et observations individuelles -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.