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 a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' .gitignore | 12 + observe-business/pom.xml | 62 +-- .../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 | 114 ++++- .../ird/observe/db/constants/DataContextType.java | 36 +- .../fr/ird/observe/decorator/TripDecorator.java | 2 +- .../ird/observe/decorator/TripSeineDecorator.java | 2 +- .../i18n/observe-business_en_GB.properties | 4 + .../i18n/observe-business_es_ES.properties | 4 + .../i18n/observe-business_fr_FR.properties | 4 + .../its/replication/AbstractReplicateDataTest.java | 220 ++++------ .../replication/H2LonglineReplicateDataTest.java | 200 +++++++++ .../its/replication/ReplicationDataModel.java | 170 ++++++++ .../src/test/resources/db/3.16/ANO-6611.sql.gz | Bin 0 -> 172354 bytes .../src/test/resources/db/3.16/referentiel.sql.gz | Bin 0 -> 138114 bytes observe-entities/pom.xml | 110 +---- .../java/fr/ird/observe/entities/Entities.java | 90 ++-- .../observe/entities/longline/TripLonglines.java | 37 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 161 +++++++ .../referentiel/GearCaracteristicTypes.java | 83 ++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 39 ++ .../main/resources/db/3.16/add-gear-data-PG.sql | 39 ++ .../resources/db/3.16/add-gear-referential-H2.sql | 141 ++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 140 ++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 24 ++ .../db/3.16/remove-tripSeine-seine-PG.sql | 24 ++ .../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 observe-swing/pom.xml | 5 +- .../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/impl/longline/BranchlineUI.jaxx | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- .../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 | 23 +- .../ui/content/ref/impl/GearCaracteristicUI.css | 39 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 ++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 28 +- .../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 | 104 +++++ .../observe/ui/content/ref/impl/GearUIModel.java | 92 ++++ .../ui/content/table/ContentTableUIHandler.java | 8 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 145 +++++++ .../GearUseFeatureMeasurementCellRenderer.java | 113 +++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 124 ++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 116 +++++ .../table/impl/seine/GearUseFeaturesSeineUI.css | 91 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 148 +++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 473 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 122 ++++++ .../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 ++++++-- observe-validation/pom.xml | 6 +- .../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 +- pom.xml | 42 +- src/site/site_fr.xml | 48 +-- 120 files changed, 5268 insertions(+), 1389 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.