[Observe-commits] [Git][ultreiaio/ird-observe][develop] Améliorer la transition vers l'onglet de sélection de données - Closes #1556

17 Jul 2020


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
bf051055 by Tony Chemit at 2020-07-17T22:19:21+02:00
Améliorer la transition vers l'onglet de sélection de données - Closes #1556

- - - - -


28 changed files:

- client-datasource-actions/src/main/i18n/getters/java.getter
- client-datasource-actions/src/main/i18n/getters/jaxx.getter
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/SelectData.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx
- − client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jcss
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java
- client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java
- observe-i18n/src/main/i18n/translations/observe_en_GB.properties
- observe-i18n/src/main/i18n/translations/observe_es_ES.properties
- observe-i18n/src/main/i18n/translations/observe_fr_FR.properties


Changes:

=====================================
client-datasource-actions/src/main/i18n/getters/java.getter
=====================================
@@ -3,6 +3,8 @@ observe.Id.validation.field.tip
 observe.Id.validation.message.tip
 observe.Id.validation.scope.tip
 observe.common.none
+observe.constant.AdminStep.SELECT_DATA
+observe.constant.AdminStep.SELECT_DATA.description
 observe.ui.action.admin.cancel
 observe.ui.action.admin.close
 observe.ui.action.apply


=====================================
client-datasource-actions/src/main/i18n/getters/jaxx.getter
=====================================
@@ -23,6 +23,7 @@ observe.ui.datasource.editor.actions.report.select
 observe.ui.datasource.editor.actions.report.select.file
 observe.ui.datasource.editor.actions.report.select.file.tip
 observe.ui.datasource.editor.actions.report.variables
+observe.ui.datasource.editor.actions.select.loading
 observe.ui.datasource.editor.actions.synchro.data.actionsToPerform
 observe.ui.datasource.editor.actions.synchro.referential.config.mode
 observe.ui.datasource.editor.actions.synchro.referential.obsolete.entities.list


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java
=====================================
@@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.actions;
 
 import fr.ird.observe.client.constants.DbMode;
 import fr.ird.observe.client.datasource.actions.config.ConfigUI;
+import fr.ird.observe.client.datasource.actions.config.SelectDataModel;
 import fr.ird.observe.client.datasource.actions.config.SelectDataUI;
 import fr.ird.observe.client.datasource.actions.consolidate.ConsolidateModel;
 import fr.ird.observe.client.datasource.actions.consolidate.ConsolidateUI;
