Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
3 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java
Changes:
| ... | ... | @@ -364,5 +364,6 @@ public class ReferentialSynchroModel extends AdminActionModel { |
| 364 | 364 |
|
| 365 | 365 |
setSynchronizeMode(ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT);
|
| 366 | 366 |
setShowProperties(true);
|
| 367 |
+ ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false);
|
|
| 367 | 368 |
}
|
| 368 | 369 |
}
|
| ... | ... | @@ -226,6 +226,9 @@ public abstract class RegisterTasksActionSupport extends ObserveActionSupport { |
| 226 | 226 |
|
| 227 | 227 |
treeModel.removeReferenceNodes(removedNodes);
|
| 228 | 228 |
ui.getStepModel().getTasks().addTasks(addedTasks);
|
| 229 |
+ if (!ui.getStepModel().getTasks().isEmpty()) {
|
|
| 230 |
+ ui.getApplyAction().setEnabled(true);
|
|
| 231 |
+ }
|
|
| 229 | 232 |
}
|
| 230 | 233 |
|
| 231 | 234 |
protected Collection<ReferenceReferentialSynchroNodeSupport> getReferenceReferentialSynchroNodes(Predicate<ReferenceReferentialSynchroNodeSupport> predicate) {
|
| ... | ... | @@ -120,9 +120,7 @@ public class ReferentialSelectionTree extends JXTree { |
| 120 | 120 |
ReferentialSynchroNodeSupport node = (ReferentialSynchroNodeSupport) lastPathComponent;
|
| 121 | 121 |
boolean newValue = !node.isSelected();
|
| 122 | 122 |
log.info(String.format("Node: %s - new selected value: %s", node, newValue));
|
| 123 |
- node.setSelected(newValue);
|
|
| 124 |
- getModel().valueForPathChanged(path, node.getUserObject());
|
|
| 125 |
- updateActions();
|
|
| 123 |
+ getTreeModel().setValueAt(node, newValue);
|
|
| 126 | 124 |
}
|
| 127 | 125 |
}
|
| 128 | 126 |
}
|