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 discards 539dd0d utilisation des services dans doSave et doDelete discards a34e936 début d'utilisation des services dans doSave et doDelete (refs #7531) adds 0a38157 - ajout du décorator de referencereferentaildto - fix some fixme (refs #7530) adds 69e353e population des combo et des double listes début de chargement des beans (refs #7530) adds 967863b init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) adds 496cfe8 fix build adds 1fb9ed7 fix javadoc adds a5ba588 Migration des Editeurs (termine #7530) Merge branch 'feature/7530' into develop new e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) new a74653a utilisation des services dans doSave et doDelete 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 (539dd0d) \ N -- N -- N refs/heads/feature/7531 (a74653a) 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 2 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 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: .../business/ObserveApplicationContext.java | 1 + .../ird/observe/business/ObserveServiceHelper.java | 1 + .../observe/{business => ui}/DecoratorService.java | 38 ++-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 3 - .../src/main/java/fr/ird/observe/ui/UIHelper.java | 1 - .../observe/ui/actions/ReloadResourcesAction.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 3 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 5 +- .../observe/ui/admin/export/ExportUIHandler.java | 2 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 3 +- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 14 +- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 154 ++++---------- .../observe/ui/content/ContentUIInitializer.java | 226 +++++++++------------ .../fr/ird/observe/ui/content/ContentUIModel.java | 44 ++-- .../ird/observe/ui/content/ObserveContentUI.java | 6 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +- .../content/impl/longline/BranchlineUIHandler.java | 12 ++ .../LonglineDetailCompositionUIHandler.java | 17 +- .../LonglineDetailCompositionUIInitializer.java | 15 +- ...onglineDetailCompositionUIValidationHelper.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 4 +- .../LonglineGlobalCompositionUIHandler.java | 11 + .../ui/content/impl/longline/SetLonglineUI.jaxx | 9 +- .../impl/longline/SetLonglineUIHandler.java | 11 + .../impl/seine/ActivitySeineObservedSystemUI.css | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 11 + .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 14 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 13 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 7 +- .../impl/seine/FloatingObjectUIHandler.java | 10 + .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 10 + .../ird/observe/ui/content/list/ContentListUI.css | 2 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 7 +- .../ui/content/list/ContentListUIHandler.java | 29 +-- .../ui/content/list/ContentListUIModel.java | 19 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 5 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 +- .../ui/content/open/ContentOpenableUIHandler.java | 10 + .../open/impl/longline/ActivityLonglineUI.jaxx | 5 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 17 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 17 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 15 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 98 +++++---- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 + .../ref/ReferentialContentUIInitializer.java | 126 ------------ .../ui/content/ref/UniqueKeyTableModel.java | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 3 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 7 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 3 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 7 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 3 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 3 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 4 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 6 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 2 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 8 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 7 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 3 +- .../ui/content/table/ContentTableModel.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 113 ++++++----- .../content/table/ContentTableUIInitializer.java | 18 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../ui/content/table/ObserveContentTableUI.java | 7 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 5 +- .../impl/longline/BaitsCompositionUIHandler.java | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 5 +- .../longline/BranchlinesCompositionUIHandler.java | 9 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../table/impl/longline/CatchLonglineUI.css | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 33 +-- .../impl/longline/CatchLonglineUIHandler.java | 21 +- .../content/table/impl/longline/EncounterUI.jaxx | 5 +- .../table/impl/longline/EncounterUIHandler.java | 9 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 3 +- .../longline/FloatlinesCompositionUIHandler.java | 9 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 9 +- .../table/impl/longline/HooksCompositionUI.jaxx | 5 +- .../impl/longline/HooksCompositionUIHandler.java | 9 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 7 +- .../table/impl/longline/SensorUsedUIHandler.java | 11 +- .../ui/content/table/impl/longline/TdrUI.css | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 18 +- .../content/table/impl/longline/TdrUIHandler.java | 9 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 3 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 7 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 9 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 5 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 23 +-- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 5 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 24 ++- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 3 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 9 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 3 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 9 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 5 +- .../table/impl/seine/TargetCatchUIHandler.java | 34 ++-- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 7 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 71 ++++--- .../content/table/impl/seine/TargetSampleUI.jaxx | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 15 +- .../ird/observe/ui/storage/StorageUIHandler.java | 10 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../decorator/LengthWeightParameterDecorator.java | 2 +- .../util}/decorator/NonTargetCatchDecorator.java | 2 +- .../util}/decorator/NonTargetLengthDecorator.java | 2 +- .../decorator/ObjectObservedSpeciesDecorator.java | 2 +- .../util}/decorator/ObserveDecorator.java | 2 +- .../util}/decorator/ReferenceDecorator.java | 2 +- .../decorator/ReferenceReferentialDecorator.java | 33 +++ .../util}/decorator/SpeciesDecorator.java | 2 +- .../util}/decorator/TripLonglineDecorator.java | 2 +- .../util}/decorator/TripSeineDecorator.java | 2 +- ...glineDetailCompositionValidatorServiceTest.java | 117 ++++++----- .../fr/ird/observe/services/dto/ReferenceDtos.java | 37 ++++ .../services/dto/referential/ReferentialDtos.java | 64 ++++++ 134 files changed, 1014 insertions(+), 986 deletions(-) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui}/DecoratorService.java (95%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/LengthWeightParameterDecorator.java (98%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/NonTargetCatchDecorator.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/NonTargetLengthDecorator.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/ObjectObservedSpeciesDecorator.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/ObserveDecorator.java (98%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/ReferenceDecorator.java (97%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/ReferenceReferentialDecorator.java rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/SpeciesDecorator.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/TripLonglineDecorator.java (96%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => ui/util}/decorator/TripSeineDecorator.java (96%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.