This is an automated email from the git hooks/post-receive script. New change to branch feature/7594 in repository observe. See http://git.codelutin.com/observe.git discards 263b8c7 migration de l'ecran des activités palangre (refs #7594) adds d889d8f transformation des entités en reference dans le service plutot qu'en transformant le formdto en referencedto dans l'ui adds bcfb70a fix method call adds ae9eff7 fix parameter name adds aa47105 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) adds 426ee01 chargement de la reference dans le service (refs #7553) adds 3902db3 correction des décorateurs (refs #7553) adds 0cfe75e Merge branch 'feature/7553_2' into develop (refs #7553) adds d1b4ace modif du decorateur de classe Dto (pour eviter de se taper toutes les trads à modifier et faire des oublis ou des erreurs) adds b33c7e6 ajout de trad adds b1e6def association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) adds bfb6d56 migration de l'écran (sans validation) (refs #7589) adds e58503f correction du rebase sur develop (refs #7589) adds 61787bc deproxifier les proxy hibernante (refs #7589) adds 3f36f41 ajout de la validation (refs #7589) adds 8b785fb Merge branch 'feature/7589' into develop new 69504e6 migration de l'ecran des activités palangre (refs #7594) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (263b8c7) \ N -- N -- N refs/heads/feature/7594 (69504e6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 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 69504e614f26bd477325bdb9887acc7f8a9d0ac1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 12 10:00:30 2015 +0200 migration de l'ecran des activités palangre (refs #7594) Summary of changes: .../java/fr/ird/observe/ui/DecoratorService.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 6 + .../ird/observe/ui/content/ContentUIManager.java | 22 +-- .../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 + .../ird/observe/ui/tree/ActivityLonglineNode.java | 20 +-- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 14 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 9 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 19 +-- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 18 +-- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 13 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 12 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 12 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 19 +-- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 19 +-- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 3 +- ...FeaturesSeineDto-n1-update-error-validation.xml | 0 ...eineGearUseDto-n1-update-warning-validation.xml | 0 .../observe-application-swing_fr_FR.properties | 14 +- .../v1/ReferentialServiceController.java | 6 + .../ActivityLonglineServiceController.java | 6 + .../v1/longline/SetLonglineServiceController.java | 6 + .../v1/longline/TripLonglineServiceController.java | 6 + .../v1/seine/ActivitySeineServiceController.java | 6 + .../v1/seine/FloatingObjectServiceController.java | 6 + .../GearUseFeaturesSeineServiceController.java | 70 --------- .../v1/seine/RouteServiceController.java | 6 + .../v1/seine/SetSeineServiceController.java | 6 + ...java => TripSeineGearUseServiceController.java} | 23 +-- .../v1/seine/TripSeineServiceController.java | 6 + .../services/service/ReferentialService.java | 4 + .../service/longline/ActivityLonglineService.java | 4 + .../service/longline/SetLonglineService.java | 4 + .../service/longline/TripLonglineService.java | 4 + .../service/seine/ActivitySeineService.java | 4 + .../service/seine/FloatingObjectService.java | 4 + .../service/seine/GearUseFeaturesSeineService.java | 64 -------- .../services/service/seine/RouteService.java | 5 + .../services/service/seine/SetSeineService.java | 4 + ...emService.java => TripSeineGearUseService.java} | 11 +- .../services/service/seine/TripSeineService.java | 4 + .../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 +- .../services/service/ReferentialServiceTopia.java | 8 + .../longline/ActivityLonglineServiceTopia.java | 10 ++ .../service/longline/SetLonglineServiceTopia.java | 11 ++ .../service/longline/TripLonglineServiceTopia.java | 10 ++ .../service/seine/ActivitySeineServiceTopia.java | 11 +- .../service/seine/FloatingObjectServiceTopia.java | 10 ++ .../seine/GearUseFeaturesSeineServiceTopia.java | 148 ------------------ .../services/service/seine/RouteServiceTopia.java | 13 ++ .../service/seine/SetSeineServiceTopia.java | 11 ++ .../seine/TripSeineGearUseServiceTopia.java | 80 ++++++++++ .../service/seine/TripSeineServiceTopia.java | 9 ++ ....java => TripSeineGearUseServiceTopiaTest.java} | 167 ++++---------------- 87 files changed, 761 insertions(+), 952 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>.