This is an automated email from the git hooks/post-receive script. New change to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git from e14b489 fix default values map options new 62068e3 refs #6964 ajout de l'id de la marée à repliquer new c4dcfe0 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate new ba5988f passage sur topia en snapshot pour la generation des index new 1df36b0 refs #6978 ajout icone pour l'action de consolidation des données new a6da7de refs #6977 amélioration du layout new d010e19 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne new b5eb644 refs #6975 mise en lazy de GearCaracteristicType car toujours utilise new 4dfb4f0 refs #6976 Add default measurements when creating a new gearusefeature new 2836c5d refs #6986 revue de la gestion du quadrant sur l'écran d'opération de peche palangre new 6dc7d9a refs #6988 bien réinitilisé le quadrant sur les écrans d'activité new 4645d56 refs #6475 ajout des traductions françaises à partir du fichier fourni dans le ticket new 9753766 refs #6475 revue de la décoration des calées new 5915a0c refs #6983 mise à jour aussi du topiaversion new 42101d5 refs #6991 ajout migration pour renommage du palangrier inconnu new e93fc76 add migration db for tests new 30befff use last release of topia new da613b2 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development new 055b734 add missing license headers new 94f5263 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions new 0618db0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 360fd05 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 21 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 360fd050006067bb92bb4e8bfe9b616195448ce2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:11 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0618db0735425fda05cde3c194cd147462ffe76e Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 94f5263bf7c7ea5a06e219b9705d29caf8cb8e15 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:40:30 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions commit 055b7340e3cb115964f36032eaa328c13dc4f69a Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers commit da613b27c5d4ccbd1b7d5b2a680b74aea03f7d69 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:05:43 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development commit 30befff0acb8f567ce04e71aa3a39e711625438a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 12:04:29 2015 +0200 use last release of topia commit e93fc7619a7ef222aea6e3ba6f0e562854fb4930 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:50:43 2015 +0200 add migration db for tests commit 42101d5f2b5607c97382389d6d41c249bb6ac16b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:47:07 2015 +0200 refs #6991 ajout migration pour renommage du palangrier inconnu commit 5915a0cc6f8d1e2251559e62e18ca5c02d2c515e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:41:34 2015 +0200 refs #6983 mise à jour aussi du topiaversion commit 9753766c2daa88bfe4af98d92695ff5e1f1e1b05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:40:45 2015 +0200 refs #6475 revue de la décoration des calées commit 4645d56b55b8a293eff8c611ebe0218dbbb5fbff Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 11:22:24 2015 +0200 refs #6475 ajout des traductions françaises à partir du fichier fourni dans le ticket commit 6dc7d9af6cb3b4da3de6730d7bdb725a5ad022f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 23:08:02 2015 +0200 refs #6988 bien réinitilisé le quadrant sur les écrans d'activité commit 2836c5d5689d03a0a0c9b5320d93dafe09812425 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 23:03:47 2015 +0200 refs #6986 revue de la gestion du quadrant sur l'écran d'opération de peche palangre commit 4dfb4f08ab5bce434dbae1f9c2efef2d14200aa5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 20:41:43 2015 +0200 refs #6976 Add default measurements when creating a new gearusefeature commit b5eb644e938e65f2f68e021fa44459e8d2b6e3f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 20:00:28 2015 +0200 refs #6975 mise en lazy de GearCaracteristicType car toujours utilise commit d010e19d6600c1eca3659907b4d201dc351ea996 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:35:58 2015 +0200 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne commit a6da7de0fe284257ed2b7af9ab3020a88dd79921 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:25:34 2015 +0200 refs #6977 amélioration du layout commit 1df36b03a392cd49ea0032c46031913805772008 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:13:00 2015 +0200 refs #6978 ajout icone pour l'action de consolidation des données commit ba5988f095b9b1ce7a6d445353c334bec771d29d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:07:31 2015 +0200 passage sur topia en snapshot pour la generation des index commit c4dcfe0a04fefb68752677012a4c8f3c4fdbeb41 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 19:05:00 2015 +0200 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate commit 62068e32acda1cf45c12811a7e4ff8a8b160181c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 18:57:05 2015 +0200 refs #6964 ajout de l'id de la marée à repliquer Summary of changes: observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 28 ++ .../main/java/fr/ird/observe/DecoratorService.java | 2 + .../java/fr/ird/observe/db/ReplicationService.java | 4 +- .../db/{4.0-RC2 => 4.0-RC3}/referentiel.sql.gz | Bin 138115 -> 138124 bytes observe-entities/pom.xml | 2 +- .../src/main/java/fr/ird/observe/entities/Set.java | 3 + .../observe/entities/longline/SetLonglineImpl.java | 26 +- .../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 +++++ .../rename-unknown-longliner-H2.sql} | 2 +- .../rename-unknown-longliner-PG.sql} | 2 +- .../update-senne-gear-usedInTrip-H2.sql} | 2 +- .../update-senne-gear-usedInTrip-PG.sql} | 2 +- .../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 +++--- .../impl/longline/ActivityLonglineUIHandler.java | 16 ++ .../open/impl/seine/ActivitySeineUIHandler.java | 15 ++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 ++- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 ++ .../ui/tree/AbstractObserveTreeCellRenderer.java | 10 + .../loadors/ActivityLonglineNodeChildLoador.java | 1 + .../tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../EditableTableWithCacheTableModelSupport.java | 4 +- .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 140 +++++----- observe-validation/pom.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 12 +- pom.xml | 4 +- 40 files changed, 718 insertions(+), 152 deletions(-) copy observe-business/src/test/resources/db/{4.0-RC2 => 4.0-RC3}/referentiel.sql.gz (52%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java create mode 100644 observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC3/rename-unknown-longliner-H2.sql} (81%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC3/rename-unknown-longliner-PG.sql} (81%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC3/update-senne-gear-usedInTrip-H2.sql} (82%) copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0-RC3/update-senne-gear-usedInTrip-PG.sql} (82%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.