@@ -77,9 +78,21 @@ public enum AdminStep implements WizardExtStep {
 
     /** pour selectionner les donnes */
     SELECT_DATA(
-            null,
+//            null,
+//            SelectDataUI.class,
+//            true
+            n("observe.constant.AdminStep.SELECT_DATA"),
+            n("observe.constant.AdminStep.SELECT_DATA.description"),
+            "synchronizeReferentiel",
+            n("observe.constant.AdminStep.SELECT_DATA"),
+            n("observe.constant.AdminStep.SELECT_DATA.description"),
+            SelectDataModel.class,
             SelectDataUI.class,
-            true
+            false,
+            false,
+            false,
+            false,
+            'S'
     ),
 
     /** pour résoudre les entités obosolètes */
@@ -435,6 +448,16 @@ public enum AdminStep implements WizardExtStep {
         return oldStep != null && oldStep.ordinal() < ordinal();
     }
 
+    /**
+     * Is this step is the new step and come from a greater step (in ordinal order) ?
+     *
+     * @param oldStep the step before
+     * @return {@code true} if new step is this step and old step has a greater ordinal, {@code false} otherwise
+     */
+    public boolean rewindToThisStep(AdminStep oldStep) {
+        return oldStep != null && oldStep.ordinal() > ordinal();
+    }
+
     public boolean isNeedReferentiel() {
         return needReferentiel;
     }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx
=====================================
@@ -81,8 +81,12 @@ public void propertyChange(PropertyChangeEvent evt) {
     //propertyChange.super(evt);
 }
 
-public void onComing(boolean pending) {
-  getHandler().onComing(pending);
+public void onComingFromPreviousStep(boolean pending) {
+  getHandler().onComingFromPreviousStep(pending);
+}
+
+public void onComingFromNextStep(AdminStep oldStep) {
+  getHandler().onComingFromNextStep(oldStep);
 }
 
 ]]>


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java
=====================================
@@ -49,7 +49,11 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientConfig
     protected AdminUI parentUI;
     protected DecoratorService decoratorService;
 
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
+        // by default nothing to do
+    }
+
+    protected void onComingFromNextStep(AdminStep oldStep) {
         // by default nothing to do
     }
 


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java
=====================================
@@ -188,7 +188,9 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext {
 
         AdminUIModel model = ui.getModel();
         if (newStep.forwardToThisStep(oldStep)) {
-            c.onComing(model.getStepState(newStep) == WizardState.PENDING);
+            c.onComingFromPreviousStep(model.getStepState(newStep) == WizardState.PENDING);
+        } else if (newStep.rewindToThisStep(oldStep)) {
+            c.onComingFromNextStep(oldStep);
         }
 
         // selection du nouvel onglet
@@ -223,7 +225,7 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext {
             return;
         }
 
-        if (selected != null && selected.getStep().isConfig()) {
+        if (selected != null && (selected.getStep().isConfig() || selected.getStep() == AdminStep.SELECT_DATA)) {
 
             log.debug("Selected step is config : " + selected.getStep());
             while (itr.hasNext()) {
@@ -231,7 +233,7 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext {
                 Component tab = itr.next();
                 AdminTabUI tabUI = (AdminTabUI) tab;
                 AdminStep synchroStep = tabUI.getStep();
-                if (synchroStep.isConfig()) {
+                if (synchroStep.isConfig() || (synchroStep == AdminStep.SELECT_DATA && ui.getModel().getStepState(synchroStep) == WizardState.SUCCESSED)) {
                     log.debug("Test config panel : " + synchroStep);
                     boolean valid = ui.getModel().validate(synchroStep);
                     if (valid) {
@@ -274,8 +276,6 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext {
             // on demarre le modele
             ui.getModel().start(ui);
 
-            ui.onWasInit();
-
             // affichage ui
             ui.setVisible(true);
 


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java
=====================================
@@ -38,8 +38,6 @@ import org.apache.logging.log4j.Logger;
 import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtModel;
 import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -65,13 +63,10 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
 
     private final EnumSet<DbMode> availableIncomingModes;
 
-    private final PropertyChangeListener listenStepChanged;
-
     public AdminUIModel(AdminStep adminStep) {
         super(AdminStep.class);
         this.adminStep = Objects.requireNonNull(adminStep);
         this.availableIncomingModes = EnumSet.noneOf(DbMode.class);
-        this.listenStepChanged = this::onStepChanged;
         log.debug(String.format("model [%s] is instantiated.", this));
     }
 
@@ -79,43 +74,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
         return adminStep;
     }
 
-    private void onStepChanged(PropertyChangeEvent evt) {
-        if (isWasStarted()) {
-
-            // on ne propage plus rien (il n'y a plus de configuration possible...)
-            log.debug("Stop propagation, was started... " + evt.getPropertyName());
-            return;
-        }
-
-        AdminStep oldStep = (AdminStep) evt.getOldValue();
-        AdminStep newStep = (AdminStep) evt.getNewValue();
-
-        if (oldStep != null && oldStep != AdminStep.CONFIG) {
-
-            // on fait rien si on ne vient pas de la configuration
-            return;
-        }
-
-        // on était sur l'écran de configuration
-
-        // mise à jour des modèles de sélection si on arrive sur une étape
-        // qui le requière
-
-        boolean needSelect = needSelect();
-
-        if (!needSelect) {
-
-            // pas besoin d'agir sur le model de sélection de données
-            return;
-        }
-
-        if (newStep == AdminStep.SELECT_DATA) {
-
-            getSelectDataModel().initSelectionModel(this);
-
-        }
-    }
-
     @Override
     public void firePropertyChange(String propertyName, Object newValue) {
         super.firePropertyChange(propertyName, newValue);
@@ -282,13 +240,12 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
             getReferentialSynchroModel().start(ui);
         }
 
-        removePropertyChangeListener(STEP_PROPERTY_NAME, listenStepChanged);
-        addPropertyChangeListener(STEP_PROPERTY_NAME, listenStepChanged);
-
         log.info("End of start...");
 
         // on revalide le modèle (tout est prêt)
         validate();
+
+        ui.onWasInit();
     }
 
     @Override
@@ -308,6 +265,9 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
 
     @Override
     public AdminUIModel addOperation(AdminStep step) {
+        if (step.isNeedSelect()) {
+            getOperations().add(AdminStep.SELECT_DATA);
+        }
         if (AdminStep.EXPORT_DATA == step) {
 
             // pour exporter les données utilisateurs


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java
=====================================
@@ -31,7 +31,6 @@ import fr.ird.observe.client.datasource.actions.report.ReportModel;
 import fr.ird.observe.client.datasource.actions.synchronize.referential.ng.ReferentialSynchronizeMode;
 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
 import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTreeModel;
-import fr.ird.observe.client.datasource.editor.wizard.StorageUIModel;
 import fr.ird.observe.client.datasource.editor.wizard.connexion.DataSourceSelectorModel;
 import fr.ird.observe.client.util.ObserveKeyStrokesSupport;
 import fr.ird.observe.client.util.UIHelper;
@@ -83,6 +82,17 @@ public class ConfigModel extends AdminActionModel {
                 ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep());
                 ConfigModel.this.firePropertyChange("valid", isValid());
             }
+
+            @Override
+            public void start(DbMode dbMode) {
+                super.start(dbMode);
+                if (isValid()) {
+                    // load at once
+                    setDataSourceInformation(null);
+                    getSourceInformation();
+                    getSafeSource(true);
+                }
+            }
         };
 
         centralSourceModel = new DataSourceSelectorModel(ObserveKeyStrokesSupport.KEY_STROKE_CONFIGURE_REMOTE_SOURCE) {
@@ -106,8 +116,8 @@ public class ConfigModel extends AdminActionModel {
 
         boolean validate = true;
 
-        StorageUIModel centralSourceModel = getCentralSourceModel();
-        StorageUIModel localSourceModel = getLocalSourceModel();
+        DataSourceSelectorModel centralSourceModel = getCentralSourceModel();
+        DataSourceSelectorModel localSourceModel = getLocalSourceModel();
 
         if (uiModel.isNeedIncomingDataSource()) {
             if (!localSourceModel.isValid()) {
@@ -215,9 +225,9 @@ public class ConfigModel extends AdminActionModel {
                 atLeastOneWrite = true;
             }
 
-            if (centralSourceModel.getDataSourceInformation() != null) {
+            if (centralSourceModel.getSourceInformation() != null) {
 
-                ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation();
+                ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation();
                 if (!(rightDataSourceInformation.canReadData())) {
                     log.debug("can not read data on right data source");
                     return false;
@@ -253,7 +263,7 @@ public class ConfigModel extends AdminActionModel {
                 return false;
             }
 
-            ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation();
+            ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation();
             if (rightDataSourceInformation == null) {
                 return false;
             }
@@ -297,7 +307,7 @@ public class ConfigModel extends AdminActionModel {
                 return false;
             }
 
-            ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation();
+            ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getSourceInformation();
             if (rightDataSourceInformation == null) {
                 return false;
             }
@@ -319,8 +329,8 @@ public class ConfigModel extends AdminActionModel {
 
             // il faut une base locale et une connexion distante
             // avec des droits d'écriture de données
-            validate &= centralSourceModel.getDataSourceInformation() != null
-                    && centralSourceModel.getDataSourceInformation().canWriteData();
+            validate &= centralSourceModel.getSourceInformation() != null
+                    && centralSourceModel.getSourceInformation().canWriteData();
 
         }
 
@@ -333,8 +343,8 @@ public class ConfigModel extends AdminActionModel {
             validate &= reportFile != null && reportFile.exists() && reports != null && !reports.isEmpty();
         }
         if (uiModel.containsOperation(AdminStep.ACTIVITY_LONGLINE_PAIRING)) {
-            validate &= localSourceModel.getDataSourceInformation() != null
-                    && localSourceModel.getDataSourceInformation().canWriteData();
+            validate &= localSourceModel.getSourceInformation() != null
+                    && localSourceModel.getSourceInformation().canWriteData();
         }
 
         return validate;


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUIHandler.java
=====================================
@@ -61,6 +61,9 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa
             JPanel operations = ui.getOperations();
             operations.removeAll();
             for (AdminStep operation : model.getOperations()) {
+                if (AdminStep.SELECT_DATA == operation) {
+                    continue;
+                }
                 log.info("Add operation: " + operation);
                 JLabel label = new JLabel(operation.getLabel());
                 label.setFont(label.getFont().deriveFont(Font.ITALIC).deriveFont(13f));


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java
=====================================
@@ -66,7 +66,6 @@ public class SelectDataModel extends AdminActionModel {
         this.selectionDataModel = selectionDataModel;
     }
 
-
     public void initSelectionModel(AdminUIModel uiModel) {
 
         SelectionTreeModel selectionDataModel = getSelectionDataModel();
@@ -128,14 +127,14 @@ public class SelectDataModel extends AdminActionModel {
 
     }
 
-    public DataDtoReference getSelectedTrip() {
+    public DataDtoReference<?,?> getSelectedTrip() {
         Set<DataDtoReference<?, ?>> data = getSelectionDataModel().getSelectedData();
         if (data.isEmpty()) {
 
             // pas de Trip selectionne
             return null;
         }
-        DataDtoReference dto = data.iterator().next();
+        DataDtoReference<?,?> dto = data.iterator().next();
         if (dto instanceof fr.ird.observe.dto.data.ps.common.TripReference) {
             return dto;
         }
@@ -158,8 +157,6 @@ public class SelectDataModel extends AdminActionModel {
     public void start(AdminUIModel uiModel) {
 
         if (!uiModel.needSelect()) {
-
-            // pas d'opération avec une sélection de données, rien a faire ici
             return;
         }
 


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx
=====================================
@@ -34,6 +34,16 @@ public static SelectDataUI get(AdminUI ui) {
 
   <SelectDataModel id='stepModel' initializer='getModel().getSelectDataModel()'/>
   <JPanel id='PENDING_content' layout="{new BorderLayout()}">
-    <SelectionTreePane id='selectTreePane' decorator='boxed' constraints='BorderLayout.CENTER'/>
+    <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' weighty='1'>
+      <row>
+        <cell>
+          <JButton id='selectData'/>
+        </cell>
+      </row>
+    </Table>
   </JPanel>
+  <JPanel id='invisiblePanel' >
+    <SelectionTreePane id='selectTreePane'/>
+  </JPanel>
+
 </fr.ird.observe.client.datasource.actions.AdminTabUI>


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java
=====================================
@@ -22,11 +22,17 @@ package fr.ird.observe.client.datasource.actions.config;
  * #L%
  */
 
+import fr.ird.observe.client.datasource.actions.AdminStep;
 import fr.ird.observe.client.datasource.actions.AdminTabUIHandler;
-import fr.ird.observe.client.datasource.actions.actions.SelectData;
 import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTree;
 import fr.ird.observe.client.util.UIHelper;
 import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.SwingUtil;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
+
+import javax.swing.SwingUtilities;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
 
 /**
  * Created on 28/11/16.
@@ -36,27 +42,42 @@ import org.nuiton.jaxx.runtime.spi.UIHandler;
  */
 public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> implements UIHandler<SelectDataUI> {
 
+    boolean fix;
+
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
-            SelectData action = SelectData.init(ui, null, SelectData.class);
-            action.run();
+            SwingUtilities.invokeLater(ui.getSelectData()::doClick);
         }
     }
 
     @Override
     public void afterInit(SelectDataUI ui) {
         super.afterInit(ui);
-
-        UIHelper.setLayerUI(ui.getContent(), null);
-        UIHelper.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI());
-
         SelectionTree tree = ui.getSelectTreePane().getTree();
         getModel().getSelectDataModel().setSelectionDataModel(tree.getTreeModel());
-
         tree.installUI(ui.getSelectTreePane());
-        //FIXME Init tree ?
-//        UIHelper.initUI(ui.getSelectTreePane(), tree);
     }
 
+    @Override
+    protected void onComingFromNextStep(AdminStep oldStep) {
+        WizardState stepState = getModel().getStepState(oldStep);
+        if (stepState != WizardState.PENDING && !fix) {
+            UIHelper.setLayerUI(ui.getContent(), null);
+            UIHelper.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI());
+            fix = true;
+        }
+    }
+
+    @Override
+    protected void onStateChangeToRunning() {
+        super.onStateChangeToRunning();
+    }
+
+    @Override
+    protected void onStateChangeToSuccess() {
+        super.onStateChangeToSuccess();
+        ui.getSUCCESSED_panel().removeAll();
+        ui.getSUCCESSED_panel().add(SwingUtil.boxComponentWithJxLayer(ui.getSelectTreePane()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1, 10, 1, new Insets(3, 3, 3, 3), 0, 0));
+    }
 }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/SelectData.java → client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java
=====================================
@@ -1,4 +1,4 @@
-package fr.ird.observe.client.datasource.actions.actions;
+package fr.ird.observe.client.datasource.actions.config.actions;
 
 /*-
  * #%L
@@ -22,19 +22,33 @@ package fr.ird.observe.client.datasource.actions.actions;
  * #L%
  */
 
+import fr.ird.observe.client.datasource.actions.AdminUIModel;
+import fr.ird.observe.client.datasource.actions.actions.AdminTabUIActionSupport;
 import fr.ird.observe.client.datasource.actions.config.SelectDataUI;
 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
 import fr.ird.observe.client.datasource.editor.tree.selection.SelectionTree;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
 import javax.swing.SwingUtilities;
 import java.awt.event.ActionEvent;
 
+import static io.ultreia.java4all.i18n.I18n.t;
+
 public class SelectData extends AdminTabUIActionSupport<SelectDataUI> implements Runnable {
 
     public SelectData() {
-        super(null, null, null, null);
+        super(null, null, "wizard-start", 'D');
     }
 
+    @Override
+    protected void defaultInit(InputMap inputMap, ActionMap actionMap) {
+        setText(t("observe.ui.datasource.editor.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel())));
+        setTooltipText(t("observe.ui.datasource.editor.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel())));
+        super.defaultInit(inputMap, actionMap);
+    }
+    
     @Override
     protected void doActionPerformed(ActionEvent e, SelectDataUI ui) {
         run();
@@ -45,24 +59,28 @@ public class SelectData extends AdminTabUIActionSupport<SelectDataUI> implements
         if (getParentUI().getConfigBlockLayerUI().isBlock()) {
             return;
         }
-        getParentUI().getModel().setBusy(true);
-        try {
-            SwingUtilities.invokeLater(this::run0);
-        } finally {
-            getParentUI().getModel().setBusy(false);
-        }
+        addAdminWorker(ui.getSelectData().getToolTipText(), this::run0);
     }
 
-    private void run0() {
+    private WizardState run0() {
+        AdminUIModel model = ui.getModel();
+        WizardState stepState = model.getStepState(ui.getStep());
+        if (stepState != WizardState.PENDING) {
+            return stepState;
+        }
         SelectionTree selectTree = ui.getSelectTreePane().getTree();
         selectTree.clearSelection();
+
+        ui.getStepModel().initSelectionModel(model);
+
         SwingUtilities.invokeLater(selectTree::grabFocus);
         if (selectTree.getTreeModel().isNotEmpty()) {
             selectTree.setSelectionRow(0);
         }
-        ObserveSwingDataSource localSource = ui.getModel().getConfigModel().getLocalSourceModel().getSafeSource(true);
+        ObserveSwingDataSource localSource = model.getConfigModel().getLocalSourceModel().getSafeSource(true);
         if (localSource.isLocal()) {
             SwingUtilities.invokeLater(selectTree::expandAll);
         }
+        return WizardState.SUCCESSED;
     }
 }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx
=====================================
@@ -34,7 +34,7 @@ public static ConsolidateUI get(AdminUI ui) {
 
   <ConsolidateModel id='stepModel' initializer='getModel().getConsolidateModel()'/>
 
-  <JPanel id='PENDING_content'>
+  <JPanel id='PENDING_content' layout="{new BorderLayout()}">
     <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' weighty='1'>
       <row>
         <cell>


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jcss deleted
=====================================
@@ -1,30 +0,0 @@
-/*
- * #%L
- * ObServe :: Client DataSource Actions
- * %%
- * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-
-#PENDING_content {
-  layout:{new BorderLayout()};
-}
-
-#NEED_FIX_content {
-  layout:{new BorderLayout()};
-}


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java
=====================================
@@ -35,7 +35,7 @@ import static io.ultreia.java4all.i18n.I18n.t;
 public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> implements UIHandler<ConsolidateUI> {
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getStart()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java
=====================================
@@ -52,7 +52,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
     private static final Logger log = LogManager.getLogger(ExportUIHandler.class);
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getPrepare()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java
=====================================
@@ -35,7 +35,7 @@ import javax.swing.SwingUtilities;
 public class ActivityLonglinePairingUIHandler extends AdminTabUIHandler<ActivityLonglinePairingUI> implements UIHandler<ActivityLonglinePairingUI> {
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getPrepare()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java
=====================================
@@ -40,7 +40,7 @@ import static io.ultreia.java4all.i18n.I18n.t;
 public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implements UIHandler<SaveLocalUI> {
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         updateText();
         if (pending && !ui.getStepModel().isLocalSourceNeedSave()) {
             SwingUtilities.invokeLater(ui.getContinueAction()::doClick);


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java
=====================================
@@ -45,7 +45,7 @@ import java.awt.Color;
 public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> implements UIHandler<DataSynchroUI> {
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getStart()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java
=====================================
@@ -56,7 +56,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple
     }
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getStart()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroUIHandler.java
=====================================
@@ -53,7 +53,7 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy
     }
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             SwingUtilities.invokeLater(ui.getStart()::doClick);
         }


=====================================
client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java
=====================================
@@ -68,7 +68,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
     private static final Logger log = LogManager.getLogger(ValidateUIHandler.class);
 
     @Override
-    protected void onComing(boolean pending) {
+    protected void onComingFromPreviousStep(boolean pending) {
         if (pending) {
             ui.setEnabled(true);
             SwingUtilities.invokeLater(ui.getStart()::doClick);


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java
=====================================
@@ -181,8 +181,8 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
     protected String serverUrl;
     /** Les information de connextion a la base **/
     protected ObserveDataSourceInformation dataSourceInformation;
-    /** Les information de connextion a la base **/
-    protected ObserveDataSourceInformation h2DataSourceInformation;
+//    /** Les information de connextion a la base **/
+//    protected ObserveDataSourceInformation h2DataSourceInformation;
     /** le fichier d'import des données */
     protected File dumpFile;
     /** le mode de creation d'une base */
@@ -419,7 +419,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
 
             // on est actuellement connecte sur une base locale
             fromStorageConfig((ObserveDataSourceConfigurationTopiaH2) previousConfig);
-            h2DataSourceInformation = previousInfo;
+//            h2DataSourceInformation = previousInfo;
         } else if (previousConfig instanceof ObserveDataSourceConfigurationTopiaPG) {
 
             if (!isLocalStorageExist) {
@@ -1946,9 +1946,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
     }
 
     public ObserveDataSourceInformation getDataSourceInformation() {
-        if (DbMode.USE_LOCAL.equals(dbMode)) {
-            return getH2DataSourceInformation();
-        }
+//        if (DbMode.USE_LOCAL.equals(dbMode)) {
+//            return getH2DataSourceInformation();
+//        }
 
         return dataSourceInformation;
     }
@@ -1957,18 +1957,18 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie
         this.dataSourceInformation = dataSourceInformation;
     }
 
-    public ObserveDataSourceInformation getH2DataSourceInformation() {
-        if (h2DataSourceInformation == null && localStorageExist) {
-            ObserveSwingDataSource dataSource = ClientUIContextApplicationComponent.value().getDataSourcesManager().newDataSource(h2Config);
-            try {
-                h2DataSourceInformation = dataSource.checkCanConnect(false);
-            } catch (Exception e) {
-                log.debug("error on load data source information for local storage", e);
-            }
-        }
-
-        return h2DataSourceInformation;
-    }
+//    public ObserveDataSourceInformation getH2DataSourceInformation() {
+//        if (h2DataSourceInformation == null && localStorageExist) {
+//            ObserveSwingDataSource dataSource = ClientUIContextApplicationComponent.value().getDataSourcesManager().newDataSource(h2Config);
+//            try {
+//                h2DataSourceInformation = dataSource.checkCanConnect(false);
+//            } catch (Exception e) {
+//                log.debug("error on load data source information for local storage", e);
+//            }
+//        }
+//
+//        return h2DataSourceInformation;
+//    }
 
     private boolean isValidDumpFile(File dumpFile) {
         return dumpFile != null &&


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java
=====================================
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger;
 
 import javax.swing.KeyStroke;
 
-public class DataSourceSelectorModel extends StorageUIModel  {
+public class DataSourceSelectorModel extends StorageUIModel {
 
     private static final Logger log = LogManager.getLogger(DataSourceSelectorModel.class);
 
@@ -64,12 +64,17 @@ public class DataSourceSelectorModel extends StorageUIModel  {
 
     public ObserveDataSourceInformation getSourceInformation() {
         if (sourceInformation == null) {
-            ObserveSwingDataSource localSource = getSafeSource(false);
-            try {
-                sourceInformation = localSource.checkCanConnect(false);
-            } catch (Exception e) {
-                //FIXME ! il faut faire quelque chose dans ce cas précis, au moins avertir l'utilisateur
-                log.error("unable to find local source information", e);
+            ObserveDataSourceInformation dataSourceInformation = getDataSourceInformation();
+            if (dataSourceInformation != null) {
+                sourceInformation = dataSourceInformation;
+            } else {
+                try {
+                    sourceInformation = getSafeSource(false).checkCanConnect(false);
+                    setDataSourceInformation(sourceInformation);
+                } catch (Exception e) {
+                    //FIXME ! il faut faire quelque chose dans ce cas précis, au moins avertir l'utilisateur
+                    log.error("unable to find local source information", e);
+                }
             }
         }
         return sourceInformation;


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Help to generate reports
 observe.ui.datasource.editor.actions.report.variables=Variables configuration
 observe.ui.datasource.editor.actions.saveLocal=Save local database
 observe.ui.datasource.editor.actions.saveLocal.description=Save modifcations on local database
+observe.ui.datasource.editor.actions.select.loading=< Data source select tree is loading >
 observe.ui.datasource.editor.actions.synchro.cancel.tip=Cancel
 observe.ui.datasource.editor.actions.synchro.copy.tip=Copy result of report in clipboard
 observe.ui.datasource.editor.actions.synchro.data=Advanced data management


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Ayuda a la generación del
 observe.ui.datasource.editor.actions.report.variables=Configuración de variables
 observe.ui.datasource.editor.actions.saveLocal=Copia de seguridad de la base local
 observe.ui.datasource.editor.actions.saveLocal.description=Guardar las modificationes realizadas en la base locale
+observe.ui.datasource.editor.actions.select.loading=< Data source select tree is loading > \#TODO
 observe.ui.datasource.editor.actions.synchro.cancel.tip=Cancelar
 observe.ui.datasource.editor.actions.synchro.copy.tip=Copiar el informe en el portapapeles
 observe.ui.datasource.editor.actions.synchro.data=Gestión avanzada de los datos


=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
@@ -2218,6 +2218,7 @@ observe.ui.datasource.editor.actions.report.title.tip=Aide à la génération du
 observe.ui.datasource.editor.actions.report.variables=Configuration des variables
 observe.ui.datasource.editor.actions.saveLocal=Sauvegarde de la base locale
 observe.ui.datasource.editor.actions.saveLocal.description=Sauvegarder les modifications effectuées vers la base locale
+observe.ui.datasource.editor.actions.select.loading=< L'arbre de sélection de données est en cours de chargement >
 observe.ui.datasource.editor.actions.synchro.cancel.tip=Annuler
 observe.ui.datasource.editor.actions.synchro.copy.tip=Copier le rapport dans le presse-papier
 observe.ui.datasource.editor.actions.synchro.data=Gestion avancée de données



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf051055b3c3fe4b1478d2a906...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf051055b3c3fe4b1478d2a906...
You're receiving this email because of your account on gitlab.com.

    