[Observe-commits] 03/03: clean code

27 Aug 2016

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 5d5fb2fcc48e0e6516a404b81c15ec831386ba1a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sat Aug 27 20:05:40 2016 +0200

    clean code
---
 .../ui/admin/consolidate/ConsolidateUIHandler.java | 48 +++++-----------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
index a7c1b04..00c4ac9 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
@@ -23,11 +23,6 @@ package fr.ird.observe.application.swing.ui.admin.consolidate;
 
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-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;
-import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
-import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUI;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
@@ -35,6 +30,11 @@ 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.services.dto.DataReference;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult;
 import jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -79,8 +79,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
                 t("observe.actions.synchro.launch.operation",
                   t(tabUI.getStep().getOperationLabel())));
 
-        final SelectDataUI selectTabUI = (SelectDataUI)
-                ui.getStepUI(AdminStep.SELECT_DATA);
+        SelectDataUI selectTabUI = (SelectDataUI) ui.getStepUI(AdminStep.SELECT_DATA);
 
         PropertyChangeListener listener = evt -> {
             AdminUIModel model1 = (AdminUIModel) evt.getSource();
@@ -94,10 +93,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
             }
             updateSelectionModel(selectTabUI);
         };
-        tabUI.getModel().addPropertyChangeListener(
-                AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME,
-                listener
-        );
+        tabUI.getModel().addPropertyChangeListener(AdminUIModel.SELECTION_MODEL_CHANGED_PROPERTY_NAME, listener);
     }
 
     public void startAction() {
@@ -110,22 +106,15 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
             log.debug(this);
         }
 
-        WizardState init = initDB();
-
-        if (init != null) {
+        getStepModel().setSource(model.getSafeLocalSource(false));
 
-            // une erreur ou une annulation
-            return init;
-        }
         Set<DataReference> trips = model.getSelectionDataModel().getSelectedData();
         ImmutableSet<String> tripIds = ImmutableSet.copyOf(trips.stream()
                                                                 .filter(DataReference.newTripSeinePredicate())
                                                                 .map(DataReference.ID_FUNCTION)
                                                                 .collect(Collectors.toSet()));
 
-        ObserveSwingDataSource dataSource = getStepModel().getSource();
-
-        try {
+        try (ObserveSwingDataSource dataSource = getStepModel().getSource()) {
 
             ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService();
 
@@ -158,29 +147,12 @@ public class ConsolidateUIHandler extends AdminTabUIHandler {
                 sendMessage(t("observe.actions.consolidate.message.save.changes", results.size()));
             }
 
-            sendMessage(t("observe.actions.consolidate.message.operation.done",
-                          new Date()));
-
-        } finally {
-
-            dataSource.close();
+            sendMessage(t("observe.actions.consolidate.message.operation.done", new Date()));
 
         }
 
-
         return WizardState.SUCCESSED;
-    }
-
-
-    protected WizardState initDB() throws Exception {
-
-        // on recupere la source de données
-        ObserveSwingDataSource source = model.getSafeLocalSource(false);
-        getStepModel().setSource(source);
-
-        openSource(source);
 
-        return null;
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 03/03: clean code

codelutin.com scm