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 52da8808e80025c229c5970497cb00ac9480af5a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 13:15:49 2016 +0100 Amélioration de l'opération de gestion de données --- .../ui/admin/synchronize/data/DataSynchroModel.java | 6 ++++++ .../admin/synchronize/data/DataSynchroUIHandler.java | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java index d509b70..f8f436b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,6 +67,7 @@ public class DataSynchroModel extends AdminActionModel { protected final DefaultListModel<DataSynchronizeTaskSupport> tasks; + private final ProgressModel progressModel = new ProgressModel(); public DataSynchroModel() { super(AdminStep.DATA_SYNCHRONIZE); @@ -172,4 +174,8 @@ public class DataSynchroModel extends AdminActionModel { configUI.getCentralSourceConfig().setBorder(new TitledBorder(ui.getModel().getConfigModel().getCentralSourceLabel())); } + + public ProgressModel getProgressModel() { + return progressModel; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 4ca8142..35c0e20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -37,6 +37,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFro import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTree; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -114,6 +115,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + stepModel.getProgressModel().installUI(ui.getProgressBar()); } public DataSynchroModel getStepModel() { @@ -218,14 +220,12 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple tabUI.getLeftTreePane().setBorder(new TitledBorder(getModel().getConfigModel().getLocalSourceModel().getLabel())); stepModel.populateLeftSelectionModel(); -// updateSelectionModel(tabUI.getLeftTree(), leftSource); sendMessage(t("observe.actions.synchro.referential.message.data.leftData.loaded")); configUI.getLocalSourceConfig().setBorder(new TitledBorder(getModel().getConfigModel().getLocalSourceLabel())); tabUI.getRightTreePane().setBorder(new TitledBorder(getModel().getConfigModel().getCentralSourceModel().getLabel())); stepModel.populateRightSelectionModel(); -// updateSelectionModel(tabUI.getRightTree(), rightSource); sendMessage(t("observe.actions.synchro.referential.message.data.rightData.loaded")); configUI.getCentralSourceConfig().setBorder(new TitledBorder(getModel().getConfigModel().getCentralSourceLabel())); @@ -245,6 +245,17 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); + int stepsCount = 0; + for (int i = 0; i < size; i++) { + DataSynchronizeTaskSupport task = tasks.getElementAt(i); + stepsCount++; + if (task instanceof CopyToLeftDataSynchronizeTask || task instanceof CopyToRightDataSynchronizeTask) { + stepsCount++; + } + } + ProgressModel progressModel = getStepModel().getProgressModel(); + progressModel.setStepsCount(stepsCount); + DecoratorService decoratorService = getDecoratorService(); ReferentialReferenceDecorator<ProgramDto> programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramDto.class); @@ -263,6 +274,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple String tripId = trip.getId(); String tripStr = decoratorService.getTripReferenceDecorator(trip).toString(trip); + progressModel.incrementsCurrentStep(); + if (task instanceof DeleteFromLeftDataSynchronizeTask) { sendMessage(t("observe.actions.synchro.data.prepare.deleteFromLeftTask", programStr, tripStr)); @@ -305,6 +318,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple program, trip); + progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = leftTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.left.trip"), @@ -329,6 +343,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple program, trip); + progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = rightTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.right.trip"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.