[Git][ultreiaio/ird-observe][develop] 2 commits: use beanType instead of mainDtoType (for open data this is always the same, so...

16 Sep 2019


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


Commits:
946cc60c by tchemit at 2019-09-16T11:05:56Z
use beanType instead of mainDtoType (for open data this is always the same, so no need to add this overlay here)

- - - - -
de1a175d by tchemit at 2019-09-16T11:23:20Z
more fix on admin api

- - - - -


5 changed files:

- client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Close.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Open.java


Changes:

=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java
=====================================
@@ -180,32 +180,18 @@ public class AdminUIHandler implements UIHandler<AdminUI> {
 
         AdminUIModel model = ui.getModel();
 
-        if (oldStep == null
-                && newStep == AdminStep.CONFIG
-                && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) {
-
-            ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG);
+        if (oldStep == null && newStep == AdminStep.CONFIG && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) {
 
             model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.left.storage"));
             model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.right.storage"));
 
-//            configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel()));
-//            configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel()));
-
         }
 
-        if (oldStep == null
-                && newStep == AdminStep.CONFIG
-                && model.containsOperation(AdminStep.EXPORT_DATA)) {
-
-            ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG);
+        if (oldStep == null && newStep == AdminStep.CONFIG && model.containsOperation(AdminStep.EXPORT_DATA)) {
 
             model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.exportSource.storage"));
             model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.exportTarget.storage"));
 
-//            configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel()));
-//            configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel()));
-
         }
 
         if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) {
@@ -238,7 +224,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> {
 
             if (ui.getModel().getStepState(AdminStep.ACTIVITY_LONGLINE_PAIRING) == WizardState.PENDING) {
                 ActivityLonglinePairingUI tabUI = (ActivityLonglinePairingUI) ui.getStepUI(AdminStep.ACTIVITY_LONGLINE_PAIRING);
-                tabUI.getPrepare().doClick();
+                SwingUtilities.invokeLater(tabUI.getPrepare()::doClick);
             }
 
         }
@@ -256,7 +242,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> {
 
             if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) {
                 ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE);
-                tabUI.getStart().doClick();
+                SwingUtilities.invokeLater(tabUI.getStart()::doClick);
             }
 
         }
@@ -265,7 +251,11 @@ public class AdminUIHandler implements UIHandler<AdminUI> {
 
             if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) {
                 SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL);
-                SwingUtilities.invokeLater(tabUI.getStart()::doClick);
+                if (tabUI.getStepModel().isLocalSourceNeedSave()) {
+                    SwingUtilities.invokeLater(tabUI.getStart()::doClick);
+                } else {
+                    SwingUtilities.invokeLater(tabUI.getContinueAction()::doClick);
+                }
             }
 
         }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java
=====================================
@@ -96,8 +96,7 @@ public class ConfigModel extends AdminActionModel {
             @Override
             public void validate() {
                 super.validate();
-                ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid());
-                ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep());
+                ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep());
             }
 
         };
@@ -126,8 +125,7 @@ public class ConfigModel extends AdminActionModel {
             @Override
             public void validate() {
                 super.validate();
-                ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid());
-                ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep());
+                ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep());
             }
         };
         centralSourceModel.setLabelPrefix(n("observe.storage.config.referentiel.storage"));


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java
=====================================
@@ -46,7 +46,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa
         UIHelper.setLayerUI(ui.getConfig(), parentUI.getConfigBlockLayerUI());
         UIHelper.setLayerUI(ui.getContent(), null);
         AdminUIModel model = ui.getModel();
-        model.addPropertyChangeListener("operations", e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA));
+        model.addPropertyChangeListener(AdminUIModel.OPERATIONS_PROPERTY_NAME, e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA));
+        ui.getModel().getConfigModel().addPropertyChangeListener(AdminUIModel.VALID_STEP_PROPERTY_NAME, e-> model.validate());
 
     }
 


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Close.java
=====================================
@@ -87,7 +87,7 @@ public class Close extends ContentUIActionSupport<ContentOpenableUI> {
 
     @Override
     protected void defaultInit(InputMap inputMap, ActionMap actionMap) {
-        Class dtoType = getUi().getModel().getMainDtoType();
+        Class dtoType = getUi().getModel().getBeanType();
         setTooltipText(t("observe.action.close.open.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)));
         super.defaultInit(inputMap, actionMap);
     }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/actions/Open.java
=====================================
@@ -74,7 +74,7 @@ public class Open extends ContentUIActionSupport<ContentOpenableUI> {
 
     @Override
     protected void defaultInit(InputMap inputMap, ActionMap actionMap) {
-        Class dtoType = getUi().getModel().getMainDtoType();
+        Class dtoType = getUi().getModel().getBeanType();
         setTooltipText(t("observe.data.Openable.action.reopen.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)));
         super.defaultInit(inputMap, actionMap);
     }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1587b283dd6d5d13f9b7590759c...

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

    

Tony CHEMIT

tags

participants (1)