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

branch feature/7531 updated (f12b43c -> 20e26b1)
by codelutin.com scm 28 Sep '15

28 Sep '15

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 from f12b43c suppression des fixme (refs #7531) new 20e26b1 utilisation des services dans getChilds des lists (refs #7531) 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 20e26b1cd218aa40f5032e5e4324289e2b7895f0 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) Summary of changes: .../content/impl/longline/BranchlineUIHandler.java | 8 ++--- .../LonglineDetailCompositionUIHandler.java | 36 ++++++++++++---------- .../LonglineDetailCompositionUIInitializer.java | 4 --- .../longline/LonglineDetailCompositionUIModel.java | 7 ----- .../impl/longline/ActivityLonglinesUIHandler.java | 26 ++++++++-------- .../list/impl/longline/TripLonglinesUIHandler.java | 27 ++++++++-------- .../list/impl/seine/ActivitySeinesUIHandler.java | 26 ++++++++-------- .../content/list/impl/seine/RoutesUIHandler.java | 25 +++++++-------- .../list/impl/seine/TripSeinesUIHandler.java | 29 ++++++++--------- .../ActivityLonglineServiceController.java | 5 ++- .../v1/longline/TripLonglineServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 5 ++- .../v1/seine/RouteServiceController.java | 5 ++- .../v1/seine/TripSeineServiceController.java | 5 ++- .../service/longline/ActivityLonglineService.java | 5 ++- .../service/longline/TripLonglineService.java | 5 ++- .../service/seine/ActivitySeineService.java | 5 ++- .../services/service/seine/RouteService.java | 5 ++- .../services/service/seine/TripSeineService.java | 5 ++- .../longline/ActivityLonglineServiceTopia.java | 30 +++++++++--------- .../service/longline/TripLonglineServiceTopia.java | 25 ++++++++------- .../service/seine/ActivitySeineServiceTopia.java | 28 +++++++++-------- .../services/service/seine/RouteServiceTopia.java | 24 +++++++++------ .../service/seine/TripSeineServiceTopia.java | 25 ++++++++------- 24 files changed, 184 insertions(+), 186 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/7531 updated (3f97619 -> f12b43c)
by codelutin.com scm 28 Sep '15

28 Sep '15

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 from 3f97619 Fix merge new e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) new a74653a utilisation des services dans doSave et doDelete new eefe001 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 new f0f27e6 appel des services pour le load et precreate (refs #7531) new 71a5e4e appel de services dans dopersist (refs #7531) new f12b43c suppression des fixme (refs #7531) 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 f12b43c0d2e1337379f129ce8c29174a57ddc7a3 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 16:27:01 2015 +0200 suppression des fixme (refs #7531) commit 71a5e4e4fa2cdbcf01bbe3a09a18ad240b1ee573 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 25 17:03:15 2015 +0200 appel de services dans dopersist (refs #7531) commit f0f27e64c97571bc91576c4958f5e406ad3b7263 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 25 11:32:25 2015 +0200 appel des services pour le load et precreate (refs #7531) commit eefe00196889adb745c6adbef684867164ecfaee Merge: a74653a 3f97619 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 25 10:34:07 2015 +0200 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 Conflicts: observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java commit a74653a8c1dc87f17f2295a626c2f14c1a38b325 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit e6cec26969eaef71c1e463b17a0d4638e410ce40 Author: Kevin Morin <morin(a)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: .../main/java/fr/ird/observe/ObserveCLAction.java | 3 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 14 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +---- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 +++-- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 -- .../ird/observe/ui/content/ContentUIHandler.java | 93 +--------- .../observe/ui/content/ContentUIInitializer.java | 202 ++++++++------------- .../ird/observe/ui/content/ContentUIManager.java | 64 ++++--- .../impl/longline/SetLonglineUIHandler.java | 41 ++--- .../ActivitySeineObservedSystemUIHandler.java | 32 ++-- ...ngObjectTransmittingBuoyOperationUIHandler.java | 12 -- .../impl/seine/FloatingObjectUIHandler.java | 34 ++-- .../ui/content/impl/seine/SetSeineUIHandler.java | 62 ++++--- .../impl/longline/ActivityLonglineUIHandler.java | 37 ++-- .../open/impl/longline/TripLonglineUIHandler.java | 30 +-- .../open/impl/seine/ActivitySeineUIHandler.java | 40 ++-- .../ui/content/open/impl/seine/RouteUIHandler.java | 41 ++--- .../open/impl/seine/TripSeineUIHandler.java | 58 +++--- .../ui/content/ref/ContentReferenceUIHandler.java | 64 +++---- .../ui/content/table/ContentTableUIHandler.java | 40 ++-- .../ui/content/table/ContentTableUIModel.java | 19 +- .../impl/longline/BaitsCompositionUIHandler.java | 20 ++ .../longline/BranchlinesCompositionUIHandler.java | 26 ++- .../impl/longline/CatchLonglineUIHandler.java | 30 ++- .../table/impl/longline/EncounterUIHandler.java | 24 ++- .../longline/FloatlinesCompositionUIHandler.java | 26 ++- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 ++- .../impl/longline/HooksCompositionUIHandler.java | 26 ++- .../table/impl/longline/SensorUsedUIHandler.java | 21 ++- .../content/table/impl/longline/TdrUIHandler.java | 21 ++- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 ++- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 ++- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++ .../impl/seine/TargetDiscardCatchUIHandler.java | 24 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 +++ .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 -- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 12 -- .../EditableTableWithCacheTableModelSupport.java | 24 +-- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../main/xmi/observe-services-dto-common.zargo~ | Bin 0 -> 35328 bytes .../service/seine/TripSeineServiceRestTest.java | 2 +- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../fr/ird/observe/services/service/RigthTest.java | 2 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- 58 files changed, 801 insertions(+), 719 deletions(-) create mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ -- 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/7547 created (now 07383c7)
by codelutin.com scm 28 Sep '15

28 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7547 in repository observe. See http://git.codelutin.com/observe.git at 07383c7 mise en place du générateur de text (refs #7547) This branch includes the following new commits: new 07383c7 mise en place du générateur de text (refs #7547) 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 07383c7807fcd13a6b31ba32d19ef546c6ad5a3a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Sep 28 09:55:57 2015 +0200 mise en place du générateur de text (refs #7547) -- 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/7531 updated (a74653a -> 3f97619)
by codelutin.com scm 24 Sep '15

24 Sep '15

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 a74653a utilisation des services dans doSave et doDelete discards e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) adds ea09607 lancement de l'application + connexion aux bases H2 et PG (refs #7528 #7529) adds 93fd18f utilisation de la classe ObserveSwingDataSource pour gérer les connection au source de données, (refs #7529) adds fdde99f commexion au serveur de données (refs #7529) adds dc60289 ignorer un test et mise à jour des dépendences (refs #7529) adds 733fcf2 creation d'un base local (refs #7529) adds 726eaba chargement de la base de données local au démarage (refs #7528) adds 9076109 Fix merge adds 5abc310 Renommage getModle en getModel adds 4ce182d Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop new e11ff67 début d'utilisation des services dans doSave et doDelete (refs #7531) new 4a26bd2 utilisation des services dans doSave et doDelete new 3f97619 Fix merge 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 (a74653a) \ N -- N -- N refs/heads/feature/7531 (3f97619) 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 3 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 3f9761934c1677a16f7bf67a3637350a4a27b054 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 19:26:43 2015 +0200 Fix merge commit 4a26bd22257c118708548289976a12a23c7fe298 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit e11ff675ce00b4d47b7fdcb9ccc73043b1442bcf Author: Kevin Morin <morin(a)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: observe-application-swing/pom.xml | 11 + .../src/main/filters/observe-ui.properties | 1 + .../java/fr/ird/observe/ObserveActionExecutor.java | 22 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 30 +- .../main/java/fr/ird/observe/ObserveConfig.java | 1004 ----- .../main/java/fr/ird/observe/ObserveContext.java | 594 --- .../fr/ird/observe/ObserveResourceManager.java | 20 +- .../main/java/fr/ird/observe/ObserveRunner.java | 74 +- .../{business => }/ObserveServiceHelper.java | 63 +- .../observe/ObserveSwingApplicationContext.java | 764 ++++ .../fr/ird/observe/business/IObserveConfig.java | 4 +- .../business/ObserveApplicationContext.java | 9 +- .../ird/observe/business/db/DataSourceConfig.java | 2 +- .../ird/observe/business/db/DataSourceFactory.java | 2 +- .../db/constants/CommonDataSourceConfigParam.java | 1 + .../business/report/model/ReportExecute.java | 15 +- .../business/validation/ObserveValidator.java | 6 +- .../validation/ValidationMessageDetector.java | 2 +- .../ObserveApplicationConfigProvider.java | 7 +- .../ObserveSwingApplicationConfig.java | 1152 +++++ .../ObserveSwingApplicationConfigOption.java} | 217 +- .../ObserveSwingApplicationConfigProvider.java | 37 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 304 ++ .../constantes}/ConnexionStatus.java | 2 +- .../constants => db/constantes}/CreationMode.java | 28 +- .../db/constants => db/constantes}/DbMode.java | 7 +- .../db/event/ObserveSwingDataSourceEvent.java | 18 +- .../db/event/ObserveSwingDataSourceListener.java | 22 +- .../ObserveSwingDataSourceListenerAdapter.java | 14 +- .../src/main/java/fr/ird/observe/package.html | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 51 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 12 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 18 +- .../actions/ChangeApplicationLanguageAction.java | 12 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 12 +- .../observe/ui/actions/ChangeStorageAction.java | 6 +- .../observe/ui/actions/CloseApplicationAction.java | 6 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 10 +- .../ird/observe/ui/actions/CloseStorageAction.java | 21 +- .../fr/ird/observe/ui/actions/GotoSiteAction.java | 8 +- .../ui/actions/ImportStorageFromFileAction.java | 9 +- .../ird/observe/ui/actions/LaunchAdminAction.java | 4 +- .../ui/actions/ReloadApplicationAction.java | 8 +- .../actions/ReloadDefaultConfigurationAction.java | 12 +- .../observe/ui/actions/ReloadResourcesAction.java | 8 +- .../observe/ui/actions/ReloadStorageAction.java | 92 +- .../ui/actions/SaveStorageToFileAction.java | 32 +- .../ird/observe/ui/actions/ShowConfigAction.java | 128 +- .../observe/ui/actions/ShowStorageInfoAction.java | 4 +- .../observe/ui/actions/StartServerModeAction.java | 7 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 6 +- .../ui/actions/shared/CloseOpenUIAction.java | 6 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 6 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 33 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 28 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 107 +- .../observe/ui/admin/config/ConfigUIHandler.java | 2 - .../ui/admin/consolidate/ConsolidateModel.java | 8 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 14 +- .../observe/ui/admin/export/ExportUIHandler.java | 12 +- .../ui/admin/gps/GPSActivityTableModel.java | 4 +- .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 6 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 5 +- .../observe/ui/admin/report/ReportUIHandler.java | 21 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 28 +- .../ObsoleteEntityListCellRenderer.java | 4 +- .../ui/admin/synchronize/SynchronizeModel.java | 20 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 17 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 6 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../observe/ui/admin/validate/ValidateModel.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 11 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 15 +- .../ird/observe/ui/content/ContentUIHandler.java | 143 +- .../observe/ui/content/ContentUIInitializer.java | 215 +- .../content/impl/longline/BranchlineUIHandler.java | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../LonglineDetailCompositionUIHandler.java | 28 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 10 - .../impl/longline/SetLonglineUIHandler.java | 11 - .../ActivitySeineObservedSystemUIHandler.java | 11 - .../impl/seine/FloatingObjectUIHandler.java | 11 - .../ui/content/impl/seine/SetSeineUIHandler.java | 11 - .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/open/ContentOpenableUIHandler.java | 10 - .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 7 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 - .../ui/content/ref/UniqueKeyTableModel.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 25 +- .../impl/longline/CatchLonglineUIHandler.java | 21 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 12 +- .../table/impl/longline/SensorUsedUIHandler.java | 9 +- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 18 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 19 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 10 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 3 +- .../ui/storage/StorageBackupUILauncher.java | 68 +- .../ird/observe/ui/storage/StorageUIHandler.java | 893 ++-- .../ird/observe/ui/storage/StorageUILauncher.java | 52 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 1213 +++--- .../ird/observe/ui/storage/tabs/ChooseDbModeUI.css | 13 + .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 14 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 26 + .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 46 +- .../ui/storage/tabs}/DataSelectionModel.java | 255 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 67 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 23 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 95 +- .../ui/tree/NavigationTreeSelectionModel.java | 4 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 10 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 14 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 4 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 6 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 4 +- .../util/ObserveValidatorMessageTableRenderer.java | 4 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 12 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 1823 ++++---- .../observe-application-swing_es_ES.properties | 2125 +++++----- .../observe-application-swing_fr_FR.properties | 4405 ++++++++++---------- ...{action-import-gps.png => action-db-server.png} | Bin .../src/main/resources/observeSwing.conf | 5 + ...glineDetailCompositionValidatorServiceTest.java | 127 +- .../DataSourceDumpProducerServiceController.java | 29 + .../controller/v1/DataSourceServiceController.java | 3 +- .../web/controller/v1/PingServiceController.java | 8 +- .../ObserveWebSecurityApplicationContext.java | 2 +- observe-entities/pom.xml | 62 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../ird/observe/services/service/PingService.java | 2 + observe-services-configuration-api/pom.xml | 6 + .../configuration/ObserveDataSourceConnection.java | 5 + .../ObserveDataSourceConnectionSupport.java | 13 +- observe-services-configuration-rest/pom.xml | 6 + .../ObserveDataSourceConnectionRest.java | 7 +- observe-services-configuration-topia/pom.xml | 4 +- .../ObserveDataSourceConnectionTopia.java | 7 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../observe/services/dto/gson/VersionAdapter.java | 36 + .../services/dto/referential/ProgramDtos.java | 44 + .../services/dto/referential/ReferentialDtos.java | 116 +- .../main/xmi/observe-services-dto-common.zargo~ | Bin 35328 -> 0 bytes .../ird/observe/services/TestMethodResource.java | 2 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 35 + .../services/ObserveServiceContextTopia.java | 3 + .../EntityToReferentialReferenceDtoBuilder.java | 13 + .../services/dto/ObserveDtosInitializer.java | 284 +- .../services/service/DataSourceServiceTopia.java | 12 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 3 +- ...EntityToReferentialReferenceDtoBuilderTest.java | 57 + pom.xml | 3 + 181 files changed, 9865 insertions(+), 8270 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/ObserveServiceHelper.java (85%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{ => configuration}/ObserveApplicationConfigProvider.java (90%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java rename observe-application-swing/src/main/java/fr/ird/observe/{ObserveConfigOption.java => configuration/ObserveSwingApplicationConfigOption.java} (75%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/ConnexionStatus.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/CreationMode.java (72%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/DbMode.java (88%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceEvent.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceEvent.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListener.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListener.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListenerAdapter.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListenerAdapter.java (70%) rename {observe-business/src/main/java/fr/ird/observe/db/model => observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs}/DataSelectionModel.java (60%) copy observe-application-swing/src/main/resources/icons/{action-import-gps.png => action-db-server.png} (100%) create mode 100644 observe-application-swing/src/main/resources/observeSwing.conf create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceDumpProducerServiceController.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java delete mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilderTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch develop updated (a5ba588 -> 4ce182d)
by codelutin.com scm 24 Sep '15

24 Sep '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 a5ba588 Migration des Editeurs (termine #7530) Merge branch 'feature/7530' into develop new ea09607 lancement de l'application + connexion aux bases H2 et PG (refs #7528 #7529) new 93fd18f utilisation de la classe ObserveSwingDataSource pour gérer les connection au source de données, (refs #7529) new fdde99f commexion au serveur de données (refs #7529) new dc60289 ignorer un test et mise à jour des dépendences (refs #7529) new 733fcf2 creation d'un base local (refs #7529) new 726eaba chargement de la base de données local au démarage (refs #7528) new 9076109 Fix merge new 5abc310 Renommage getModle en getModel new 4ce182d Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop The 9 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 4ce182de736e5a36450733b6c73fa8d44476ee8b Merge: a5ba588 5abc310 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 19:08:16 2015 +0200 Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop commit 5abc310859d024220d71073f00f5597f819b79a6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 19:07:53 2015 +0200 Renommage getModle en getModel commit 9076109ed64da2e89d50d25fd3b4739558e26c38 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 19:06:15 2015 +0200 Fix merge commit 726eaba6cd46434d131daa36fd081884ef24a374 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 24 09:46:29 2015 +0200 chargement de la base de données local au démarage (refs #7528) commit 733fcf27ac8f520ed11b51934bbdeefd62e98ae6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 23 17:59:04 2015 +0200 creation d'un base local (refs #7529) commit dc602893c5d418d0cf383bca0cff4f35c594c425 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 23 09:19:03 2015 +0200 ignorer un test et mise à jour des dépendences (refs #7529) commit fdde99f88ce4675093e402b44a50818e6193a7d1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 23 08:42:39 2015 +0200 commexion au serveur de données (refs #7529) commit 93fd18f76d2323d59e5d16d63690ee8e1033b9d2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 22 08:42:10 2015 +0200 utilisation de la classe ObserveSwingDataSource pour gérer les connection au source de données, (refs #7529) commit ea0960779ae18ecd66658c27400148a784c69239 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Sep 18 15:28:11 2015 +0200 lancement de l'application + connexion aux bases H2 et PG (refs #7528 #7529) Summary of changes: observe-application-swing/pom.xml | 11 + .../src/main/filters/observe-ui.properties | 1 + .../java/fr/ird/observe/ObserveActionExecutor.java | 22 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 30 +- .../main/java/fr/ird/observe/ObserveConfig.java | 1004 ----- .../main/java/fr/ird/observe/ObserveContext.java | 594 --- .../fr/ird/observe/ObserveResourceManager.java | 20 +- .../main/java/fr/ird/observe/ObserveRunner.java | 74 +- .../{business => }/ObserveServiceHelper.java | 63 +- .../observe/ObserveSwingApplicationContext.java | 764 ++++ .../fr/ird/observe/business/IObserveConfig.java | 4 +- .../business/ObserveApplicationContext.java | 9 +- .../ird/observe/business/db/DataSourceConfig.java | 2 +- .../ird/observe/business/db/DataSourceFactory.java | 2 +- .../db/constants/CommonDataSourceConfigParam.java | 1 + .../business/report/model/ReportExecute.java | 15 +- .../business/validation/ObserveValidator.java | 6 +- .../validation/ValidationMessageDetector.java | 2 +- .../ObserveApplicationConfigProvider.java | 7 +- .../ObserveSwingApplicationConfig.java | 1152 +++++ .../ObserveSwingApplicationConfigOption.java} | 217 +- .../ObserveSwingApplicationConfigProvider.java | 37 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 304 ++ .../constantes}/ConnexionStatus.java | 2 +- .../constants => db/constantes}/CreationMode.java | 28 +- .../db/constants => db/constantes}/DbMode.java | 7 +- .../db/event/ObserveSwingDataSourceEvent.java | 18 +- .../db/event/ObserveSwingDataSourceListener.java | 22 +- .../ObserveSwingDataSourceListenerAdapter.java | 14 +- .../src/main/java/fr/ird/observe/package.html | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 51 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 12 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 18 +- .../actions/ChangeApplicationLanguageAction.java | 12 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 12 +- .../observe/ui/actions/ChangeStorageAction.java | 6 +- .../observe/ui/actions/CloseApplicationAction.java | 6 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 10 +- .../ird/observe/ui/actions/CloseStorageAction.java | 21 +- .../fr/ird/observe/ui/actions/GotoSiteAction.java | 8 +- .../ui/actions/ImportStorageFromFileAction.java | 9 +- .../ird/observe/ui/actions/LaunchAdminAction.java | 4 +- .../ui/actions/ReloadApplicationAction.java | 8 +- .../actions/ReloadDefaultConfigurationAction.java | 12 +- .../observe/ui/actions/ReloadResourcesAction.java | 8 +- .../observe/ui/actions/ReloadStorageAction.java | 92 +- .../ui/actions/SaveStorageToFileAction.java | 32 +- .../ird/observe/ui/actions/ShowConfigAction.java | 128 +- .../observe/ui/actions/ShowStorageInfoAction.java | 4 +- .../observe/ui/actions/StartServerModeAction.java | 7 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 6 +- .../ui/actions/shared/CloseOpenUIAction.java | 6 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 6 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 33 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 28 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 107 +- .../observe/ui/admin/config/ConfigUIHandler.java | 2 - .../ui/admin/consolidate/ConsolidateModel.java | 8 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 14 +- .../observe/ui/admin/export/ExportUIHandler.java | 12 +- .../ui/admin/gps/GPSActivityTableModel.java | 4 +- .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 6 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 5 +- .../observe/ui/admin/report/ReportUIHandler.java | 21 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 28 +- .../ObsoleteEntityListCellRenderer.java | 4 +- .../ui/admin/synchronize/SynchronizeModel.java | 20 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 17 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 6 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../observe/ui/admin/validate/ValidateModel.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 11 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 15 +- .../ird/observe/ui/content/ContentUIHandler.java | 143 +- .../observe/ui/content/ContentUIInitializer.java | 215 +- .../content/impl/longline/BranchlineUIHandler.java | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../LonglineDetailCompositionUIHandler.java | 28 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 10 - .../impl/longline/SetLonglineUIHandler.java | 11 - .../ActivitySeineObservedSystemUIHandler.java | 11 - ...ngObjectTransmittingBuoyOperationUIHandler.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 11 - .../ui/content/impl/seine/SetSeineUIHandler.java | 11 - .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/open/ContentOpenableUIHandler.java | 10 - .../open/impl/longline/TripLonglineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 58 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 - .../ui/content/ref/UniqueKeyTableModel.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 25 +- .../impl/longline/CatchLonglineUIHandler.java | 21 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 12 +- .../table/impl/longline/SensorUsedUIHandler.java | 9 +- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 18 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 19 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 10 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 3 +- .../ui/storage/StorageBackupUILauncher.java | 68 +- .../ird/observe/ui/storage/StorageUIHandler.java | 893 ++-- .../ird/observe/ui/storage/StorageUILauncher.java | 52 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 1213 +++--- .../ird/observe/ui/storage/tabs/ChooseDbModeUI.css | 13 + .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 14 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 26 + .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 46 +- .../ui/storage/tabs}/DataSelectionModel.java | 255 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 67 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 23 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 95 +- .../ui/tree/NavigationTreeSelectionModel.java | 4 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 10 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 14 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 4 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 6 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 4 +- .../util/ObserveValidatorMessageTableRenderer.java | 4 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 12 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 1823 ++++---- .../observe-application-swing_es_ES.properties | 2125 +++++----- .../observe-application-swing_fr_FR.properties | 4405 ++++++++++---------- ...{action-import-gps.png => action-db-server.png} | Bin .../src/main/resources/observeSwing.conf | 5 + ...glineDetailCompositionValidatorServiceTest.java | 127 +- .../DataSourceDumpProducerServiceController.java | 29 + .../controller/v1/DataSourceServiceController.java | 3 +- .../web/controller/v1/PingServiceController.java | 8 +- .../ObserveWebSecurityApplicationContext.java | 2 +- observe-entities/pom.xml | 62 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../ird/observe/services/service/PingService.java | 2 + observe-services-configuration-api/pom.xml | 6 + .../configuration/ObserveDataSourceConnection.java | 5 + .../ObserveDataSourceConnectionSupport.java | 13 +- observe-services-configuration-rest/pom.xml | 6 + .../ObserveDataSourceConnectionRest.java | 7 +- observe-services-configuration-topia/pom.xml | 4 +- .../ObserveDataSourceConnectionTopia.java | 7 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../observe/services/dto/gson/VersionAdapter.java | 36 + .../services/dto/referential/ProgramDtos.java | 44 + .../services/dto/referential/ReferentialDtos.java | 116 +- .../ird/observe/services/TestMethodResource.java | 2 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 35 + .../services/ObserveServiceContextTopia.java | 3 + .../EntityToReferentialReferenceDtoBuilder.java | 13 + .../services/dto/ObserveDtosInitializer.java | 284 +- .../services/service/DataSourceServiceTopia.java | 12 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 3 +- ...EntityToReferentialReferenceDtoBuilderTest.java | 57 + pom.xml | 3 + 181 files changed, 9887 insertions(+), 8322 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/ObserveServiceHelper.java (85%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{ => configuration}/ObserveApplicationConfigProvider.java (90%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java rename observe-application-swing/src/main/java/fr/ird/observe/{ObserveConfigOption.java => configuration/ObserveSwingApplicationConfigOption.java} (75%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/ConnexionStatus.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/CreationMode.java (72%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/DbMode.java (88%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceEvent.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceEvent.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListener.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListener.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListenerAdapter.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListenerAdapter.java (70%) rename {observe-business/src/main/java/fr/ird/observe/db/model => observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs}/DataSelectionModel.java (60%) copy observe-application-swing/src/main/resources/icons/{action-import-gps.png => action-db-server.png} (100%) create mode 100644 observe-application-swing/src/main/resources/observeSwing.conf create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceDumpProducerServiceController.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilderTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 9

branch feature/7528 deleted (was aa7fad6)
by codelutin.com scm 24 Sep '15

24 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7528 in repository observe. See http://git.codelutin.com/observe.git was aa7fad6 chargement de la base de données local au démarage (refs #7528) This change permanently discards the following revisions: discards aa7fad6 chargement de la base de données local au démarage (refs #7528) discards f723352 creation d'un base local (refs #7529) discards f74b745 ignorer un test et mise à jour des dépendences (refs #7529) discards 048f9e4 commexion au serveur de données (refs #7529) discards d4fbf01 utilisation de la classe ObserveSwingDataSource pour gérer les connection au source de données, (refs #7529) discards 40a1f67 lancement de l'application + connexion aux bases H2 et PG (refs #7528 #7529) -- 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/7531 updated (539dd0d -> a74653a)
by codelutin.com scm 24 Sep '15

24 Sep '15

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(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit e6cec26969eaef71c1e463b17a0d4638e410ce40 Author: Kevin Morin <morin(a)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(a)list.forge.codelutin.com>.

1 2

branch feature/7531 created (now 539dd0d)
by codelutin.com scm 24 Sep '15

24 Sep '15

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 at 539dd0d utilisation des services dans doSave et doDelete This branch includes the following new commits: new a34e936 début d'utilisation des services dans doSave et doDelete (refs #7531) new 539dd0d utilisation des services dans doSave et doDelete 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 539dd0d9dffacd0cc572708b7725cd5c8ed17699 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit a34e936854295c989b47db59db890d1ee8d0af8d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch develop updated (9cb38f5 -> a5ba588)
by codelutin.com scm 24 Sep '15

24 Sep '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 9cb38f5 correction d'imports new 0a38157 - ajout du décorator de referencereferentaildto - fix some fixme (refs #7530) new 69e353e population des combo et des double listes début de chargement des beans (refs #7530) new 967863b init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) new 496cfe8 fix build new 1fb9ed7 fix javadoc new a5ba588 Migration des Editeurs (termine #7530) Merge branch 'feature/7530' 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 a5ba5887cae76ea11c930b9593eff5733cd8a77d Merge: 9cb38f5 1fb9ed7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 17:34:04 2015 +0200 Migration des Editeurs (termine #7530) Merge branch 'feature/7530' into develop commit 1fb9ed724b442ad9c16e8ba541a112f1de892ee7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 17:32:49 2015 +0200 fix javadoc commit 496cfe8f8fd2053406371bee8a136171a0dd16ca Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 17:16:36 2015 +0200 fix build commit 967863bd661bdc79acc0f9481ed31b3b92ab0f16 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 12:31:30 2015 +0200 init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) commit 69e353edabe02b3f72fb1d56718d4d8e06cc51ca Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 23 16:31:41 2015 +0200 population des combo et des double listes début de chargement des beans (refs #7530) commit 0a38157f507997fc3a845276318f6f54fdd117eb Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 17 15:33:11 2015 +0200 - ajout du décorator de referencereferentaildto - fix some fixme (refs #7530) 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 | 228 +++++++-------------- .../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 | 13 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 7 +- .../ActivitySeineObservedSystemUIHandler.java | 11 + .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 14 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 11 + .../ui/content/impl/seine/FloatingObjectUI.jaxx | 7 +- .../impl/seine/FloatingObjectUIHandler.java | 11 + .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 16 +- .../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 | 11 +- .../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 | 35 +++- .../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 | 121 ++++++----- .../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 | 78 +++---- .../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, 1012 insertions(+), 1022 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(a)list.forge.codelutin.com>.

1 6

branch feature/7530 deleted (was 7ef0b29)
by codelutin.com scm 24 Sep '15

24 Sep '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7530 in repository observe. See http://git.codelutin.com/observe.git was 7ef0b29 fix build This change permanently discards the following revisions: discards 7ef0b29 fix build discards 82a809c init des bean list header (manque plus qu'à appeler le bon service quand il renverra des referencedto plutot que des stubs) (fixes #7530) discards c4a0cfd population des combo et des double listes début de chargement des beans (refs #7530) discards 0088253 - ajout du décorator de referencereferentaildto - fix some fixme (refs #7530) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0