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 0ae63bea38c7144ee9798f440a3d95f5bca56f90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 14:12:40 2016 +0200 Action/calculer les données : sélection de la marée par défaut (Fixes #2893) --- .../swing/ui/admin/consolidate/ConsolidateUIHandler.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index 4646325..bd2e4dc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -30,6 +30,8 @@ import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; +import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; @@ -39,6 +41,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JTree; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Set; @@ -96,6 +99,16 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { tabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, listener); } + @Override + protected void updateSelectionModel(AdminTabUI tabUI, ObserveTreeHelper helper, JTree selectTree, ObserveSwingDataSource source, DataSelectionModel selectDataModel, DataSelectionTreeSelectionModel selectionModel) { + super.updateSelectionModel(tabUI, helper, selectTree, source, selectDataModel, selectionModel); + if (source.isLocal()) { + + // on sélectionne toutes les marées + selectDataModel.addAllSelectedData(); + } + } + public void startAction() { addAdminWorker(((ConsolidateUI) ui).getStartButton().getToolTipText(), this::doAction); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.