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 5792acafe3b3510203341a1a0400ebc74d290433 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:12:30 2014 +0100 refs #6105 (renommage des actions + fix NPE quand capture non modifiée --- ...MultiPostAction.java => ExportMultiPostAccidentalAction.java} | 6 +++--- ...ortMultiPostAction.java => ExportMultiPostActionSupport.java} | 8 +++++--- ...hosMultiPostAction.java => ExportMultiPostBenthosAction.java} | 4 ++-- ...CatchMultiPostAction.java => ExportMultiPostCatchAction.java} | 4 ++-- ...tion.java => ExportMultiPostIndividualObservationAction.java} | 6 +++--- ...ltiPostAction.java => ExportMultiPostMarineLitterAction.java} | 4 ++-- ...iesMultiPostAction.java => ExportMultiPostSpeciesAction.java} | 4 ++-- ...MultiPostAction.java => ImportMultiPostAccidentalAction.java} | 6 +++--- ...ortMultiPostAction.java => ImportMultiPostActionSupport.java} | 9 +++++---- ...hosMultiPostAction.java => ImportMultiPostBenthosAction.java} | 4 ++-- ...CatchMultiPostAction.java => ImportMultiPostCatchAction.java} | 4 ++-- ...tion.java => ImportMultiPostIndividualObservationAction.java} | 6 +++--- ...ltiPostAction.java => ImportMultiPostMarineLitterAction.java} | 4 ++-- ...iesMultiPostAction.java => ImportMultiPostSpeciesAction.java} | 4 ++-- .../tutti/ui/swing/content/operation/catches/EditCatchesUI.css | 4 ++-- .../content/operation/catches/accidental/AccidentalBatchUI.css | 4 ++-- .../swing/content/operation/catches/benthos/BenthosBatchUI.css | 4 ++-- .../individualobservation/IndividualObservationBatchUI.css | 4 ++-- .../operation/catches/marinelitter/MarineLitterBatchUI.css | 4 ++-- .../swing/content/operation/catches/species/SpeciesBatchUI.css | 4 ++-- 20 files changed, 50 insertions(+), 47 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostAccidentalAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostAccidentalAction.java index b966ec2..bb81a9a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostAccidentalAction.java @@ -36,10 +36,10 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ExportAccidentalMultiPostAction - extends AbstractExportMultiPostAction<AccidentalBatchUIModel, AccidentalBatchUI, AccidentalBatchUIHandler> { +public class ExportMultiPostAccidentalAction + extends ExportMultiPostActionSupport<AccidentalBatchUIModel, AccidentalBatchUI, AccidentalBatchUIHandler> { - public ExportAccidentalMultiPostAction(AccidentalBatchUIHandler handler) { + public ExportMultiPostAccidentalAction(AccidentalBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java similarity index 96% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java index 7ab9621..7840173 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java @@ -42,7 +42,7 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public abstract class AbstractExportMultiPostAction<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> +public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> extends AbstractTuttiAction<M, UI, H> { /** @@ -72,7 +72,7 @@ public abstract class AbstractExportMultiPostAction<M extends AbstractBean, UI e protected abstract void doExport(MultiPostExportService multiPostImportExportService, File file, FishingOperation fishingOperation); - public AbstractExportMultiPostAction(H handler) { + public ExportMultiPostActionSupport(H handler) { super(handler, false); } @@ -88,6 +88,8 @@ public abstract class AbstractExportMultiPostAction<M extends AbstractBean, UI e if (doAction) { + doSaveCatches = false; + EditCatchesUI catchesUI = getEditCatchUI(); EditCatchesUIModel model = catchesUI.getModel(); @@ -95,7 +97,7 @@ public abstract class AbstractExportMultiPostAction<M extends AbstractBean, UI e boolean canSave = model.isModify() && model.isValid(); - // ask user to save before export (otherwise some data can't be export) + // ask user to save before export (otherwise some data won't be exported) if (canSave) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java index f539732..c0bdacd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java @@ -36,9 +36,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ExportBenthosMultiPostAction extends AbstractExportMultiPostAction<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { +public class ExportMultiPostBenthosAction extends ExportMultiPostActionSupport<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { - public ExportBenthosMultiPostAction(BenthosBatchUIHandler handler) { + public ExportMultiPostBenthosAction(BenthosBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCatchMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java similarity index 89% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCatchMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java index 6a8f34c..b9a69ac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCatchMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java @@ -16,9 +16,9 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class ExportCatchMultiPostAction extends AbstractExportMultiPostAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { +public class ExportMultiPostCatchAction extends ExportMultiPostActionSupport<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { - public ExportCatchMultiPostAction(EditCatchesUIHandler handler) { + public ExportMultiPostCatchAction(EditCatchesUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostIndividualObservationAction.java similarity index 90% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostIndividualObservationAction.java index d4573a1..41296d8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostIndividualObservationAction.java @@ -36,10 +36,10 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ExportIndividualObservationMultiPostAction - extends AbstractExportMultiPostAction<IndividualObservationBatchUIModel, IndividualObservationBatchUI, IndividualObservationBatchUIHandler> { +public class ExportMultiPostIndividualObservationAction + extends ExportMultiPostActionSupport<IndividualObservationBatchUIModel, IndividualObservationBatchUI, IndividualObservationBatchUIHandler> { - public ExportIndividualObservationMultiPostAction(IndividualObservationBatchUIHandler handler) { + public ExportMultiPostIndividualObservationAction(IndividualObservationBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostMarineLitterAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostMarineLitterAction.java index 680cb48..7759be9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostMarineLitterAction.java @@ -36,9 +36,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ExportMarineLitterMultiPostAction extends AbstractExportMultiPostAction<MarineLitterBatchUIModel, MarineLitterBatchUI, MarineLitterBatchUIHandler> { +public class ExportMultiPostMarineLitterAction extends ExportMultiPostActionSupport<MarineLitterBatchUIModel, MarineLitterBatchUI, MarineLitterBatchUIHandler> { - public ExportMarineLitterMultiPostAction(MarineLitterBatchUIHandler handler) { + public ExportMultiPostMarineLitterAction(MarineLitterBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostSpeciesAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostSpeciesAction.java index c33b8a5..00ae152 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostSpeciesAction.java @@ -36,9 +36,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ExportSpeciesMultiPostAction extends AbstractExportMultiPostAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ExportMultiPostSpeciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ExportSpeciesMultiPostAction(SpeciesBatchUIHandler handler) { + public ExportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostAccidentalAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostAccidentalAction.java index 4dfa7b7..f54af7f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostAccidentalAction.java @@ -37,10 +37,10 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ImportAccidentalMultiPostAction - extends AbstractImportMultiPostAction<AccidentalBatchUIModel, AccidentalBatchUI, AccidentalBatchUIHandler> { +public class ImportMultiPostAccidentalAction + extends ImportMultiPostActionSupport<AccidentalBatchUIModel, AccidentalBatchUI, AccidentalBatchUIHandler> { - public ImportAccidentalMultiPostAction(AccidentalBatchUIHandler handler) { + public ImportMultiPostAccidentalAction(AccidentalBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostActionSupport.java similarity index 97% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostActionSupport.java index 5c219aa..47ea4a3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostActionSupport.java @@ -48,7 +48,7 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public abstract class AbstractImportMultiPostAction<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> +public abstract class ImportMultiPostActionSupport<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> extends AbstractTuttiAction<M, UI, H> { /** @@ -83,7 +83,7 @@ public abstract class AbstractImportMultiPostAction<M extends AbstractBean, UI e protected abstract Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation); - public AbstractImportMultiPostAction(H handler) { + public ImportMultiPostActionSupport(H handler) { super(handler, false); } @@ -94,13 +94,13 @@ public abstract class AbstractImportMultiPostAction<M extends AbstractBean, UI e if (doAction) { + doResetCatches = doSaveCatches = false; + EditCatchesUI catchesUI = getEditCatchUI(); EditCatchesUIModel model = catchesUI.getModel(); boolean canSave = model.isModify() && model.isValid(); - doResetCatches = doSaveCatches = false; - if (canSave) { // ask user to save before export (otherwise some data can't be export) @@ -160,6 +160,7 @@ public abstract class AbstractImportMultiPostAction<M extends AbstractBean, UI e public final void releaseAction() { file = null; doSaveCatches = null; + doResetCatches = null; notImportedData = null; super.releaseAction(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostBenthosAction.java similarity index 95% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostBenthosAction.java index b1776ea..c27f527 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostBenthosAction.java @@ -42,9 +42,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ImportBenthosMultiPostAction extends AbstractImportMultiPostAction<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { +public class ImportMultiPostBenthosAction extends ImportMultiPostActionSupport<BenthosBatchUIModel, BenthosBatchUI, BenthosBatchUIHandler> { - public ImportBenthosMultiPostAction(BenthosBatchUIHandler handler) { + public ImportMultiPostBenthosAction(BenthosBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCatchMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java similarity index 94% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCatchMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java index 2ebd268..ee2f105 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCatchMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java @@ -20,9 +20,9 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class ImportCatchMultiPostAction extends AbstractImportMultiPostAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { +public class ImportMultiPostCatchAction extends ImportMultiPostActionSupport<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { - public ImportCatchMultiPostAction(EditCatchesUIHandler handler) { + public ImportMultiPostCatchAction(EditCatchesUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostIndividualObservationAction.java similarity index 90% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostIndividualObservationAction.java index df1c978..f279581 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostIndividualObservationAction.java @@ -37,10 +37,10 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ImportIndividualObservationMultiPostAction - extends AbstractImportMultiPostAction<IndividualObservationBatchUIModel, IndividualObservationBatchUI, IndividualObservationBatchUIHandler> { +public class ImportMultiPostIndividualObservationAction + extends ImportMultiPostActionSupport<IndividualObservationBatchUIModel, IndividualObservationBatchUI, IndividualObservationBatchUIHandler> { - public ImportIndividualObservationMultiPostAction(IndividualObservationBatchUIHandler handler) { + public ImportMultiPostIndividualObservationAction(IndividualObservationBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostMarineLitterAction.java similarity index 94% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostMarineLitterAction.java index 5226d8e..32f0c3e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostMarineLitterAction.java @@ -42,9 +42,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ImportMarineLitterMultiPostAction extends AbstractImportMultiPostAction<MarineLitterBatchUIModel, MarineLitterBatchUI, MarineLitterBatchUIHandler> { +public class ImportMultiPostMarineLitterAction extends ImportMultiPostActionSupport<MarineLitterBatchUIModel, MarineLitterBatchUI, MarineLitterBatchUIHandler> { - public ImportMarineLitterMultiPostAction(MarineLitterBatchUIHandler handler) { + public ImportMultiPostMarineLitterAction(MarineLitterBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostSpeciesAction.java similarity index 95% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostSpeciesAction.java index 7fae152..36c50a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostSpeciesAction.java @@ -42,9 +42,9 @@ import static org.nuiton.i18n.I18n.t; * @author kmorin <kmorin@codelutin.com> * @since 2.2 */ -public class ImportSpeciesMultiPostAction extends AbstractImportMultiPostAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ImportSpeciesMultiPostAction(SpeciesBatchUIHandler handler) { + public ImportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { super(handler); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css index fe28775..8a9d97b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css @@ -366,7 +366,7 @@ ComputableDataEditor { text: "tutti.editCatchBatch.action.importMultiPost"; toolTipText: "tutti.editCatchBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editCatchBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportCatchMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostCatchAction.class}; _help: {"tutti.editCatchBatch.action.importMultiPost.help"}; } @@ -375,7 +375,7 @@ ComputableDataEditor { text: "tutti.editCatchBatch.action.exportMultiPost"; toolTipText: "tutti.editCatchBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editCatchBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportCatchMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostCatchAction.class}; _help: {"tutti.editCatchBatch.action.exportMultiPost.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css index 540ea59..0e6bbe8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css @@ -52,7 +52,7 @@ NumberEditor { text: "tutti.editAccidentalBatch.action.importMultiPost"; toolTipText: "tutti.editAccidentalBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editAccidentalBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportAccidentalMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostAccidentalAction.class}; _help: {"tutti.editAccidentalBatch.action.importMultiPost.help"}; } @@ -61,7 +61,7 @@ NumberEditor { text: "tutti.editAccidentalBatch.action.exportMultiPost"; toolTipText: "tutti.editAccidentalBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editAccidentalBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportAccidentalMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostAccidentalAction.class}; _help: {"tutti.editAccidentalBatch.action.exportMultiPost.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css index d05dfac..beb6d52 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css @@ -270,7 +270,7 @@ ComputableDataEditor { text: "tutti.editBenthosBatch.action.importMultiPost"; toolTipText: "tutti.editBenthosBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editBenthosBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportBenthosMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostBenthosAction.class}; _help: {"tutti.editBenthosBatch.action.importMultiPost.help"}; } @@ -279,7 +279,7 @@ ComputableDataEditor { text: "tutti.editBenthosBatch.action.exportMultiPost"; toolTipText: "tutti.editBenthosBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editBenthosBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportBenthosMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostBenthosAction.class}; _help: {"tutti.editBenthosBatch.action.exportMultiPost.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css index ef36d41..3d05e6a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css @@ -46,7 +46,7 @@ text: "tutti.editIndividualObservationBatch.action.importMultiPost"; toolTipText: "tutti.editIndividualObservationBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editIndividualObservationBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportIndividualObservationMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostIndividualObservationAction.class}; _help: {"tutti.editIndividualObservationBatch.action.importMultiPost.help"}; } @@ -55,7 +55,7 @@ text: "tutti.editIndividualObservationBatch.action.exportMultiPost"; toolTipText: "tutti.editIndividualObservationBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editIndividualObservationBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportIndividualObservationMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostIndividualObservationAction.class}; _help: {"tutti.editIndividualObservationBatch.action.exportMultiPost.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css index 514a2a3..e24b0e1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css @@ -69,7 +69,7 @@ ComputableDataEditor { text: "tutti.editMarineLitterBatch.action.importMultiPost"; toolTipText: "tutti.editMarineLitterBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editMarineLitterBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMarineLitterMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostMarineLitterAction.class}; _help: {"tutti.editMarineLitterBatch.action.importMultiPost.help"}; } @@ -78,7 +78,7 @@ ComputableDataEditor { text: "tutti.editMarineLitterBatch.action.exportMultiPost"; toolTipText: "tutti.editMarineLitterBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editMarineLitterBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMarineLitterMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostMarineLitterAction.class}; _help: {"tutti.editMarineLitterBatch.action.exportMultiPost.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css index a8652cf..f25f4ec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css @@ -273,7 +273,7 @@ ComputableDataEditor { text: "tutti.editSpeciesBatch.action.importMultiPost"; toolTipText: "tutti.editSpeciesBatch.action.importMultiPost.tip"; i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportSpeciesMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportMultiPostSpeciesAction.class}; _help: {"tutti.editSpeciesBatch.action.importMultiPost.help"}; } @@ -282,7 +282,7 @@ ComputableDataEditor { text: "tutti.editSpeciesBatch.action.exportMultiPost"; toolTipText: "tutti.editSpeciesBatch.action.exportMultiPost.tip"; i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportSpeciesMultiPostAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportMultiPostSpeciesAction.class}; _help: {"tutti.editSpeciesBatch.action.exportMultiPost.help"}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.