This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8b785fb0c1969335cb49cb93088e27a4d3bd3989 Merge: b33c7e6 3f36f41 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 12:10:50 2015 +0200 Merge branch 'feature/7589' into develop .../ird/observe/ui/content/ContentUIHandler.java | 6 + .../ird/observe/ui/content/ContentUIManager.java | 3 +- .../ui/content/open/ContentOpenableUIHandler.java | 7 - .../ui/content/table/ContentTableModel.java | 44 ++---- .../ui/content/table/ContentTableUIHandler.java | 18 ++- .../content/table/ContentTableUIInitializer.java | 2 - .../ui/content/table/ContentTableUIModel.java | 41 +---- .../impl/longline/BaitsCompositionUIModel.java | 6 + .../longline/BranchlinesCompositionUIModel.java | 7 +- .../impl/longline/CatchLonglineTableModel.java | 19 +++ .../table/impl/longline/EncounterUIModel.java | 6 + .../longline/FloatlinesCompositionUIModel.java | 6 + .../GearUseFeaturesLonglineTableModel.java | 19 +++ .../impl/longline/HooksCompositionUIModel.java | 6 + .../table/impl/longline/SensorUsedUIModel.java | 7 + .../ui/content/table/impl/longline/TdrUIModel.java | 7 + .../seine/GearUseFeatureMeasurementCellEditor.java | 12 +- .../GearUseFeatureMeasurementCellRenderer.java | 18 ++- .../impl/seine/GearUseFeaturesSeineTableModel.java | 24 ++- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 174 +++++++-------------- .../impl/seine/GearUseFeaturesSeineUIModel.java | 54 +++---- .../table/impl/seine/NonTargetCatchUIModel.java | 7 + .../table/impl/seine/NonTargetSampleUIModel.java | 6 + .../impl/seine/ObjectObservedSpeciesUIModel.java | 6 + .../impl/seine/ObjectSchoolEstimateUIModel.java | 6 + .../table/impl/seine/SchoolEstimateUIModel.java | 7 + .../table/impl/seine/TargetCatchUIModel.java | 6 + .../impl/seine/TargetDiscardCatchUIModel.java | 6 + .../table/impl/seine/TargetSampleUIModel.java | 7 + .../tree/loadors/ProgramSeineNodeChildLoador.java | 1 - ...FeaturesSeineDto-n1-update-error-validation.xml | 55 +++++++ ...eineGearUseDto-n1-update-warning-validation.xml | 41 +++++ .../GearUseFeaturesSeineServiceController.java | 70 --------- .../seine/TripSeineGearUseServiceController.java | 54 +++++++ ...neService.java => TripSeineGearUseService.java} | 26 +-- .../dto/referential/GearCaracteristicTypeDtos.java | 71 +++++++++ .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60043 -> 60981 bytes ...t.java => TripSeineGearUseServiceRestTest.java} | 125 ++++----------- .../EntityToReferentialReferenceDtoBuilder.java | 8 + .../services/dto/ObserveDtosInitializer.java | 11 +- .../seine/GearUseFeaturesSeineServiceTopia.java | 148 ------------------ .../seine/TripSeineGearUseServiceTopia.java | 80 ++++++++++ ....java => TripSeineGearUseServiceTopiaTest.java} | 167 ++++---------------- 45 files changed, 672 insertions(+), 733 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.