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 9796dcfaa24bbab11ff957ba6b9ba66b8a52d9e1 Merge: a723a7c fc9b92b Author: Maven Release <maven-release@codelutin.com> Date: Sat Apr 11 08:26:33 2015 +0000 Merge branch 'release/4.0-RC2' observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 20 +- .../src/main/java/fr/ird/observe/DataService.java | 441 +++++++++++++++++---- .../main/java/fr/ird/observe/DecoratorService.java | 6 +- .../java/fr/ird/observe/db/ReplicationService.java | 17 +- .../ird/observe/db/model/DataSelectionModel.java | 32 +- .../java/fr/ird/observe/db/util/PGInstall.java | 8 +- ...ipDecorator.java => TripLonglineDecorator.java} | 21 +- .../replication/H2LonglineReplicateDataTest.java | 2 +- .../test/resources/db/4.0-RC2/referentiel.sql.gz | Bin 0 -> 138115 bytes observe-entities/pom.xml | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../ird/observe/entities/constants/GearType.java | 11 + .../entities/constants/ReferenceLocale.java | 34 ++ .../entities/longline/ActivityLonglineDAOImpl.java | 140 +++++++ .../entities/longline/TripLonglineDAOImpl.java | 137 ++++++- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 111 ++++++ .../entities/referentiel/ProgramDAOImpl.java | 123 ++++++ .../entities/referentiel/ReferenceEntities.java | 1 + .../entities/seine/ActivitySeineDAOImpl.java | 141 +++++++ .../entities/seine/FloatingObjectDAOImpl.java | 124 ++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 115 ++++++ .../observe/entities/seine/TripSeineDAOImpl.java | 135 ++++++- .../db/4.0-RC2/clean-program-gear-type-H2.sql | 27 ++ .../db/4.0-RC2/clean-program-gear-type-PG.sql | 26 ++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-longline.zargo | Bin 93859 -> 93860 bytes .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../assembly/dist/obstuna-admin/apply-extra.sh | 14 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 127 +++--- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 6 - .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 +- .../ird/observe/ui/admin/export/ExportModel.java | 86 +++- .../observe/ui/admin/export/ExportUIHandler.java | 158 ++------ .../fr/ird/observe/ui/admin/export/TripEntry.java | 53 +-- .../ui/admin/export/TripToExportTableModel.java | 29 +- .../ird/observe/ui/content/ContentUIHandler.java | 5 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../impl/seine/FloatingObjectUIHandler.java | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 3 +- .../impl/longline/ActivityLonglinesUIHandler.java | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 10 +- .../ui/content/open/ContentOpenableUIHandler.java | 28 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 41 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 50 +++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 29 +- .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 168 ++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 50 +++ .../ird/observe/ui/tree/ObserveDataProvider.java | 11 + .../java/fr/ird/observe/ui/tree/ObserveNode.java | 66 +-- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 75 +++- .../ird/observe/ui/tree/ProgramLonglineNode.java | 51 +++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 29 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 28 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 29 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 29 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 28 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../AbstractAssociationNodeChildLoador.java | 68 ---- .../loadors/ActivityLonglineNodeChildLoador.java | 22 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 26 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 49 ++- .../loadors/ActivitySeinesNodeChildLoador.java | 27 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 12 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../ui/tree/loadors/RootNodeChildLoador.java | 25 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 24 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 1 + .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- observe-validation/pom.xml | 2 +- pom.xml | 41 +- src/site/site_fr.xml | 6 +- 86 files changed, 2471 insertions(+), 888 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.