This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 00b93038699ef8eb5f121d275b378fbe1b70a85c Merge: 7d07afd 6095427 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 3 20:54:33 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 153 +++++++---- .../main/java/fr/ird/observe/DecoratorService.java | 3 +- .../fr/ird/observe/report/model/ReportExecute.java | 3 + .../LengthWeightParemeterHelperTest.java | 294 +++++++++++++++++++++ .../src/test/resources/db/4.0.4/referentiel.sql.gz | Bin 0 -> 138244 bytes observe-entities/pom.xml | 2 +- .../ird/observe/entities/constants/GearType.java | 14 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_4.java | 70 +++++ .../referentiel/LengthWeightParemeterHelper.java | 10 +- .../observe/entities/referentiel/ProgramImpl.java | 35 +++ .../4.0.4/remove-trip-datearriveeport-field-H2.sql | 23 ++ .../4.0.4/remove-trip-datearriveeport-field-PG.sql | 23 ++ .../src/main/xmi/observe-common.properties | 3 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85857 bytes observe-swing/pom.xml | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 39 ++- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 11 + .../observe/ui/actions/AbstractObserveAction.java | 54 ++++ .../ird/observe/ui/actions/CloseStorageAction.java | 3 +- .../observe/ui/actions/ReloadStorageAction.java | 6 +- .../ui/actions/SaveStorageToFileAction.java | 8 +- .../list/impl/longline/TripLonglinesUIModel.java | 1 + .../content/list/impl/seine/TripSeinesUIModel.java | 1 + .../java/fr/ird/observe/ui/storage/StorageUI.css | 4 + .../java/fr/ird/observe/ui/storage/StorageUI.jaxx | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 + .../fr/ird/observe/ui/storage/StorageUIModel.java | 24 ++ .../src/main/resources/observe-log4j.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 5 +- 34 files changed, 717 insertions(+), 94 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.