Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4efa256e by Tony CHEMIT at 2017-06-09T16:58:55+02:00 fix merge from develop-7.x - - - - - 27ddfc10 by Tony CHEMIT at 2017-06-09T17:00:13+02:00 Synchro avancée référentiel/marées, écran inutile (See #773) - - - - - 2 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -151,6 +151,8 @@ observe.type.nonTargetSamples=Muestreos de fauna accesoria observe.type.objectFate=Futuro del objeto observe.type.objectFates=Futuros del objeto observe.type.objectMaterial=Objet flottant Matériel \#TODO +observe.type.objectMaterialHierarchies=Hiérarchies de matériel d'objet flottant \#TODO +observe.type.objectMaterialHierarchy=Hiérarchie de matériel d'objet flottant \#TODO observe.type.objectMaterials=Objet flottant matériaux \#TODO observe.type.objectObservedSpecies=Fauna observada observe.type.objectOperation=Operación sobre el objeto ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java @@ -28,22 +28,28 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; +import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateUI; +import fr.ird.observe.application.swing.ui.admin.export.ExportUI; import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; +import fr.ird.observe.application.swing.ui.admin.validate.ValidateUI; +import java.awt.Component; +import java.util.Arrays; +import java.util.Date; +import javax.swing.Icon; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.border.TitledBorder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import javax.swing.Icon; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.border.TitledBorder; -import java.awt.Component; -import java.util.Arrays; -import java.util.Date; import static org.nuiton.i18n.I18n.t; @@ -225,11 +231,74 @@ public class AdminUIHandler implements UIHandler<AdminUI> { } + if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.REFERENTIAL_SYNCHRONIZE) == WizardState.PENDING) { + ReferentialSynchroUI tabUI = (ReferentialSynchroUI) ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.DATA_SYNCHRONIZE.ordinal() && newStep == AdminStep.DATA_SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.DATA_SYNCHRONIZE) == WizardState.PENDING) { + DataSynchroUI tabUI = (DataSynchroUI) ui.getStepUI(AdminStep.DATA_SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.CONSOLIDATE.ordinal() && newStep == AdminStep.CONSOLIDATE) { + + if (ui.getModel().getStepState(AdminStep.CONSOLIDATE) == WizardState.PENDING) { + ConsolidateUI tabUI = (ConsolidateUI) ui.getStepUI(AdminStep.CONSOLIDATE); + tabUI.getStartButton().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.SYNCHRONIZE.ordinal() && newStep == AdminStep.SYNCHRONIZE) { + + if (ui.getModel().getStepState(AdminStep.SYNCHRONIZE) == WizardState.PENDING) { + SynchronizeUI tabUI = (SynchronizeUI) ui.getStepUI(AdminStep.SYNCHRONIZE); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.VALIDATE.ordinal() && newStep == AdminStep.VALIDATE) { + + if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) { + ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE); + tabUI.getStartButton().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.SAVE_LOCAL.ordinal() && newStep == AdminStep.SAVE_LOCAL) { + + if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) { + SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); + tabUI.getStartAction().doClick(); + } + + } + + if (oldStep != null && oldStep.ordinal() < AdminStep.EXPORT_DATA.ordinal() && newStep == AdminStep.EXPORT_DATA) { + + if (ui.getModel().getStepState(AdminStep.EXPORT_DATA) == WizardState.PENDING) { + ExportUI tabUI = (ExportUI) ui.getStepUI(AdminStep.EXPORT_DATA); + tabUI.getPrepareAction().doClick(); + } + + } + if (c != null && c.getStep() == AdminStep.SAVE_LOCAL) { // on met a jour le descriptif - SaveLocalUI saveUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); - saveUI.getHandler().updateText(); + SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); + tabUI.getHandler().updateText(); } if (c != null && c.getStep() == AdminStep.SHOW_RESUME) { @@ -259,7 +328,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { /** * Call back lorsque l'état du modèle a changé. - * + * <p> * Ici, on va rendre accessible (ou pas) les onglets selon l'état du modèle. * * @param newState le nouvel état. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04e1611642041865902d1fa1c4a... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/04e1611642041865902d1fa1c4a... You're receiving this email because of your account on gitlab.com.