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 4009b38c355a50df21270b189f222e6e1cf0916d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 3 13:36:28 2015 +0200 refs #6891: [TECH] erreur à la réouverture de l'écran d'import --- .../actions/AbstractChangeScreenAction.java | 36 ++++++++++++++++++++++ .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/actions/EditSelectedCruiseAction.java | 4 +++ .../content/actions/EditSelectedProgramAction.java | 3 ++ .../actions/OpenGenericFormatExportScreen.java | 21 ++----------- .../actions/OpenGenericFormatImportScreen.java | 21 ++----------- .../content/actions/OpenReportScreenAction.java | 12 +++----- .../OpenTemporaryReferentialScreenAction.java | 1 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 1 + .../content/home/actions/EditCruiseAction.java | 1 + .../content/home/actions/EditProgramAction.java | 1 + .../content/home/actions/NewCruiseAction.java | 1 + .../content/home/actions/NewProgramAction.java | 1 + .../ManageTemporaryReferentialUIHandler.java | 2 -- .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +++------ 16 files changed, 70 insertions(+), 56 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java index fbb743c..2b63618 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java @@ -22,12 +22,15 @@ package fr.ifremer.tutti.ui.swing.content.actions; * #L% */ +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXContextEntryDef; +import static org.nuiton.i18n.I18n.t; + /** * Action to change the screen. * <p/> @@ -113,4 +116,37 @@ public abstract class AbstractChangeScreenAction extends AbstractMainUITuttiActi } } + protected void loadReferantials(boolean createProgressionModel) { + + + ProgressionModel progressionModel; + + if (createProgressionModel) { + + progressionModel = new ProgressionModel(); + progressionModel.setTotal(5); + setProgressionModel(progressionModel); + + } else { + + progressionModel = getProgressionModel(); + + } + + progressionModel.increments(t("tutti.openScreen.step.loading.allGear")); + getContext().getPersistenceService().getAllGear(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allPerson")); + getContext().getPersistenceService().getAllPerson(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allSpecies")); + getContext().getPersistenceService().getAllSpecies(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allVessel")); + getContext().getPersistenceService().getAllVessel(); + + progressionModel.increments(t("tutti.openScreen.step.loading.ui")); + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java index 88fdd74..3c95500 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java @@ -52,6 +52,7 @@ public class EditCatchesForSelectedCruiseAction extends AbstractChangeScreenActi log.info("Edit operations of cruise: " + getContext().getCruiseId()); } getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_EDIT); + loadReferantials(true); super.doAction(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedCruiseAction.java index 3f18425..0834cd2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedCruiseAction.java @@ -47,11 +47,15 @@ public class EditSelectedCruiseAction extends AbstractChangeScreenAction { @Override public void doAction() throws Exception { + Preconditions.checkState(getContext().isCruiseFilled()); if (log.isInfoEnabled()) { log.info("Edit cruise: " + getContext().getCruiseId()); } getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_EDIT); + + loadReferantials(true); super.doAction(); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedProgramAction.java index f76d9ee..a2b4ff0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditSelectedProgramAction.java @@ -45,11 +45,14 @@ public class EditSelectedProgramAction extends AbstractChangeScreenAction { @Override public void doAction() throws Exception { + Preconditions.checkState(getContext().isProgramFilled()); if (log.isInfoEnabled()) { log.info("Edit program: " + getContext().getProgramId()); } + loadReferantials(true); super.doAction(); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java index 9a53df4..fbd71c6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java @@ -27,8 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.actions; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n.t; - /** * Created on 3/29/15. * @@ -44,22 +42,9 @@ public class OpenGenericFormatExportScreen extends AbstractChangeScreenAction { @Override public void doAction() throws Exception { - createProgressionModelIfRequired(5); - - getProgressionModel().increments(t("tutti.openGenericFormatExportScreen.step.loading.allGear")); - getContext().getPersistenceService().getAllGear(); - - getProgressionModel().increments(t("tutti.openGenericFormatExportScreen.step.loading.allPerson")); - getContext().getPersistenceService().getAllPerson(); - - getProgressionModel().increments(t("tutti.openGenericFormatExportScreen.step.loading.allSpecies")); - getContext().getPersistenceService().getAllSpecies(); - - getProgressionModel().increments(t("tutti.openGenericFormatExportScreen.step.loading.allVessel")); - getContext().getPersistenceService().getAllVessel(); - - getProgressionModel().increments(t("tutti.openGenericFormatExportScreen.step.loading.ui")); - + loadReferantials(true); super.doAction(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java index 3199d31..0d37085 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java @@ -27,8 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.actions; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n.t; - /** * Created on 2/24/15. * @@ -44,22 +42,9 @@ public class OpenGenericFormatImportScreen extends AbstractChangeScreenAction { @Override public void doAction() throws Exception { - createProgressionModelIfRequired(5); - - getProgressionModel().increments(t("tutti.openGenericFormatImportScreen.step.loading.allGear")); - getContext().getPersistenceService().getAllGear(); - - getProgressionModel().increments(t("tutti.openGenericFormatImportScreen.step.loading.allPerson")); - getContext().getPersistenceService().getAllPerson(); - - getProgressionModel().increments(t("tutti.openGenericFormatImportScreen.step.loading.allSpecies")); - getContext().getPersistenceService().getAllSpecies(); - - getProgressionModel().increments(t("tutti.openGenericFormatImportScreen.step.loading.allVessel")); - getContext().getPersistenceService().getAllVessel(); - - getProgressionModel().increments(t("tutti.openGenericFormatImportScreen.step.loading.ui")); - + loadReferantials(true); super.doAction(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenReportScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenReportScreenAction.java index 042eaf9..f3abc9b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenReportScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenReportScreenAction.java @@ -24,8 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.actions; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * To show report screen. @@ -35,18 +33,16 @@ import org.apache.commons.logging.LogFactory; */ public class OpenReportScreenAction extends AbstractChangeScreenAction { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenReportScreenAction.class); - public OpenReportScreenAction(MainUIHandler handler) { super(handler, true, TuttiScreen.REPORT); } @Override public void doAction() throws Exception { - if (log.isDebugEnabled()) { - log.debug("Show report screen"); - } + + loadReferantials(true); super.doAction(); + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java index a7d4a77..10fae3d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java @@ -58,6 +58,7 @@ public class OpenTemporaryReferentialScreenAction extends AbstractChangeScreenAc @Override public void doAction() throws Exception { super.doAction(); + loadReferantials(true); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css index ad2e9e3..7a1ed57 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css @@ -58,6 +58,7 @@ BeanFilterableComboBox { #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; + enabled: {model.getProgram() != null}; _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.EditProgramAction.class}; toolTipText: "tutti.selectCruise.action.editProgram.tip"; _help: {"tutti.selectCruise.action.editProgram.help"}; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCruiseAction.java index 0fe17da..22a9154 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCruiseAction.java @@ -45,6 +45,7 @@ public class EditCruiseAction extends AbstractChangeScreenAction { Preconditions.checkState(getContext().isProgramFilled()); Preconditions.checkState(getContext().isCruiseFilled()); getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_EDIT); + loadReferantials(true); super.doAction(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProgramAction.java index 01a852c..62046ca 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProgramAction.java @@ -50,6 +50,7 @@ public class EditProgramAction extends AbstractChangeScreenAction { if (log.isInfoEnabled()) { log.info("Edit program: " + getContext().getProgramId()); } + loadReferantials(true); super.doAction(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewCruiseAction.java index 964666f..491e4e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewCruiseAction.java @@ -43,6 +43,7 @@ public class NewCruiseAction extends AbstractChangeScreenAction { public void doAction() throws Exception { getContext().setCruiseId(null); getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_EDIT); + loadReferantials(true); super.doAction(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewProgramAction.java index c49f2c8..17f3998 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/NewProgramAction.java @@ -44,6 +44,7 @@ public class NewProgramAction extends AbstractChangeScreenAction { getContext().setProgramId(null); getContext().setCruiseId(null); getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_EDIT); + loadReferantials(true); super.doAction(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java index 63cadac..2c3638b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java @@ -50,8 +50,6 @@ public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler< private static final Log log = LogFactory.getLog(ManageTemporaryReferentialUIHandler.class); - protected JComponent currentBody; - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// 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 bab5777..1c832ae 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 @@ -1864,6 +1864,11 @@ tutti.openReplaceTemporaryUI.open.dialog= tutti.openReplaceTemporaryVesselUI.loading.source= tutti.openReplaceTemporaryVesselUI.loading.target= tutti.openReplaceTemporaryVesselUI.open.dialog= +tutti.openScreen.step.loading.allGear= +tutti.openScreen.step.loading.allPerson= +tutti.openScreen.step.loading.allSpecies= +tutti.openScreen.step.loading.allVessel= +tutti.openScreen.step.loading.ui= tutti.option.cancel= tutti.option.cancelExport= tutti.option.cancelImport= 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 7d9e1ee..b44bd2b 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 @@ -1754,19 +1754,14 @@ tutti.openDb.step.checkSchemaVersion=Vérification de la compatibilité de la ba tutti.openDb.step.open=Ouverture de la base <strong>%s</strong> tutti.openDb.step.updateReferential= tutti.openDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s -tutti.openGenericFormatExportScreen.step.loading.allGear=Chargement du référentiel Engin -tutti.openGenericFormatExportScreen.step.loading.allPerson=Chargement du référentiel Personne -tutti.openGenericFormatExportScreen.step.loading.allSpecies=Chargement du référentiel Taxinomique -tutti.openGenericFormatExportScreen.step.loading.allVessel=Chargement du référentiel Navire -tutti.openGenericFormatExportScreen.step.loading.ui=Chargement des interfaces graphiques -tutti.openGenericFormatImportScreen.step.loading.allGear=Chargement du référentiel Engin -tutti.openGenericFormatImportScreen.step.loading.allPerson=Chargement du référentiel Personne -tutti.openGenericFormatImportScreen.step.loading.allSpecies=Chargement du référentiel Taxinomique -tutti.openGenericFormatImportScreen.step.loading.allVessel=Chargement du référentiel Navire -tutti.openGenericFormatImportScreen.step.loading.ui=Chargement des interfaces graphiques tutti.openReplaceTemporaryUI.loading.source=Chargement des référentiels temporaires de type %s tutti.openReplaceTemporaryUI.loading.target=Chargement des référentiels officiels de type %s tutti.openReplaceTemporaryUI.open.dialog=Ouverture de l'interface graphique +tutti.openScreen.step.loading.allGear=Chargement du référentiel Engin +tutti.openScreen.step.loading.allPerson=Chargement du référentiel Personne +tutti.openScreen.step.loading.allSpecies=Chargement du référentiel Taxinomique +tutti.openScreen.step.loading.allVessel=Chargement du référentiel Navire +tutti.openScreen.step.loading.ui=Chargement des interfaces graphiques tutti.option.cancel=Annuler tutti.option.cancelExport=Annuler l'export tutti.option.cancelImport=Annuler l'import -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.