This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from b33c7e6 ajout de trad new b1e6def association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) new bfb6d56 migration de l'écran (sans validation) (refs #7589) new e58503f correction du rebase sur develop (refs #7589) new 61787bc deproxifier les proxy hibernante (refs #7589) new 3f36f41 ajout de la validation (refs #7589) new 8b785fb Merge branch 'feature/7589' into develop 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 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 commit 3f36f41439b6749cd26d7893c66e45cf851cad52 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 12:09:34 2015 +0200 ajout de la validation (refs #7589) commit 61787bc92d958c410395f730cc9bd0cc64e186aa Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 12:09:13 2015 +0200 deproxifier les proxy hibernante (refs #7589) commit e58503fe5d7322105cc25eae7afaa7b0512a7105 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 12:08:25 2015 +0200 correction du rebase sur develop (refs #7589) commit bfb6d56de2c312f220be0506353e65f4bdd36e09 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 11:11:52 2015 +0200 migration de l'écran (sans validation) (refs #7589) commit b1e6def416e47cee6e4ee62029cefd8a6dbe7ba6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 12 10:39:01 2015 +0200 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) Summary of changes: .../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 | 0 ...eineGearUseDto-n1-update-warning-validation.xml | 0 .../GearUseFeaturesSeineServiceController.java | 70 --------- ...java => TripSeineGearUseServiceController.java} | 23 +-- .../service/seine/GearUseFeaturesSeineService.java | 64 -------- ...emService.java => TripSeineGearUseService.java} | 11 +- .../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 ++++---------------- 46 files changed, 534 insertions(+), 793 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/GearUseFeaturesSeineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml (100%) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java copy observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/{SchoolEstimateServiceController.java => TripSeineGearUseServiceController.java} (59%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/seine/{ActivitySeineObservedSystemService.java => TripSeineGearUseService.java} (78%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java rename observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/{GearUseFeaturesSeineServiceRestTest.java => TripSeineGearUseServiceRestTest.java} (65%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java rename observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/{GearUseFeaturesSeineServiceTopiaTest.java => TripSeineGearUseServiceTopiaTest.java} (54%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.