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 34131b746e77ff0a48594959ef5056236769d287 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jun 23 10:17:45 2016 +0200 fixes #8314 (export espece ou export benthos, générer des noms différents) --- .../actions/ExportMultiPostSpeciesFullAction.java | 18 +++++++++++++++--- .../ExportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +++++++++++++++--- ...iPostSpeciesOnlyIndividualObservationsAction.java | 18 +++++++++++++++--- .../actions/ImportMultiPostSpeciesFullAction.java | 20 ++++++++++++++++---- .../ImportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +++++++++++++++--- ...iPostSpeciesOnlyIndividualObservationsAction.java | 18 +++++++++++++++--- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +++ 7 files changed, 94 insertions(+), 19 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java index f22d2e0..372bfba 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesFullAction.java @@ -25,10 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ExportMultiPostActionSupport; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIModel; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -39,18 +39,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesFullAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesFull"; + fileExtensionDescription = "tuttiBenthosFull"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesFull"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosFull"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesFull"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesFull"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java index a0c533c..4ad19dd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java @@ -25,10 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ExportMultiPostActionSupport; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIModel; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -39,18 +39,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesOnlyFrequenciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesOnlyFrequenciesAction(SpeciesBatchUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesOnlyFrequencies"; + fileExtensionDescription = "tuttiBenthosOnlyFrequencies"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyFrequencies"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesOnlyFrequencies"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java index 4025c8f..789c28a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -25,10 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ExportMultiPostActionSupport; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIModel; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -39,18 +39,30 @@ import static org.nuiton.i18n.I18n.t; */ public class ExportMultiPostSpeciesOnlyIndividualObservationsAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { + private String fileExtension; + private String fileExtensionDescription; + public ExportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesBatchUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesOnlyIndividualObservations"; + fileExtensionDescription = "tuttiBenthosOnlyIndividualObservations"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyIndividualObservations"); + } } @Override protected String getFileExtension() { - return "tuttiSpeciesOnlyIndividualObservations"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java index 542a5b1..39d27f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesFullAction.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -34,9 +34,21 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { super(handler); - } + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesFull"; + fileExtensionDescription = "tuttiBenthosFull"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesFull"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosFull"); + } + } @Override public boolean isImportFrequencies() { @@ -50,12 +62,12 @@ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupp @Override protected String getFileExtension() { - return "tuttiSpeciesFull"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesFull"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java index 33a6963..8f0264f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -34,8 +34,20 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPostSpeciesSupportAction{ + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesOnlyFrequenciesAction(SpeciesBatchUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesOnlyFrequencies"; + fileExtensionDescription = "tuttiBenthosOnlyFrequencies"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyFrequencies"); + } } @Override @@ -50,12 +62,12 @@ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPost @Override protected String getFileExtension() { - return "tuttiSpeciesOnlyFrequencies"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); + return fileExtensionDescription; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java index a4e129e..c8ac064 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUIHandler; - import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -34,8 +34,20 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends ImportMultiPostSpeciesSupportAction { + private String fileExtension; + private String fileExtensionDescription; + public ImportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesBatchUIHandler handler) { super(handler); + boolean isSpecies = SpeciesOrBenthosBatchUISupport.SPECIES.equals( + getUI().getSpeciesOrBenthosContext()); + if (isSpecies) { + fileExtension = "tuttiSpeciesOnlyIndividualObservations"; + fileExtensionDescription = "tuttiBenthosOnlyIndividualObservations"; + } else { + fileExtension = t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + fileExtensionDescription = t("tutti.common.file.tuttiBenthosOnlyIndividualObservations"); + } } @Override @@ -50,12 +62,12 @@ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends Impo @Override protected String getFileExtension() { - return "tuttiSpeciesOnlyIndividualObservations"; + return fileExtension; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); + return fileExtensionDescription; } @Override 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 28e914e..73be460 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.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 tutti.common.file.tuttiCatch=Fichier d'import/export (multi-poste) des poids de capture tutti.common.file.tuttiMarineLitter=Fichier d'import/export (multi-poste) des lots de déchets tutti.common.file.tuttiSpeciesBatchFull=Fichier d'import/export (multi-poste) des mensurations et observations individuelles d'un lot -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.