[Observe-commits] 01/01: Clean some codes

28 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 5ad6d723681bd08c73a1b7c2c938a5dd1fcb5a4d
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sun Aug 28 09:49:08 2016 +0200

    Clean some codes
---
 .../swing/ui/admin/export/ExportUIHandler.java     | 29 ++++++++--------------
 .../synchronize/data/DataSynchroUIHandler.java     | 24 +++++++++---------
 .../data/task/DataSynchronizeTaskSupport.java      |  4 +--
 .../observe-application-swing_en_GB.properties     | 10 +++-----
 .../observe-application-swing_es_ES.properties     | 10 +++-----
 .../observe-application-swing_fr_FR.properties     |  6 ++---
 6 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
index 0234d3a..0048668 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
@@ -162,16 +162,12 @@ public class ExportUIHandler extends AdminTabUIHandler {
         if (newState == WizardState.NEED_FIX) {
             // met a jour la liste des marées
             tabUI.tripsModel.init(tabUI.getStepModel().getData());
-            return;
         }
     }
 
     public void doPrepareAction() {
 
-        addAdminWorker(
-                ((ExportUI) ui).getPrepareAction().getToolTipText(),
-                this::prepareAction
-        );
+        addAdminWorker(((ExportUI) ui).getPrepareAction().getToolTipText(), this::doPrepareAction0);
     }
 
     public void doStartAction() {
@@ -181,14 +177,11 @@ public class ExportUIHandler extends AdminTabUIHandler {
         int[] rows = tabUI.getTripsModel().getSelected();
         tabUI.getModel().getExportModel().setExportDataSelectedIndex(rows);
 
-        addAdminWorker(
-                tabUI.getStartAction().getToolTipText(),
-                this::doAction
-        );
+        addAdminWorker(tabUI.getStartAction().getToolTipText(), this::doStartAction0);
 
     }
 
-    public WizardState prepareAction() throws Exception {
+    private WizardState doPrepareAction0() throws Exception {
 
         DecoratorService decoratorProvider = getDecoratorService();
         ExportModel stepModel = model.getExportModel();
@@ -243,7 +236,7 @@ public class ExportUIHandler extends AdminTabUIHandler {
         return WizardState.NEED_FIX;
     }
 
-    public WizardState doAction() throws Exception {
+    private WizardState doStartAction0() throws Exception {
 
         ExportModel stepModel = model.getExportModel();
 
@@ -274,18 +267,18 @@ public class ExportUIHandler extends AdminTabUIHandler {
 
                 for (TripEntry tripEntry : tripEntries) {
 
-                    ExportTripResult exportTripResult = localTripManagementService.exportTrip(new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()));
-
-                    logExportResult(n("observe.actions.export.result.export.trip"),
+                    ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId());
+                    ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest);
+                    logExportResult(n("observe.actions.exportData.result.export.trip"),
                                     exportTripResult,
                                     programDecorator,
                                     tripEntry.getProgram(),
                                     tripEntry.getTrip());
 
-                    ImportTripResult importTripResult = centralTripManagementService.importTrip(new ImportTripRequest(exportTripResult));
-
-                    logImportResult(n("observe.actions.export.result.import.trip"),
-                                    n("observe.actions.export.result.delete.trip"),
+                    ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult);
+                    ImportTripResult importTripResult = centralTripManagementService.importTrip(importTripRequest);
+                    logImportResult(n("observe.actions.exportData.result.import.trip"),
+                                    n("observe.actions.exportData.result.delete.trip"),
                                     importTripResult,
                                     programDecorator,
                                     tripEntry.getProgram(),
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
index 11fe76a..bac0e70 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
@@ -283,8 +283,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.deleteFromLeftTask", programStr, tripStr));
 
-                DeleteTripResult deleteTripResult = leftTripManagementService.deleteTrip(new DeleteTripRequest(programId, tripId));
-
+                DeleteTripRequest deleteTripRequest = new DeleteTripRequest(programId, tripId);
+                DeleteTripResult deleteTripResult = leftTripManagementService.deleteTrip(deleteTripRequest);
                 logDeleteResult(n("observe.actions.synchro.data.result.delete.left.trip"),
                                 deleteTripResult,
                                 programDecorator,
@@ -298,8 +298,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.deleteFromRightTask", programStr, tripStr));
 
-                DeleteTripResult deleteTripResult = rightTripManagementService.deleteTrip(new DeleteTripRequest(programId, tripId));
-
+                DeleteTripRequest deleteTripRequest = new DeleteTripRequest(programId, tripId);
+                DeleteTripResult deleteTripResult = rightTripManagementService.deleteTrip(deleteTripRequest);
                 logDeleteResult(n("observe.actions.synchro.data.result.delete.right.trip"),
                                 deleteTripResult,
                                 programDecorator,
@@ -313,16 +313,16 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
 
-                ExportTripResult exportTripResult = rightTripManagementService.exportTrip(new ExportTripRequest(rightSourceIsPG, programId, tripId));
-
+                ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId);
+                ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
                                 exportTripResult,
                                 programDecorator,
                                 program,
                                 trip);
 
-                ImportTripResult importTripResult = leftTripManagementService.importTrip(new ImportTripRequest(exportTripResult));
-
+                ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult);
+                ImportTripResult importTripResult = leftTripManagementService.importTrip(importTripRequest);
                 logImportResult(n("observe.actions.synchro.data.result.import.left.trip"),
                                 n("observe.actions.synchro.data.result.delete.left.trip"),
                                 importTripResult,
@@ -337,16 +337,16 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
 
-                ExportTripResult exportTripResult = leftTripManagementService.exportTrip(new ExportTripRequest(leftSourceIsPG, programId, tripId));
-
+                ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId);
+                ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
                                 exportTripResult,
                                 programDecorator,
                                 program,
                                 trip);
 
-                ImportTripResult importTripResult = rightTripManagementService.importTrip(new ImportTripRequest(exportTripResult));
-
+                ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult);
+                ImportTripResult importTripResult = rightTripManagementService.importTrip(importTripRequest);
                 logImportResult(n("observe.actions.synchro.data.result.import.right.trip"),
                                 n("observe.actions.synchro.data.result.delete.right.trip"),
                                 importTripResult,
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
index 4cc67a0..b8a7322 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
@@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
-import jaxx.runtime.SwingUtil;
 
 import javax.swing.Icon;
 
@@ -60,7 +60,7 @@ public abstract class DataSynchronizeTaskSupport {
     protected DataSynchronizeTaskSupport(ReferentialReference<ProgramDto> program, DataReference trip, String iconName) {
         this.program = program;
         this.trip = trip;
-        this.icon = SwingUtil.createActionIcon(iconName);
+        this.icon = UIHelper.getUIManagerActionIcon(iconName);
     }
 
     protected String decorateProgram() {
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 d2486f1..8d622b9 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
@@ -159,14 +159,14 @@ observe.actions.consolidate.step=
 observe.actions.consolidate.step.description=
 observe.actions.consolidate.title=
 observe.actions.consolidate.title.tip=
-observe.actions.export.result.delete.trip=
-observe.actions.export.result.export.trip=
-observe.actions.export.result.import.trip=
 observe.actions.exportData=
 observe.actions.exportData.description=
 observe.actions.exportData.message.not.possible=
 observe.actions.exportData.message.operation.needFix=
 observe.actions.exportData.message.prepare.data=
+observe.actions.exportData.result.delete.trip=
+observe.actions.exportData.result.export.trip=
+observe.actions.exportData.result.import.trip=
 observe.actions.exportData.step=
 observe.actions.exportData.step.description=
 observe.actions.exportData.table.exist.label=
@@ -214,13 +214,9 @@ observe.actions.synchro.copy.tip=Copy result of report in clipboard
 observe.actions.synchro.data=
 observe.actions.synchro.data.actionsToPerform=
 observe.actions.synchro.data.copyToLeft.tip=
-observe.actions.synchro.data.copyToLeftTask=
 observe.actions.synchro.data.copyToRight.tip=
-observe.actions.synchro.data.copyToRightTask=
 observe.actions.synchro.data.deleteFromLeft.tip=
-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=
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 3fed0d6..4d9d331 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
@@ -159,14 +159,14 @@ observe.actions.consolidate.step=
 observe.actions.consolidate.step.description=
 observe.actions.consolidate.title=
 observe.actions.consolidate.title.tip=
-observe.actions.export.result.delete.trip=
-observe.actions.export.result.export.trip=
-observe.actions.export.result.import.trip=
 observe.actions.exportData=
 observe.actions.exportData.description=
 observe.actions.exportData.message.not.possible=La exportación no es posible (vea el mensaje anterior).
 observe.actions.exportData.message.operation.needFix=Seleccione las mareas a exportar.
 observe.actions.exportData.message.prepare.data=Preparación de los datos a exportar...
+observe.actions.exportData.result.delete.trip=
+observe.actions.exportData.result.export.trip=
+observe.actions.exportData.result.import.trip=
 observe.actions.exportData.step=
 observe.actions.exportData.step.description=
 observe.actions.exportData.table.exist.label=
@@ -214,13 +214,9 @@ observe.actions.synchro.copy.tip=Copiar el informe en el portapapeles
 observe.actions.synchro.data=
 observe.actions.synchro.data.actionsToPerform=
 observe.actions.synchro.data.copyToLeft.tip=
-observe.actions.synchro.data.copyToLeftTask=
 observe.actions.synchro.data.copyToRight.tip=
-observe.actions.synchro.data.copyToRightTask=
 observe.actions.synchro.data.deleteFromLeft.tip=
-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=
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 0123f8c..6b1c3fc 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
@@ -159,14 +159,14 @@ observe.actions.consolidate.step=Calculer les données
 observe.actions.consolidate.step.description=Calculer les données non observées
 observe.actions.consolidate.title=Consolider les données observateur
 observe.actions.consolidate.title.tip=Consolider les données observateur
-observe.actions.export.result.delete.trip=La marée %s - %s a été supprimée de la base centrale
-observe.actions.export.result.export.trip=La marée %s - %s a été exportée depuis la base locale
-observe.actions.export.result.import.trip=La marée %s - %s a été importée dans la base centrale
 observe.actions.exportData=Exporter les données observateurs
 observe.actions.exportData.description=Exporter les données observateurs vers la base centrale
 observe.actions.exportData.message.not.possible=L'opération d'export n'est pas possible (voir les messages précédents).
 observe.actions.exportData.message.operation.needFix=Veuillez sélectionner les marées à exporter.
 observe.actions.exportData.message.prepare.data=Préparation des données à exporter...
+observe.actions.exportData.result.delete.trip=La marée %s - %s a été supprimée de la base centrale
+observe.actions.exportData.result.export.trip=La marée %s - %s a été exportée depuis la base locale
+observe.actions.exportData.result.import.trip=La marée %s - %s a été importée dans la base centrale
 observe.actions.exportData.step=Exporter
 observe.actions.exportData.step.description=Exporter les données observateurs vers la base centrale
 observe.actions.exportData.table.exist.label=E

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

    

[Observe-commits] 01/01: Clean some codes

codelutin.com scm