This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 79abd36faee00a5ebe17f8003fbed98880b4f391 Merge: 3832e63 98d1030 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 18:24:34 2015 +0200 fixes #6855: Saisie générique des caractéristiques de l'équipement du bateau & migration senne Merge branch 'feature/6855' into develop .../fr/ird/observe/ConsolidateDataService.java | 4 +- .../src/main/java/fr/ird/observe/DataService.java | 29 +- .../main/java/fr/ird/observe/DecoratorService.java | 40 +- .../main/java/fr/ird/observe/db/DataContext.java | 106 ++++- .../java/fr/ird/observe/db/ReplicationService.java | 2 +- .../ird/observe/db/constants/DataContextType.java | 36 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../java/fr/ird/observe/entities/Entities.java | 48 +-- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 139 +++++++ .../referentiel/GearCaracteristicTypes.java | 61 +++ .../main/resources/db/3.16/add-gear-data-H2.sql | 18 + .../main/resources/db/3.16/add-gear-data-PG.sql | 18 + .../resources/db/3.16/add-gear-referential-H2.sql | 123 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 119 ++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 3 + .../db/3.16/remove-tripSeine-seine-PG.sql | 3 + .../src/main/xmi/observe-common.properties | 3 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 33078 -> 35711 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 14 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 82186 -> 85905 bytes .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 8 +- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../ird/observe/ui/content/ContentUIManager.java | 18 +- .../ui/content/open/impl/seine/TripSeineUI.css | 48 +-- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 344 +++++++--------- .../open/impl/seine/TripSeineUIHandler.java | 63 +-- .../content/open/impl/seine/TripSeineUIModel.java | 55 --- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 ++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 20 + .../ui/content/ref/impl/GearCaracteristicUI.css | 42 ++ .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 +++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 27 ++ .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 +++ .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 +++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 82 ++++ .../observe/ui/content/ref/impl/GearUIModel.java | 70 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 123 ++++++ .../GearUseFeatureMeasurementCellRenderer.java | 91 +++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 102 +++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 94 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 451 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 100 +++++ .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/NavigationTreeCellRenderer.java | 2 + .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 31 +- .../loadors/ActivityLonglineNodeChildLoador.java | 19 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +- .../loadors/FloatingObjectNodeChildLoador.java | 18 +- .../loadors/ProgramLonglineNodeChildLoador.java | 13 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 43 +- .../loadors/ReferenceCommonNodeChildLoador.java | 28 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 36 +- .../loadors/ReferenceSeineNodeChildLoador.java | 28 +- .../ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 13 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 24 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 22 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../resources/i18n/observe-swing_en_GB.properties | 166 ++++++-- .../resources/i18n/observe-swing_es_ES.properties | 164 ++++++-- .../resources/i18n/observe-swing_fr_FR.properties | 174 ++++++-- .../Gear-n1-create-error-validation.xml | 75 ++++ .../Gear-n1-create-warning-validation.xml} | 50 +-- .../Gear-n1-update-error-validation.xml | 75 ++++ .../Gear-n1-update-warning-validation.xml} | 50 +-- ...earCaracteristic-n1-create-error-validation.xml | 90 ++++ ...Caracteristic-n1-create-warning-validation.xml} | 50 +-- ...earCaracteristic-n1-update-error-validation.xml | 90 ++++ ...Caracteristic-n1-update-warning-validation.xml} | 50 +-- ...aracteristicType-n1-create-error-validation.xml | 75 ++++ ...cteristicType-n1-create-warning-validation.xml} | 50 +-- ...aracteristicType-n1-update-error-validation.xml | 75 ++++ ...cteristicType-n1-update-warning-validation.xml} | 50 +-- ...seFeaturesSeine-n1-update-error-validation.xml} | 34 +- ...TransmittingBuoy-n1-update-error-validation.xml | 12 + .../TripSeine-n1-create-warning-validation.xml | 39 -- ...1-update-gearUseFeatures-warning-validation.xml | 41 ++ .../TripSeine-n1-update-warning-validation.xml | 40 -- .../i18n/observe-validation_en_GB.properties | 10 +- .../i18n/observe-validation_es_ES.properties | 10 +- .../i18n/observe-validation_fr_FR.properties | 10 +- .../validation/BeanValidatorDetectorTest.java | 16 +- 98 files changed, 4296 insertions(+), 905 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.