This is an automated email from the git hooks/post-receive script. New change to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git from 3f97619 Fix merge new e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) new a74653a utilisation des services dans doSave et doDelete new eefe001 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 new f0f27e6 appel des services pour le load et precreate (refs #7531) new 71a5e4e appel de services dans dopersist (refs #7531) new f12b43c suppression des fixme (refs #7531) The 6 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 f12b43c0d2e1337379f129ce8c29174a57ddc7a3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 28 16:27:01 2015 +0200 suppression des fixme (refs #7531) commit 71a5e4e4fa2cdbcf01bbe3a09a18ad240b1ee573 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 17:03:15 2015 +0200 appel de services dans dopersist (refs #7531) commit f0f27e64c97571bc91576c4958f5e406ad3b7263 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 11:32:25 2015 +0200 appel des services pour le load et precreate (refs #7531) commit eefe00196889adb745c6adbef684867164ecfaee Merge: a74653a 3f97619 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 25 10:34:07 2015 +0200 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 Conflicts: observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java commit a74653a8c1dc87f17f2295a626c2f14c1a38b325 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit e6cec26969eaef71c1e463b17a0d4638e410ce40 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) Summary of changes: .../main/java/fr/ird/observe/ObserveCLAction.java | 3 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 14 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +---- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 +++-- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 -- .../ird/observe/ui/content/ContentUIHandler.java | 93 +--------- .../observe/ui/content/ContentUIInitializer.java | 202 ++++++++------------- .../ird/observe/ui/content/ContentUIManager.java | 64 ++++--- .../impl/longline/SetLonglineUIHandler.java | 41 ++--- .../ActivitySeineObservedSystemUIHandler.java | 32 ++-- ...ngObjectTransmittingBuoyOperationUIHandler.java | 12 -- .../impl/seine/FloatingObjectUIHandler.java | 34 ++-- .../ui/content/impl/seine/SetSeineUIHandler.java | 62 ++++--- .../impl/longline/ActivityLonglineUIHandler.java | 37 ++-- .../open/impl/longline/TripLonglineUIHandler.java | 30 +-- .../open/impl/seine/ActivitySeineUIHandler.java | 40 ++-- .../ui/content/open/impl/seine/RouteUIHandler.java | 41 ++--- .../open/impl/seine/TripSeineUIHandler.java | 58 +++--- .../ui/content/ref/ContentReferenceUIHandler.java | 64 +++---- .../ui/content/table/ContentTableUIHandler.java | 40 ++-- .../ui/content/table/ContentTableUIModel.java | 19 +- .../impl/longline/BaitsCompositionUIHandler.java | 20 ++ .../longline/BranchlinesCompositionUIHandler.java | 26 ++- .../impl/longline/CatchLonglineUIHandler.java | 30 ++- .../table/impl/longline/EncounterUIHandler.java | 24 ++- .../longline/FloatlinesCompositionUIHandler.java | 26 ++- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 ++- .../impl/longline/HooksCompositionUIHandler.java | 26 ++- .../table/impl/longline/SensorUsedUIHandler.java | 21 ++- .../content/table/impl/longline/TdrUIHandler.java | 21 ++- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 ++- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 ++- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++ .../impl/seine/TargetDiscardCatchUIHandler.java | 24 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 +++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 -- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 12 -- .../EditableTableWithCacheTableModelSupport.java | 24 +-- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../main/xmi/observe-services-dto-common.zargo~ | Bin 0 -> 35328 bytes .../service/seine/TripSeineServiceRestTest.java | 2 +- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../fr/ird/observe/services/service/RigthTest.java | 2 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- 58 files changed, 801 insertions(+), 719 deletions(-) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.