This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7de7265d1a925e79d3b2508a91144d79874a63af Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 09:40:07 2016 +0200 Normalisation de démarrage des synchro --- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 19 ------ .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 59 ------------------ .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 10 +++ .../ui/admin/synchronize/data/DataSynchroUI.jcss | 9 +++ .../synchronize/data/DataSynchroUIHandler.java | 46 ++++++++------ .../referential/legacy/SynchronizeUIHandler.java | 6 +- .../referential/ng/ReferentialSynchroModel.java | 28 ++------- .../referential/ng/ReferentialSynchroUI.jaxx | 10 +++ .../referential/ng/ReferentialSynchroUI.jcss | 9 +++ .../ng/ReferentialSynchroUIHandler.java | 72 ++++++++++++++++------ .../observe-application-swing_en_GB.properties | 2 + .../observe-application-swing_es_ES.properties | 2 + .../observe-application-swing_fr_FR.properties | 5 +- 13 files changed, 132 insertions(+), 145 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java index 811fcf7..723dc5e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIHandler.java @@ -195,25 +195,6 @@ public class AdminUIHandler { } - //FIXME-release Remettre ce code avant la release une fois la fonctionnalité bien testé -// if (oldStep == AdminStep.CONFIG) { -// -// if (newStep == AdminStep.REFERENTIAL_SYNCHRONIZE) { -// -// SwingUtilities.invokeLater(() -> c.getHandler().addAdminWorker("Chargement des référentiels.", () -> { -// model.initSynchroReferentialUI(); -// return WizardState.PENDING; -// })); -// } else if (newStep == AdminStep.DATA_SYNCHRONIZE) { -// -// SwingUtilities.invokeLater(() -> c.getHandler().addAdminWorker("Chargement des données.", () -> { -// model.initSynchroDataUI(); -// return WizardState.PENDING; -// })); -// } -// } - - if (c != null && c.getStep() == AdminStep.SAVE_LOCAL) { // on met a jour le descriptif diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index cbf214d..a46d20c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -305,39 +305,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { return; } - if (AdminStep.CONFIG == oldStep && WizardState.PENDING == getStepState()) { - - if (AdminStep.DATA_SYNCHRONIZE == newStep) { - - setBusy(true); - try { - //FIXME-release Supprimer ce code et remettre le code dans AdminUIHandler qui fait ça en lazy - initSynchroDataUI(); - } finally { - setBusy(false); - } - - return; - - } - - if (AdminStep.REFERENTIAL_SYNCHRONIZE == newStep) { - - setBusy(true); - try { - //FIXME-release Supprimer ce code et remettre le code dans AdminUIHandler qui fait ça en lazy - initSynchroReferentialUI(); - } finally { - setBusy(false); - } - - return; - - } - - } - - // on était sur l'écran de configuration // mise à jour des modèles de sélection si on arrive sur une étape @@ -453,32 +420,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { }; } - public void initSynchroDataUI() { - - DataSynchroModel stepModel = getDataSynchroModel(); - - ObserveSwingDataSource leftSource = getSafeLocalSource(true); - stepModel.setLeftSource(leftSource); - - ObserveSwingDataSource rightSource = getSafeCentralSource(true); - stepModel.setRightSource(rightSource); - - } - - public void initSynchroReferentialUI() { - - ReferentialSynchroModel stepModel = getReferentialSynchroModel(); - - ObserveSwingDataSource leftSource = getSafeLocalSource(true); - stepModel.setLeftSource(leftSource); - - ObserveSwingDataSource rightSource = getSafeCentralSource(true); - stepModel.setRightSource(rightSource); - - stepModel.populateTreeModels(); - - } - public DataSelectionModel getSelectionDataModel() { return selectionDataModel; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx index fea00d6..014ed8c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -80,6 +80,16 @@ public void destroy() { </script> <JPanel id='PENDING_content'> + <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' + weighty='1'> + <row> + <cell> + <JButton id='startAction' onActionPerformed="getHandler().doStartAction()"/> + </cell> + </row> + </Table> + </JPanel> + <JPanel id='NEED_FIX_content'> <JSplitPane id="contentSplitPane" constraints='BorderLayout.CENTER'> <Table id='contentNorth' fill="both" weighty="1"> <row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jcss index 5d4d5cd..d7a19f5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jcss @@ -24,6 +24,15 @@ layout:{new BorderLayout()}; } +#NEED_FIX_content { + layout:{new BorderLayout()}; +} + +#startAction { + actionIcon:"wizard-start"; + text:"observe.actions.synchro.data.launch.operation"; +} + #contentSplitPane { orientation: {JSplitPane.VERTICAL_SPLIT}; resizeWeight: 0.8; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java index 1c7157b..7822ef3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -94,35 +94,41 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { UIHelper.initUI(tabUI.getLeftTreePane(), tabUI.getLeftTree()); UIHelper.initUI(tabUI.getRightTreePane(), tabUI.getRightTree()); - getStepModel().addPropertyChangeListener(DataSynchroModel.LEFT_SOURCE_PROPERTY_NAME, evt -> { + } - DataSynchroModel stepModel = (DataSynchroModel) evt.getSource(); - ObserveSwingDataSource dataSource = (ObserveSwingDataSource) evt.getNewValue(); + public void doStartAction() { - tabUI.getLeftTreePane().setBorder(new TitledBorder(getModel().getLocalSourceModel().getLabel())); - stepModel.populateLeftSelectionModel(); - updateSelectionModel(tabUI, tabUI.getLeftTreeHelper(), tabUI.getLeftTree(), dataSource, stepModel.getLeftSelectionDataModel(), tabUI.getLeftSelectionModel()); - sendMessage(t("observe.actions.synchro.referential.message.data.leftData.loaded")); + addAdminWorker(getUi().getStartAction().getToolTipText(), this::doStartAction0); - ConfigUI configUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); - configUI.getLocalSourceConfig().setBorder(new TitledBorder(getModel().getLocalSourceLabel())); + } - }); + private WizardState doStartAction0() { - getStepModel().addPropertyChangeListener(DataSynchroModel.RIGHT_SOURCE_PROPERTY_NAME, evt -> { + DataSynchroUI tabUI = getUi(); + DataSynchroModel stepModel = getStepModel(); + ConfigUI configUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); - DataSynchroModel stepModel = (DataSynchroModel) evt.getSource(); - ObserveSwingDataSource dataSource = (ObserveSwingDataSource) evt.getNewValue(); + ObserveSwingDataSource leftSource = getModel().getSafeLocalSource(true); + stepModel.setLeftSource(leftSource); - tabUI.getRightTreePane().setBorder(new TitledBorder(getModel().getCentralSourceModel().getLabel())); - stepModel.populateRightSelectionModel(); - updateSelectionModel(tabUI, tabUI.getRightTreeHelper(), tabUI.getRightTree(), dataSource, stepModel.getRightSelectionDataModel(), tabUI.getRightSelectionModel()); - sendMessage(t("observe.actions.synchro.referential.message.data.rightData.loaded")); + ObserveSwingDataSource rightSource = getModel().getSafeCentralSource(true); + stepModel.setRightSource(rightSource); - ConfigUI configUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); - configUI.getCentralSourceConfig().setBorder(new TitledBorder(getModel().getCentralSourceLabel())); + tabUI.getLeftTreePane().setBorder(new TitledBorder(getModel().getLocalSourceModel().getLabel())); + stepModel.populateLeftSelectionModel(); + updateSelectionModel(tabUI, tabUI.getLeftTreeHelper(), tabUI.getLeftTree(), leftSource, stepModel.getLeftSelectionDataModel(), tabUI.getLeftSelectionModel()); + sendMessage(t("observe.actions.synchro.referential.message.data.leftData.loaded")); - }); + configUI.getLocalSourceConfig().setBorder(new TitledBorder(getModel().getLocalSourceLabel())); + + tabUI.getRightTreePane().setBorder(new TitledBorder(getModel().getCentralSourceModel().getLabel())); + stepModel.populateRightSelectionModel(); + updateSelectionModel(tabUI, tabUI.getRightTreeHelper(), tabUI.getRightTree(), rightSource, stepModel.getRightSelectionDataModel(), tabUI.getRightSelectionModel()); + sendMessage(t("observe.actions.synchro.referential.message.data.rightData.loaded")); + + configUI.getCentralSourceConfig().setBorder(new TitledBorder(getModel().getCentralSourceLabel())); + + return WizardState.NEED_FIX; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index 41c7782..53659bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -90,7 +90,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { log.debug(" specialized for [" + tabUI.getStep() + "] for main ui " + ui.getClass().getName() + "@" + System.identityHashCode(ui)); } - tabUI.getStartAction().setText(t("observe.actions.synchro.referential.launch.operation", t(tabUI.getStep().getOperationLabel()))); + tabUI.getStartAction().setText(t("observe.actions.synchro.referential.legacy.launch.operation", t(tabUI.getStep().getOperationLabel()))); DefaultListSelectionModel obsoleteReferenceSelectionModel = tabUI.getModel().getSynchronizeReferentielModel().getObsoleteReferencesSelectionModel(); obsoleteReferenceSelectionModel.addListSelectionListener(this::updateSelectedObsoleteEntity); @@ -100,11 +100,11 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { public void doStartAction() { - addAdminWorker(getUi().getStartAction().getToolTipText(), this::doAction); + addAdminWorker(getUi().getStartAction().getToolTipText(), this::doStartAction0); } - public WizardState doAction() throws Exception { + private WizardState doStartAction0() throws Exception { if (log.isDebugEnabled()) { log.debug(this); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java index 780e7e1..83ae0a3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -5,7 +5,6 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; -import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; @@ -16,14 +15,11 @@ import fr.ird.observe.ui.admin.synchronize.referential.ng.task.DeleteReferential import fr.ird.observe.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; import fr.ird.observe.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; import fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; -import fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModelsBuilder; -import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * Created on 02/08/16. @@ -130,6 +126,10 @@ public class ReferentialSynchroModel extends AdminActionModel { return tasks; } + public void setEngine(ReferentialSynchronizeDiffsEngine engine) { + this.engine = engine; + } + public <D extends ReferentialDto> List<ReferentialReference<D>> getPossibleReplaceUniverse(boolean left, Class<D> type, ReferentialReference<D> referenceToReplace) { ReferentialReferenceSet<D> referencesSet; @@ -182,26 +182,6 @@ public class ReferentialSynchroModel extends AdminActionModel { return references; } - public void populateTreeModels() { - - Objects.nonNull(leftSource); - Objects.nonNull(rightSource); - Objects.nonNull(synchronizeMode); - - ReferentialSynchronizeDiffService leftDiffSynchronizeService = leftSource.newReferentialSynchronizeDiffService(); - ReferentialSynchronizeDiffService rightDiffSynchronizeService = rightSource.newReferentialSynchronizeDiffService(); - - engine = new ReferentialSynchronizeDiffsEngine(leftDiffSynchronizeService, rightDiffSynchronizeService); - - ReferentialSynchronizeTreeModelsBuilder treeModelsBuilder = new ReferentialSynchronizeTreeModelsBuilder(synchronizeMode, engine); - Pair<ReferentialSynchronizeTreeModel, ReferentialSynchronizeTreeModel> treePair = treeModelsBuilder.build(); - setLeftTreeModel(treePair.getLeft()); - setRightTreeModel(treePair.getRight()); - - tasks.removeAllElements(); - - } - public boolean isCopyRight() { return copyRight; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx index 850c655..2c08573 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx @@ -78,6 +78,16 @@ public void destroy() { </script> <JPanel id='PENDING_content'> + <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' + weighty='1'> + <row> + <cell> + <JButton id='startAction' onActionPerformed="getHandler().doStartAction()"/> + </cell> + </row> + </Table> + </JPanel> + <JPanel id='NEED_FIX_content'> <JSplitPane id="contentSplitPane" constraints='BorderLayout.CENTER'> <Table id='contentNorth' fill="both" weighty="1"> <row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss index c2aefae..a256692 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss @@ -24,6 +24,15 @@ layout:{new BorderLayout()}; } +#NEED_FIX_content { + layout:{new BorderLayout()}; +} + +#startAction { + actionIcon:"wizard-start"; + text:"observe.actions.synchro.referential.launch.operation"; +} + #contentSplitPane { orientation: {JSplitPane.VERTICAL_SPLIT}; resizeWeight: 0.8; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java index 2d2ffd2..0ce60a1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -1,13 +1,19 @@ package fr.ird.observe.ui.admin.synchronize.referential.ng; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUIHandler; import fr.ird.observe.ui.admin.AdminUI; import fr.ird.observe.ui.admin.config.ConfigUI; import fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; +import fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModelsBuilder; import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.swing.wizard.ext.WizardState; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,7 +22,6 @@ import javax.swing.JTree; import javax.swing.border.TitledBorder; import javax.swing.event.TreeSelectionListener; import java.awt.Color; -import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n.t; @@ -32,22 +37,10 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler { private static final Log log = LogFactory.getLog(ReferentialSynchroUIHandler.class); private final TreeSelectionListener treeSelectionListener; - private final PropertyChangeListener leftTreeModelChanged; - private final PropertyChangeListener rightTreeModelChanged; public ReferentialSynchroUIHandler(ReferentialSynchroUI ui) { super(ui); this.treeSelectionListener = evt -> updateEnabledActions(); - this.leftTreeModelChanged = evt -> initTree(ui.getLeftTree(), - ui.getLeftTreePane(), - (ReferentialSynchronizeTreeModel) evt.getNewValue(), - getModel().getLocalSourceModel().getLabel(), - t("observe.actions.synchro.referential.message.referential.leftData.loaded")); - this.rightTreeModelChanged = evt -> initTree(ui.getRightTree(), - ui.getRightTreePane(), - (ReferentialSynchronizeTreeModel) evt.getNewValue(), - getModel().getCentralSourceModel().getLabel(), - t("observe.actions.synchro.referential.message.referential.rightData.loaded")); } public ReferentialSynchroModel getStepModel() { @@ -67,12 +60,6 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler { log.debug(" specialized for [" + tabUI.getStep() + "] for main ui " + ui.getClass().getName() + "@" + System.identityHashCode(ui)); } - getStepModel().removePropertyChangeListener(ReferentialSynchroModel.LEFT_TREE_MODEL_PROPERTY_NAME, leftTreeModelChanged); - getStepModel().addPropertyChangeListener(ReferentialSynchroModel.LEFT_TREE_MODEL_PROPERTY_NAME, leftTreeModelChanged); - - getStepModel().removePropertyChangeListener(ReferentialSynchroModel.RIGHT_TREE_MODEL_PROPERTY_NAME, rightTreeModelChanged); - getStepModel().addPropertyChangeListener(ReferentialSynchroModel.RIGHT_TREE_MODEL_PROPERTY_NAME, rightTreeModelChanged); - ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); JAXXInitialContext tx = new JAXXInitialContext().add(configUI).add(this); ReferentialSynchroConfigUI extraConfig = new ReferentialSynchroConfigUI(tx); @@ -80,6 +67,53 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler { } + public void doStartAction() { + + addAdminWorker(getUi().getStartAction().getToolTipText(), this::doStartAction0); + + } + + private WizardState doStartAction0() { + + ReferentialSynchroModel stepModel = getStepModel(); + + ObserveSwingDataSource leftSource = getModel().getSafeLocalSource(true); + stepModel.setLeftSource(leftSource); + + ObserveSwingDataSource rightSource = getModel().getSafeCentralSource(true); + stepModel.setRightSource(rightSource); + + ReferentialSynchronizeDiffService leftDiffSynchronizeService = leftSource.newReferentialSynchronizeDiffService(); + ReferentialSynchronizeDiffService rightDiffSynchronizeService = rightSource.newReferentialSynchronizeDiffService(); + + ReferentialSynchronizeDiffsEngine engine = new ReferentialSynchronizeDiffsEngine(leftDiffSynchronizeService, rightDiffSynchronizeService); + stepModel.setEngine(engine); + + ReferentialSynchronizeMode synchronizeMode = stepModel.getSynchronizeMode(); + ReferentialSynchronizeTreeModelsBuilder treeModelsBuilder = new ReferentialSynchronizeTreeModelsBuilder(synchronizeMode, engine); + Pair<ReferentialSynchronizeTreeModel, ReferentialSynchronizeTreeModel> treePair = treeModelsBuilder.build(); + stepModel.setLeftTreeModel(treePair.getLeft()); + stepModel.setRightTreeModel(treePair.getRight()); + + stepModel.getTasks().removeAllElements(); + + ReferentialSynchroUI ui = getUi(); + initTree(ui.getLeftTree(), + ui.getLeftTreePane(), + stepModel.getLeftTreeModel(), + getModel().getLocalSourceModel().getLabel(), + t("observe.actions.synchro.referential.message.referential.leftData.loaded")); + + initTree(ui.getRightTree(), + ui.getRightTreePane(), + stepModel.getRightTreeModel(), + getModel().getCentralSourceModel().getLabel(), + t("observe.actions.synchro.referential.message.referential.rightData.loaded")); + + return WizardState.NEED_FIX; + + } + private void updateEnabledActions() { ReferentialSynchroModel stepModel = getStepModel(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 75b2e23..077da87 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -220,6 +220,7 @@ observe.actions.synchro.data.deleteFromLeftTask= observe.actions.synchro.data.deleteFromRight.tip= observe.actions.synchro.data.deleteFromRightTask= observe.actions.synchro.data.description= +observe.actions.synchro.data.launch.operation= observe.actions.synchro.data.prepare.copyToLeftTask= observe.actions.synchro.data.prepare.copyToRightTask= observe.actions.synchro.data.prepare.deleteFromLeftTask= @@ -246,6 +247,7 @@ observe.actions.synchro.referential.description= observe.actions.synchro.referential.launch.operation= observe.actions.synchro.referential.legacy=Synchronize observe.actions.synchro.referential.legacy.description= +observe.actions.synchro.referential.legacy.launch.operation= observe.actions.synchro.referential.legacy.step= observe.actions.synchro.referential.legacy.step.description= observe.actions.synchro.referential.legacy.tip=Synchronize objectOperation on local database diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 1afbe82..9a332ef 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -220,6 +220,7 @@ observe.actions.synchro.data.deleteFromLeftTask= observe.actions.synchro.data.deleteFromRight.tip= observe.actions.synchro.data.deleteFromRightTask= observe.actions.synchro.data.description= +observe.actions.synchro.data.launch.operation= observe.actions.synchro.data.prepare.copyToLeftTask= observe.actions.synchro.data.prepare.copyToRightTask= observe.actions.synchro.data.prepare.deleteFromLeftTask= @@ -246,6 +247,7 @@ observe.actions.synchro.referential.description= observe.actions.synchro.referential.launch.operation= observe.actions.synchro.referential.legacy= observe.actions.synchro.referential.legacy.description= +observe.actions.synchro.referential.legacy.launch.operation= observe.actions.synchro.referential.legacy.step= observe.actions.synchro.referential.legacy.step.description= observe.actions.synchro.referential.legacy.tip= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index e32dfff..d16b15b 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -220,6 +220,7 @@ observe.actions.synchro.data.deleteFromLeftTask=Supprimer de la base de gauche \ observe.actions.synchro.data.deleteFromRight.tip=Supprimer la ou les marées sélectionnée(s) de la base de droite observe.actions.synchro.data.deleteFromRightTask=Supprimer de la base de droite \: %s - %s observe.actions.synchro.data.description=Synchronisation bi-directionnelle des données utilisateurs +observe.actions.synchro.data.launch.operation=Récupérer les données des sources de données observe.actions.synchro.data.prepare.copyToLeftTask=Préparation de la recopie vers la base de gauche \: %s - %s observe.actions.synchro.data.prepare.copyToRightTask=Préparation de la recopie vers la base de droite \: %s - %s observe.actions.synchro.data.prepare.deleteFromLeftTask=Préparation de la suppression de la base de gauche \: %s - %s @@ -243,9 +244,10 @@ observe.actions.synchro.referential.action.skipFromLeft.tip=Ne rien faire sur le observe.actions.synchro.referential.action.skipFromRight.tip=Ne rien faire sur le référentiel sélectionné à droite observe.actions.synchro.referential.config.mode=Mode de synchronisation observe.actions.synchro.referential.description=Synchronisation avancée du référentiel -observe.actions.synchro.referential.launch.operation=Démarrer l'opération < %1$s > +observe.actions.synchro.referential.launch.operation=Calculer le différentiel des référentiels des sources de données observe.actions.synchro.referential.legacy=Synchronisation du référentiel observe.actions.synchro.referential.legacy.description=Synchroniser le référentiel depuis la base centrale +observe.actions.synchro.referential.legacy.launch.operation= observe.actions.synchro.referential.legacy.step=Synchronisation Référentiel observe.actions.synchro.referential.legacy.step.description=Synchronizer le référentiel depuis la base centrale observe.actions.synchro.referential.legacy.tip=Opération de synchronisation du référentiel de la base locale @@ -291,6 +293,7 @@ observe.actions.synchro.referential.task.updateToRight=Mettre à jour dans la ba observe.actions.synchro.referential.title=Synchronisation avancée du référentiel observe.actions.synchro.referential.title.tip=Synchronisation avancée du référentiel observe.actions.synchro.referential.withMode=Synchronisation du référentiel (%s) +observe.actions.synchro.referentiel.legacy.launch.operation=Démarrer l'opération < %1$s > observe.actions.synchro.report.reset.tip=Déselectionner le report courant. observe.actions.validate=Valider les données observe.actions.validate.choose.report.directory=Choisir le répertoire des rapports -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.