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 9973bd87311cb2ca44d612e76df914f8a6943595 Merge: 2b2c42d 9cbec54 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:05 2015 +0000 Merge branch 'release/4.0-RC3' observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 28 ++ .../main/java/fr/ird/observe/DecoratorService.java | 2 + .../fr/ird/observe/ObserveApplicationContext.java | 9 + .../java/fr/ird/observe/db/ReplicationService.java | 4 +- .../test/resources/db/4.0-RC3/referentiel.sql.gz | Bin 0 -> 138124 bytes observe-entities/pom.xml | 2 +- .../java/fr/ird/observe/entities/Activity.java | 2 + .../src/main/java/fr/ird/observe/entities/Set.java | 3 + .../entities/longline/ActivityLonglineImpl.java | 17 ++ .../observe/entities/longline/SetLonglineImpl.java | 26 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../migration/AbstractDataSourceMigration.java | 5 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 282 +++++++++++++++++++++ .../ird/observe/entities/seine/SetSeineImpl.java | 8 +- .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 65 +++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 22 ++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 22 ++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 22 ++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 22 ++ .../src/main/xmi/observe-common.properties | 4 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../src/main/filters/observe-ui.properties | 1 + .../ird/observe/ui/content/ContentUIHandler.java | 28 ++ .../ui/content/impl/longline/SetLonglineUI.css | 8 +- .../impl/longline/SetLonglineUIHandler.java | 42 +++ .../content/impl/longline/SetLonglineUIModel.java | 8 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 +++--- .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 22 ++ .../open/impl/seine/ActivitySeineUIHandler.java | 15 ++ .../ui/content/table/ContentTableUIHandler.java | 23 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 ++- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 3 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 10 + .../loadors/ActivityLonglineNodeChildLoador.java | 1 + .../tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../EditableTableWithCacheTableModelSupport.java | 4 +- .../resources/i18n/observe-swing_en_GB.properties | 11 + .../resources/i18n/observe-swing_es_ES.properties | 11 + .../resources/i18n/observe-swing_fr_FR.properties | 149 ++++++----- observe-validation/pom.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 12 +- pom.xml | 4 +- 53 files changed, 896 insertions(+), 161 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.