branch develop updated (c1f6c23 -> e8584b1)
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 c1f6c23 [UI] Mauvais fonctionnement dans les caractéristiques d'équipements (Fixes #8316) new 2dbac2f Amélioration du chargement des cartes new e8584b1 Fix test, report has changed 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 e8584b11fb790c8876a4edecf482485804a1ba48 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 19:42:47 2016 +0200 Fix test, report has changed commit 2dbac2f3072158c3372fd13ea7df4ebf2e1c2bcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 17:19:46 2016 +0200 Amélioration du chargement des cartes Summary of changes: .../open/impl/longline/TripLonglineUIHandler.java | 16 +++++++++------- .../ui/content/open/impl/seine/TripSeineUIHandler.java | 16 +++++++++------- .../topia/service/actions/report/ReportDcpUsageTest.java | 4 ++-- 3 files changed, 20 insertions(+), 16 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 2dbac2f3072158c3372fd13ea7df4ebf2e1c2bcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 17:19:46 2016 +0200 Amélioration du chargement des cartes --- .../open/impl/longline/TripLonglineUIHandler.java | 16 +++++++++------- .../ui/content/open/impl/seine/TripSeineUIHandler.java | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index 6e6c1e4..4067f63 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -107,13 +107,15 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> { if (buildTripMap) { SwingUtilities.invokeLater(() -> { - - TripLonglineUI ui11 = getUi(); - TripMapUI tripMap11 = ui11.getTripMap(); - - TripMapDto tripLonglineMap = getTripLonglineService().getTripLonglineMap(getSelectedId()); - - tripMap11.getHandler().doOpenMap(tripLonglineMap); + ObserveSwingApplicationContext.get().getMainUI().setBusy(true); + try { + TripLonglineUI ui11 = getUi(); + TripMapUI tripMap11 = ui11.getTripMap(); + TripMapDto tripLonglineMap = getTripLonglineService().getTripLonglineMap(getSelectedId()); + tripMap11.getHandler().doOpenMap(tripLonglineMap); + } finally { + ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + } }); buildTripMap = false; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index 14fd661..2014aa9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -105,13 +105,15 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { if (buildTripMap) { SwingUtilities.invokeLater(() -> { - - TripSeineUI ui11 = getUi(); - TripMapUI tripMap11 = ui11.getTripMap(); - TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId()); - - - tripMap11.getHandler().doOpenMap(tripSeineMap); + ObserveSwingApplicationContext.get().getMainUI().setBusy(true); + try { + TripSeineUI ui11 = getUi(); + TripMapUI tripMap11 = ui11.getTripMap(); + TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId()); + tripMap11.getHandler().doOpenMap(tripSeineMap); + } finally { + ObserveSwingApplicationContext.get().getMainUI().setBusy(false); + } }); buildTripMap = false; } -- 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 e8584b11fb790c8876a4edecf482485804a1ba48 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 19:42:47 2016 +0200 Fix test, report has changed --- .../services/topia/service/actions/report/ReportDcpUsageTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java index 91af623..9d08367 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java @@ -130,11 +130,11 @@ public class ReportDcpUsageTest extends AbstractReportServiceTopiaTest { int row = 0; assertResultRow(result, row++, "10 - Caisse ou grosse planche", "1", "0", "0", "0", "0", null); assertResultRow(result, row++, "11 - Cordage, câble", "2", "0", "0", "0", "0", null); - assertResultRow(result, row++, "13 - Objet de plastique (à préciser dans les notes)", "2", "0", "0", "0", "0", null); + assertResultRow(result, row++, "13 - Objet de plastique (à préciser dans les notes)", "2", "0", "0", "0", "1", null); assertResultRow(result, row++, "14 - Un des antérieurs (du 10 à 13) balisé", "1", "0", "0", "0", "0", null); assertResultRow(result, row++, "16 - Radeau ou bouée en dérive", "2", "0", "0", "0", "0", null); assertResultRow(result, row++, "3 - Arbre (ou branche)", "3", "0", "0", "0", "0", null); - assertResultRow(result, row++, "6 - Radeau balisé en dérive (bambou et filet)", "19", "6", "13", "0", "0", null); + assertResultRow(result, row++, "6 - Radeau balisé en dérive (bambou et filet)", "19", "6", "13", "0", "2", null); assertResultRow(result, row, "99 - Autre (à préciser dans les notes)", "2", "0", "0", "0", "0", null); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm