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 0f362eca833e5b5d5aec8eda4ea4324e95ab13dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:15:23 2015 +0100 refs #6805 Bien rafraichir les ecrans suite à un import --- .../actions/ImportTemporaryActionSupport.java | 95 ++++++++++++++++++++++ .../actions/ImportTemporaryGearAction.java | 64 +++++---------- .../actions/ImportTemporaryPersonAction.java | 66 +++++---------- .../actions/ImportTemporarySpeciesAction.java | 62 ++++---------- .../actions/ImportTemporaryVesselAction.java | 62 ++++---------- 5 files changed, 168 insertions(+), 181 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java new file mode 100644 index 0000000..e80c0eb --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java @@ -0,0 +1,95 @@ +package fr.ifremer.tutti.ui.swing.content.referential.actions; + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; +import fr.ifremer.tutti.service.referential.ReferentialImportResult; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +/** + * Created on 3/25/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public abstract class ImportTemporaryActionSupport<E extends TuttiReferentialEntity> extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ImportTemporaryActionSupport.class); + + private File file; + + private ReferentialImportResult<E> result; + + protected abstract File chooseImportFile(); + + protected abstract ReferentialImportResult<E> doImport(File file); + + protected abstract void postSuccessAction(File file, ReferentialImportResult<E> result) ; + + public ImportTemporaryActionSupport(ManageTemporaryReferentialUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + if (doAction) { + + // choose file to import + file = chooseImportFile(); + + doAction = file != null; + } + return doAction; + + } + + @Override + public void releaseAction() { + file = null; + result = null; + super.releaseAction(); + } + + @Override + public void doAction() throws Exception { + Preconditions.checkNotNull(file); + if (log.isInfoEnabled()) { + log.info("Will import temporary referential from file: " + file); + } + + result = doImport(file); + + } + + @Override + public void postSuccessAction() { + + super.postSuccessAction(); + + postSuccessAction(file, result); + + } + + protected void reloadCruise() { + if (getDataContext().isCruiseFilled()) { + getDataContext().reloadCruise(); + } + } + + protected void reloadFishingOperation() { + if (getDataContext().isFishingOperationFilled()) { + getDataContext().reloadFishingOperation(); + } + } + +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java index 452a5d3..2d74181 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryGearService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,54 +37,35 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryGearAction extends ImportTemporaryActionSupport<Gear> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryGearAction.class); - - private File file; - - private ReferentialImportResult<Gear> result; public ImportTemporaryGearAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - if (doAction) { + protected File chooseImportFile() { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Gear> doImport(File file) { + + ReferentialTemporaryGearService service = getContext().getReferentialTemporaryGearService(); + ReferentialImportResult<Gear> importResult = service.importTemporaryGear(file); + return importResult; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import gear temporary " + - "referential from file: " + file); - } - - ReferentialTemporaryGearService service = getContext().getReferentialTemporaryGearService(); - result = service.importTemporaryGear(file); + protected void postSuccessAction(File file, ReferentialImportResult<Gear> result) { int nbRef = getModel().getNbTemporaryGears(); getModel().setNbTemporaryGears(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); @@ -98,12 +73,10 @@ public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporary // reset ui cache getDataContext().resetGears(); - getHandler().resetExportGearsAction(); - } + reloadCruise(); + reloadFishingOperation(); - @Override - public void postSuccessAction() { - super.postSuccessAction(); + getHandler().resetExportGearsAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.dialog.message", @@ -112,4 +85,5 @@ public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporary sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success", file)); } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java index af82a0b..992f7b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,68 +37,44 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryPersonAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryPersonAction.class); - - private File file; - - private ReferentialImportResult<Person> result; +public class ImportTemporaryPersonAction extends ImportTemporaryActionSupport<Person> { public ImportTemporaryPersonAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); + protected File chooseImportFile() { - if (doAction) { + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); - - doAction = file != null; - } - return doAction; - } - - @Override - public void releaseAction() { - file = null; - super.releaseAction(); } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import person temporary " + - "referential from file: " + file); - } + protected ReferentialImportResult<Person> doImport(File file) { ReferentialTemporaryPersonService service = getContext().getReferentialTemporaryPersonService(); + ReferentialImportResult<Person> importResult = service.importTemporaryPerson(file); + return importResult; - result = service.importTemporaryPerson(file); + } + + @Override + public void postSuccessAction(File file, ReferentialImportResult<Person> result) { int nbRef = getModel().getNbTemporaryPersons(); getModel().setNbTemporaryPersons(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetPersons(); + reloadCruise(); + reloadFishingOperation(); getHandler().resetExportPersonAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.dialog.message", @@ -112,5 +82,7 @@ public class ImportTemporaryPersonAction extends LongActionSupport<ManageTempora displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success", file)); + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java index b2ccb06..e06e89f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporarySpeciesService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,72 +37,50 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporarySpeciesAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporarySpeciesAction extends ImportTemporaryActionSupport<Species> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporarySpeciesAction.class); - - private File file; - - private ReferentialImportResult<Species> result; public ImportTemporarySpeciesAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { + protected File chooseImportFile() { - boolean doAction = super.prepareAction(); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - if (doAction) { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); - - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Species> doImport(File file) { + + ReferentialTemporarySpeciesService service = getContext().getReferentialTemporarySpeciesService(); + ReferentialImportResult<Species> result = service.importTemporarySpecies(file); + return result; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import species temporary " + - "referential from file: " + file); - } - - ReferentialTemporarySpeciesService service = getContext().getReferentialTemporarySpeciesService(); - result = service.importTemporarySpecies(file); + protected void postSuccessAction(File file, ReferentialImportResult<Species> result) { int nbRef = getModel().getNbTemporarySpecies(); getModel().setNbTemporarySpecies(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetSpecies(); + reloadFishingOperation(); getHandler().resetExportSpeciesAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - String title = t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.dialog.message", result.getNbRefAdded(), result.getNbRefUpdated(), result.getNbRefDeleted()); displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success", file)); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java index f93a316..035f298 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,66 +37,45 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryVesselAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryVesselAction extends ImportTemporaryActionSupport<Vessel> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryVesselAction.class); - - private File file; - - private ReferentialImportResult<Vessel> result; public ImportTemporaryVesselAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); + protected File chooseImportFile() { - if (doAction) { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Vessel> doImport(File file) { + + ReferentialTemporaryVesselService service = getContext().getReferentialTemporaryVesselService(); + ReferentialImportResult<Vessel> result = service.importTemporaryVessel(file); + return result; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import vessel temporary " + - "referential from file: " + file); - } - - ReferentialTemporaryVesselService service = getContext().getReferentialTemporaryVesselService(); - result = service.importTemporaryVessel(file); + protected void postSuccessAction(File file, ReferentialImportResult<Vessel> result) { int nbRef = getModel().getNbTemporaryVessels(); getModel().setNbTemporaryVessels(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetVessels(); + reloadCruise(); + reloadFishingOperation(); getHandler().resetExportVesselsAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.dialog.message", @@ -110,5 +83,6 @@ public class ImportTemporaryVesselAction extends LongActionSupport<ManageTempora displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success", file)); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.