Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -180,32 +180,18 @@ public class AdminUIHandler implements UIHandler<AdminUI> { |
| 180 | 180 |
|
| 181 | 181 |
AdminUIModel model = ui.getModel();
|
| 182 | 182 |
|
| 183 |
- if (oldStep == null
|
|
| 184 |
- && newStep == AdminStep.CONFIG
|
|
| 185 |
- && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) {
|
|
| 186 |
- |
|
| 187 |
- ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG);
|
|
| 183 |
+ if (oldStep == null && newStep == AdminStep.CONFIG && (model.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || model.containsOperation(AdminStep.DATA_SYNCHRONIZE))) {
|
|
| 188 | 184 |
|
| 189 | 185 |
model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.left.storage"));
|
| 190 | 186 |
model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.right.storage"));
|
| 191 | 187 |
|
| 192 |
-// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel()));
|
|
| 193 |
-// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel()));
|
|
| 194 |
- |
|
| 195 | 188 |
}
|
| 196 | 189 |
|
| 197 |
- if (oldStep == null
|
|
| 198 |
- && newStep == AdminStep.CONFIG
|
|
| 199 |
- && model.containsOperation(AdminStep.EXPORT_DATA)) {
|
|
| 200 |
- |
|
| 201 |
- ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG);
|
|
| 190 |
+ if (oldStep == null && newStep == AdminStep.CONFIG && model.containsOperation(AdminStep.EXPORT_DATA)) {
|
|
| 202 | 191 |
|
| 203 | 192 |
model.getConfigModel().getLocalSourceModel().setLabelPrefix(t("observe.storage.config.exportSource.storage"));
|
| 204 | 193 |
model.getConfigModel().getCentralSourceModel().setLabelPrefix(t("observe.storage.config.exportTarget.storage"));
|
| 205 | 194 |
|
| 206 |
-// configUI.getLocalSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getLocalSourceLabel()));
|
|
| 207 |
-// configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel()));
|
|
| 208 |
- |
|
| 209 | 195 |
}
|
| 210 | 196 |
|
| 211 | 197 |
if (oldStep != null && oldStep.ordinal() < AdminStep.REFERENTIAL_SYNCHRONIZE.ordinal() && newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) {
|
| ... | ... | @@ -238,7 +224,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { |
| 238 | 224 |
|
| 239 | 225 |
if (ui.getModel().getStepState(AdminStep.ACTIVITY_LONGLINE_PAIRING) == WizardState.PENDING) {
|
| 240 | 226 |
ActivityLonglinePairingUI tabUI = (ActivityLonglinePairingUI) ui.getStepUI(AdminStep.ACTIVITY_LONGLINE_PAIRING);
|
| 241 |
- tabUI.getPrepare().doClick();
|
|
| 227 |
+ SwingUtilities.invokeLater(tabUI.getPrepare()::doClick);
|
|
| 242 | 228 |
}
|
| 243 | 229 |
|
| 244 | 230 |
}
|
| ... | ... | @@ -256,7 +242,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { |
| 256 | 242 |
|
| 257 | 243 |
if (ui.getModel().getStepState(AdminStep.VALIDATE) == WizardState.PENDING) {
|
| 258 | 244 |
ValidateUI tabUI = (ValidateUI) ui.getStepUI(AdminStep.VALIDATE);
|
| 259 |
- tabUI.getStart().doClick();
|
|
| 245 |
+ SwingUtilities.invokeLater(tabUI.getStart()::doClick);
|
|
| 260 | 246 |
}
|
| 261 | 247 |
|
| 262 | 248 |
}
|
| ... | ... | @@ -265,7 +251,11 @@ public class AdminUIHandler implements UIHandler<AdminUI> { |
| 265 | 251 |
|
| 266 | 252 |
if (ui.getModel().getStepState(AdminStep.SAVE_LOCAL) == WizardState.PENDING) {
|
| 267 | 253 |
SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL);
|
| 268 |
- SwingUtilities.invokeLater(tabUI.getStart()::doClick);
|
|
| 254 |
+ if (tabUI.getStepModel().isLocalSourceNeedSave()) {
|
|
| 255 |
+ SwingUtilities.invokeLater(tabUI.getStart()::doClick);
|
|
| 256 |
+ } else {
|
|
| 257 |
+ SwingUtilities.invokeLater(tabUI.getContinueAction()::doClick);
|
|
| 258 |
+ }
|
|
| 269 | 259 |
}
|
| 270 | 260 |
|
| 271 | 261 |
}
|
| ... | ... | @@ -96,8 +96,7 @@ public class ConfigModel extends AdminActionModel { |
| 96 | 96 |
@Override
|
| 97 | 97 |
public void validate() {
|
| 98 | 98 |
super.validate();
|
| 99 |
- ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid());
|
|
| 100 |
- ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep());
|
|
| 99 |
+ ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep());
|
|
| 101 | 100 |
}
|
| 102 | 101 |
|
| 103 | 102 |
};
|
| ... | ... | @@ -126,8 +125,7 @@ public class ConfigModel extends AdminActionModel { |
| 126 | 125 |
@Override
|
| 127 | 126 |
public void validate() {
|
| 128 | 127 |
super.validate();
|
| 129 |
- ConfigModel.this.firePropertyChange(VALID_PROPERTY_NAME, isValid());
|
|
| 130 |
- ConfigModel.this.firePropertyChange(VALID_STEP_PROPERTY_NAME, isValidStep());
|
|
| 128 |
+ ConfigModel.this.firePropertyChange(AdminUIModel.VALID_STEP_PROPERTY_NAME, isValidStep());
|
|
| 131 | 129 |
}
|
| 132 | 130 |
};
|
| 133 | 131 |
centralSourceModel.setLabelPrefix(n("observe.storage.config.referentiel.storage"));
|
| ... | ... | @@ -46,7 +46,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa |
| 46 | 46 |
UIHelper.setLayerUI(ui.getConfig(), parentUI.getConfigBlockLayerUI());
|
| 47 | 47 |
UIHelper.setLayerUI(ui.getContent(), null);
|
| 48 | 48 |
AdminUIModel model = ui.getModel();
|
| 49 |
- model.addPropertyChangeListener("operations", e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA));
|
|
| 49 |
+ model.addPropertyChangeListener(AdminUIModel.OPERATIONS_PROPERTY_NAME, e -> isOperationSelected(model.getOperations(), ui.EXPORT_DATA));
|
|
| 50 |
+ ui.getModel().getConfigModel().addPropertyChangeListener(AdminUIModel.VALID_STEP_PROPERTY_NAME, e-> model.validate());
|
|
| 50 | 51 |
|
| 51 | 52 |
}
|
| 52 | 53 |
|
| ... | ... | @@ -87,7 +87,7 @@ public class Close extends ContentUIActionSupport<ContentOpenableUI> { |
| 87 | 87 |
|
| 88 | 88 |
@Override
|
| 89 | 89 |
protected void defaultInit(InputMap inputMap, ActionMap actionMap) {
|
| 90 |
- Class dtoType = getUi().getModel().getMainDtoType();
|
|
| 90 |
+ Class dtoType = getUi().getModel().getBeanType();
|
|
| 91 | 91 |
setTooltipText(t("observe.action.close.open.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)));
|
| 92 | 92 |
super.defaultInit(inputMap, actionMap);
|
| 93 | 93 |
}
|
| ... | ... | @@ -74,7 +74,7 @@ public class Open extends ContentUIActionSupport<ContentOpenableUI> { |
| 74 | 74 |
|
| 75 | 75 |
@Override
|
| 76 | 76 |
protected void defaultInit(InputMap inputMap, ActionMap actionMap) {
|
| 77 |
- Class dtoType = getUi().getModel().getMainDtoType();
|
|
| 77 |
+ Class dtoType = getUi().getModel().getBeanType();
|
|
| 78 | 78 |
setTooltipText(t("observe.data.Openable.action.reopen.tip", ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)));
|
| 79 | 79 |
super.defaultInit(inputMap, actionMap);
|
| 80 | 80 |
}
|