October 2015 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7594 updated (69504e6 -> 743b122)
by codelutin.com scm 13 Oct '15

13 Oct '15

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 69504e6 migration de l'ecran des activités palangre (refs #7594) adds aafa3db suppression du log des marées au démarage. adds f0a0274 migration de l'ecran (refs #7597) new 743b122 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 (69504e6) \ N -- N -- N refs/heads/feature/7594 (743b122) 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 743b1229a969fb1fec2ef789fdbe837f75478060 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Oct 12 10:00:30 2015 +0200 migration de l'ecran des activités palangre (refs #7594) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 47 +++------------------- .../observe/ui/content/ContentUIInitializer.java | 7 ++-- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 7 ++-- .../ActivitySeineObservedSystemUIHandler.java | 34 +++------------- .../seine/ActivitySeineObservedSystemUIModel.java | 2 - ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...tivitySeineObservedSystemServiceController.java | 3 +- .../seine/ActivitySeineObservedSystemService.java | 3 +- .../main/xmi/observe-services-dto-seine.properties | 1 - .../services/builder/DtoToEntityBuilder.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 12 ++++-- .../services/entity/ObserveEntitiesFilters.java | 6 +++ .../ActivitySeineObservedSystemServiceTopia.java | 6 ++- 14 files changed, 41 insertions(+), 89 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7553-3 created (now de6364f)
by codelutin.com scm 13 Oct '15

13 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553-3 in repository observe. See http://git.codelutin.com/observe.git at de6364f chargement des sous noeuds des program longline (refs #7553) This branch includes the following new commits: new de6364f chargement des sous noeuds des program longline (refs #7553) 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 de6364fc006be6e2ade9672b10d1f7a180f1c907 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Oct 13 16:00:58 2015 +0200 chargement des sous noeuds des program longline (refs #7553) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (aafa3db -> f0a0274)
by codelutin.com scm 13 Oct '15

13 Oct '15

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 aafa3db suppression du log des marées au démarage. new f0a0274 migration de l'ecran (refs #7597) 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 f0a0274b05c0c746fee66d6f36edc74fad57b87f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 15:56:25 2015 +0200 migration de l'ecran (refs #7597) Summary of changes: .../observe/ui/content/ContentUIInitializer.java | 7 +++-- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 7 ++--- .../ActivitySeineObservedSystemUIHandler.java | 34 ++++------------------ .../seine/ActivitySeineObservedSystemUIModel.java | 2 -- ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...tivitySeineObservedSystemServiceController.java | 3 +- .../seine/ActivitySeineObservedSystemService.java | 3 +- .../main/xmi/observe-services-dto-seine.properties | 1 - .../services/builder/DtoToEntityBuilder.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 12 +++++--- .../services/entity/ObserveEntitiesFilters.java | 6 ++++ .../ActivitySeineObservedSystemServiceTopia.java | 6 ++-- 13 files changed, 35 insertions(+), 48 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-n1-update-warning-validation.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (8b785fb -> aafa3db)
by codelutin.com scm 13 Oct '15

13 Oct '15

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 8b785fb Merge branch 'feature/7589' into develop new aafa3db suppression du log des marées au démarage. 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 aafa3db0b36ef1ff6ffd6ca8efb935a04acb241a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 14:08:54 2015 +0200 suppression du log des marées au démarage. Summary of changes: .../observe/ObserveSwingApplicationContext.java | 47 +++------------------- 1 file changed, 6 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7594 updated (263b8c7 -> 69504e6)
by codelutin.com scm 13 Oct '15

13 Oct '15

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(a)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(a)list.forge.codelutin.com>.

1 1

branch develop updated (b33c7e6 -> 8b785fb)
by codelutin.com scm 13 Oct '15

13 Oct '15

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(a)codelutin.com> Date: Tue Oct 13 12:10:50 2015 +0200 Merge branch 'feature/7589' into develop commit 3f36f41439b6749cd26d7893c66e45cf851cad52 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:09:34 2015 +0200 ajout de la validation (refs #7589) commit 61787bc92d958c410395f730cc9bd0cc64e186aa Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:09:13 2015 +0200 deproxifier les proxy hibernante (refs #7589) commit e58503fe5d7322105cc25eae7afaa7b0512a7105 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:08:25 2015 +0200 correction du rebase sur develop (refs #7589) commit bfb6d56de2c312f220be0506353e65f4bdd36e09 Author: Sylvain Bavencoff <bavencoff(a)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(a)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(a)list.forge.codelutin.com>.

1 6

branch feature/7589 deleted (was 3f36f41)
by codelutin.com scm 13 Oct '15

13 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7589 in repository observe. See http://git.codelutin.com/observe.git was 3f36f41 ajout de la validation (refs #7589) This change permanently discards the following revisions: discards 3f36f41 ajout de la validation (refs #7589) discards 61787bc deproxifier les proxy hibernante (refs #7589) discards e58503f correction du rebase sur develop (refs #7589) discards bfb6d56 migration de l'écran (sans validation) (refs #7589) discards b1e6def association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7589 updated (ecd6ac3 -> 3f36f41)
by codelutin.com scm 13 Oct '15

13 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7589 in repository observe. See http://git.codelutin.com/observe.git discards ecd6ac3 migration de l'écran (sans validation) (refs #7589) discards cf7f553 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) 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 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) 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 (ecd6ac3) \ N -- N -- N refs/heads/feature/7589 (3f36f41) 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 5 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 3f36f41439b6749cd26d7893c66e45cf851cad52 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:09:34 2015 +0200 ajout de la validation (refs #7589) commit 61787bc92d958c410395f730cc9bd0cc64e186aa Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:09:13 2015 +0200 deproxifier les proxy hibernante (refs #7589) commit e58503fe5d7322105cc25eae7afaa7b0512a7105 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 12:08:25 2015 +0200 correction du rebase sur develop (refs #7589) commit bfb6d56de2c312f220be0506353e65f4bdd36e09 Author: Sylvain Bavencoff <bavencoff(a)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(a)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: .../java/fr/ird/observe/ui/DecoratorService.java | 6 ++- .../ird/observe/ui/content/ContentUIManager.java | 20 +++++----- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 2 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 14 +------ .../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 | 15 +++---- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 5 +-- ...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 | 10 ++++- .../v1/longline/SetLonglineServiceController.java | 6 +++ .../v1/longline/TripLonglineServiceController.java | 6 +++ .../v1/seine/ActivitySeineServiceController.java | 6 +++ .../v1/seine/FloatingObjectServiceController.java | 6 +++ .../v1/seine/RouteServiceController.java | 6 +++ .../v1/seine/SetSeineServiceController.java | 6 +++ .../v1/seine/TripSeineServiceController.java | 6 +++ .../services/service/ReferentialService.java | 4 ++ .../service/longline/ActivityLonglineService.java | 7 +++- .../service/longline/SetLonglineService.java | 4 ++ .../service/longline/TripLonglineService.java | 4 ++ .../service/seine/ActivitySeineService.java | 4 ++ .../service/seine/FloatingObjectService.java | 4 ++ .../services/service/seine/RouteService.java | 5 +++ .../services/service/seine/SetSeineService.java | 4 ++ .../services/service/seine/TripSeineService.java | 4 ++ .../EntityToReferentialReferenceDtoBuilder.java | 8 ++++ .../services/service/ReferentialServiceTopia.java | 8 ++++ .../longline/ActivityLonglineServiceTopia.java | 46 +++++++++++----------- .../service/longline/SetLonglineServiceTopia.java | 11 ++++++ .../service/longline/TripLonglineServiceTopia.java | 10 +++++ .../service/seine/ActivitySeineServiceTopia.java | 11 +++++- .../service/seine/FloatingObjectServiceTopia.java | 10 +++++ .../services/service/seine/RouteServiceTopia.java | 13 ++++++ .../service/seine/SetSeineServiceTopia.java | 11 ++++++ .../service/seine/TripSeineServiceTopia.java | 9 +++++ 48 files changed, 253 insertions(+), 199 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%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 5

branch feature/7589 updated (cf7f553 -> ecd6ac3)
by codelutin.com scm 13 Oct '15

13 Oct '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7589 in repository observe. See http://git.codelutin.com/observe.git from cf7f553 association du noeud de l'arbre de navigation avec l'écran d'eition (refs #7589) new ecd6ac3 migration de l'écran (sans validation) (refs #7589) 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 ecd6ac39fe7f7530fb1f105a6e80dc92a3af64bd Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Oct 13 11:11:52 2015 +0200 migration de l'écran (sans validation) (refs #7589) Summary of changes: .../ird/observe/ui/content/ContentUIHandler.java | 6 + .../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 | 8 +- .../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 + .../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 ++++----------- .../services/dto/ObserveDtosInitializer.java | 11 +- .../seine/GearUseFeaturesSeineServiceTopia.java | 148 ------------------ .../seine/TripSeineGearUseServiceTopia.java | 80 ++++++++++ ....java => TripSeineGearUseServiceTopiaTest.java} | 167 ++++---------------- 41 files changed, 523 insertions(+), 790 deletions(-) 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(a)list.forge.codelutin.com>.

1 1

branch develop updated (d1b4ace -> b33c7e6)
by codelutin.com scm 12 Oct '15

12 Oct '15

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 d1b4ace modif du decorateur de classe Dto (pour eviter de se taper toutes les trads à modifier et faire des oublis ou des erreurs) new b33c7e6 ajout de trad 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 b33c7e6e5cd389f52a6d5190b0e183dd52f01a4d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Oct 12 18:06:59 2015 +0200 ajout de trad Summary of changes: .../i18n/observe-application-swing_fr_FR.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1