branch develop updated (a539bb8 -> 0ae63be)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a539bb8 [ObserveLL] Trip - SensorUsed : laisser le bouton importer disponible même si un fichier a déjà été téléchargé (fixes #6470) new cf16032 clean code new 0ae63be Action/calculer les données : sélection de la marée par défaut (Fixes #2893) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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) commit cf16032e098b2ed8a4737db94916817b7c1d6979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 14:06:01 2016 +0200 clean code Summary of changes: .../application/swing/ui/admin/AdminTabUIHandler.java | 4 ---- .../swing/ui/admin/consolidate/ConsolidateUIHandler.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 cf16032e098b2ed8a4737db94916817b7c1d6979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 14:06:01 2016 +0200 clean code --- .../fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java index f382f23..1bca175 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java @@ -274,10 +274,6 @@ public class AdminTabUIHandler { DecoratorService decoratorService = getDecoratorService(); - String programStr = programDecorator.toString(program); - - String tripStr = decoratorService.getTripReferenceDecorator(trip).toString(trip); - if (tripResult.isDeleted()) { String message = sendLogResultMessage(deleteI18nKey, programDecorator, program, trip, tripResult.getDeleteTime()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm