This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 29caf78330512264981e6fb798b1d75304cf6661 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 14 15:58:36 2016 +0100 réusinage actions d'import sur le trait --- .../actions/ImportMultiPostSpeciesFullAction.java | 58 ++++------------------ ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 58 ++++------------------ ...ostSpeciesOnlyIndividualObservationsAction.java | 58 ++++------------------ ...va => ImportMultiPostSpeciesSupportAction.java} | 36 +++----------- 4 files changed, 40 insertions(+), 170 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java index 80daa5e..f912774 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java @@ -22,34 +22,33 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; -import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ImportMultiPostActionSupport; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import java.io.File; -import java.util.Collection; -import java.util.Map; -import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - chemit@codelutin.com * @since 4.5 */ -public class ImportMultiPostSpeciesFullAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesFullAction extends ImportMultiPostSpeciesSupportAction { public ImportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { super(handler); } @Override + public boolean isImportFrequencies() { + return true; + } + + @Override + public boolean isImportIndivudalObservations() { + return true; + } + + @Override protected String getFileExtension() { return "tuttiSpeciesFull"; } @@ -74,39 +73,4 @@ public class ImportMultiPostSpeciesFullAction extends ImportMultiPostActionSuppo return t("tutti.editSpeciesBatch.action.importMultiPostFull.success", file); } - @Override - protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - - return multiPostImportExportService.importSpecies(file, operation, true, true); - - } - - @Override - protected String buildNotImportedDataReportText(Map<String, Object> notImportedData) { - - WeightUnit speciesWeightUnit = getConfig().getSpeciesWeightUnit(); - - StringBuilder builder = new StringBuilder(); - - Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); - addNotImportedWeightToReport(builder, totalSortedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.totalSortedWeight")); - - Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); - addNotImportedWeightToReport(builder, inertWeight, speciesWeightUnit, n("tutti.multiPostImportLog.inertWeight")); - - Float livingNotItemizedWeight = - (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); - addNotImportedWeightToReport(builder, livingNotItemizedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.livingNotItemizedWeight")); - - Collection<SpeciesBatch> notImportedSpeciesBatches = - (Collection<SpeciesBatch>) notImportedData.get(MultiPostImportService.BATCHES_KEY); - - for (SpeciesBatch sb : notImportedSpeciesBatches) { - builder.append("- ").append(decorate(sb.getSpecies())).append(" / ").append(decorate(sb.getSampleCategoryValue())).append("\n"); - } - - return builder.toString(); - - } - } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java index dc2d351..02bb679 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java @@ -22,34 +22,33 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; -import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ImportMultiPostActionSupport; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import java.io.File; -import java.util.Collection; -import java.util.Map; -import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - chemit@codelutin.com * @since 4.5 */ -public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPostSpeciesSupportAction{ public ImportMultiPostSpeciesOnlyFrequenciesAction(SpeciesBatchUIHandler handler) { super(handler); } @Override + public boolean isImportFrequencies() { + return true; + } + + @Override + public boolean isImportIndivudalObservations() { + return false; + } + + @Override protected String getFileExtension() { return "tuttiSpeciesOnlyFrequencies"; } @@ -74,39 +73,4 @@ public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPost return t("tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.success", file); } - @Override - protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - - return multiPostImportExportService.importSpecies(file, operation, true, false); - - } - - @Override - protected String buildNotImportedDataReportText(Map<String, Object> notImportedData) { - - WeightUnit speciesWeightUnit = getConfig().getSpeciesWeightUnit(); - - StringBuilder builder = new StringBuilder(); - - Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); - addNotImportedWeightToReport(builder, totalSortedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.totalSortedWeight")); - - Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); - addNotImportedWeightToReport(builder, inertWeight, speciesWeightUnit, n("tutti.multiPostImportLog.inertWeight")); - - Float livingNotItemizedWeight = - (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); - addNotImportedWeightToReport(builder, livingNotItemizedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.livingNotItemizedWeight")); - - Collection<SpeciesBatch> notImportedSpeciesBatches = - (Collection<SpeciesBatch>) notImportedData.get(MultiPostImportService.BATCHES_KEY); - - for (SpeciesBatch sb : notImportedSpeciesBatches) { - builder.append("- ").append(decorate(sb.getSpecies())).append(" / ").append(decorate(sb.getSampleCategoryValue())).append("\n"); - } - - return builder.toString(); - - } - } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java index ca6a22c..87d69bd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -22,34 +22,33 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; -import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ImportMultiPostActionSupport; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import java.io.File; -import java.util.Collection; -import java.util.Map; -import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - chemit@codelutin.com * @since 4.5 */ -public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends ImportMultiPostSpeciesSupportAction { public ImportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesBatchUIHandler handler) { super(handler); } @Override + public boolean isImportFrequencies() { + return false; + } + + @Override + public boolean isImportIndivudalObservations() { + return true; + } + + @Override protected String getFileExtension() { return "tuttiSpeciesOnlyIndividualObservations"; } @@ -74,39 +73,4 @@ public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends Impo return t("tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.success", file); } - @Override - protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - - return multiPostImportExportService.importSpecies(file, operation, false, true); - - } - - @Override - protected String buildNotImportedDataReportText(Map<String, Object> notImportedData) { - - WeightUnit speciesWeightUnit = getConfig().getSpeciesWeightUnit(); - - StringBuilder builder = new StringBuilder(); - - Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); - addNotImportedWeightToReport(builder, totalSortedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.totalSortedWeight")); - - Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); - addNotImportedWeightToReport(builder, inertWeight, speciesWeightUnit, n("tutti.multiPostImportLog.inertWeight")); - - Float livingNotItemizedWeight = - (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); - addNotImportedWeightToReport(builder, livingNotItemizedWeight, speciesWeightUnit, n("tutti.multiPostImportLog.livingNotItemizedWeight")); - - Collection<SpeciesBatch> notImportedSpeciesBatches = - (Collection<SpeciesBatch>) notImportedData.get(MultiPostImportService.BATCHES_KEY); - - for (SpeciesBatch sb : notImportedSpeciesBatches) { - builder.append("- ").append(decorate(sb.getSpecies())).append(" / ").append(decorate(sb.getSampleCategoryValue())).append("\n"); - } - - return builder.toString(); - - } - } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesSupportAction.java similarity index 72% copy from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java copy to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesSupportAction.java index 80daa5e..02d8c0f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesSupportAction.java @@ -37,52 +37,30 @@ import java.util.Collection; import java.util.Map; import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - chemit@codelutin.com * @since 4.5 */ -public class ImportMultiPostSpeciesFullAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public abstract class ImportMultiPostSpeciesSupportAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ImportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { + protected ImportMultiPostSpeciesSupportAction(SpeciesBatchUIHandler handler) { super(handler); } - @Override - protected String getFileExtension() { - return "tuttiSpeciesFull"; - } + public abstract boolean isImportFrequencies(); - @Override - protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpeciesFull"); - } - - @Override - protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.title"); - } - - @Override - protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.button"); - } - - @Override - protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.importMultiPostFull.success", file); - } + public abstract boolean isImportIndivudalObservations(); @Override - protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { + protected final Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - return multiPostImportExportService.importSpecies(file, operation, true, true); + return multiPostImportExportService.importSpecies(file, operation, isImportFrequencies(), isImportIndivudalObservations()); } @Override - protected String buildNotImportedDataReportText(Map<String, Object> notImportedData) { + protected final String buildNotImportedDataReportText(Map<String, Object> notImportedData) { WeightUnit speciesWeightUnit = getConfig().getSpeciesWeightUnit(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.