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 discards e14b489 fix default values map options discards 5d68707 add scale mpa and creat jaxx file for map discards 4592b6c fix zoom NPE discards 1859e26 refs #6944 copie des resources de cartographie discards 628da48 refs #6944 creation de la resources sur la partie catographie dans le build discards 6395c16 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path discards 734d720 fix zoom discards 644cbb7 add layers discards 05de7fb zoom (or un-zoom) on pointer discards 82b697f use style file for map discards f9fa186 add Date on map discards 3996e91 add point and fix style discards f708cab rename functions discards 5f3c48a add french translation fr i18n discards 0880f0a fix show config discards 60b908e mouse Translation discards 0d6d869 add map in trip seine UI discards 16616a3 add shape file and options map in config discards 6dbaa21 add compute trip for map adds bce9d1c refs #6964 ajout de l'id de la marée à repliquer adds 67d0697 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate adds 991ebd6 fixes #6964: La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner Merge branch 'feature/6964' into develop adds b0d853e passage sur topia en snapshot pour la generation des index adds 4bcfa9b refs #6978 ajout icone pour l'action de consolidation des données adds 81f61c8 fixes #6978: Menu Action / Calculer les données : ajouter une icône Merge branch 'feature/6978' into develop adds c055b4d refs #6977 amélioration du layout adds 89245f1 fixes #6977: [PS] Mise en page formulaire Calée / Mesure Merge branch 'feature/6977' into develop adds bf27bf0 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne adds 3dfd23a fixes #6983: [PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements Merge branch 'feature/6983' into develop adds a685270 refs #6975 mise en lazy de GearCaracteristicType car toujours utilise adds bb089a9 fixes #6975: [PS] Problèmes d'utilisation du nouvel écran 'Equipements' Merge branch 'feature/6975' into develop adds 5a19d3a refs #6976 Add default measurements when creating a new gearusefeature adds 66346de fixes #6976: [PS] Les équipements devraient avoir des caractéristiques par défaut Merge branch 'feature/6976' into develop adds 0308cdb refs #6986 revue de la gestion du quadrant sur l'écran d'opération de peche palangre adds b33f785 fixes #6986: [LL] Non reprise du quadrant lors de la création d'une opération de pêche fixes #6987: [LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants adds f1861db refs #6988 bien réinitilisé le quadrant sur les écrans d'activité adds 6b54f7d fixes #6988: Quadrant mal initialisé lors de l'arrvié sur un écran Merge branch 'feature/6988' into develop adds f40c065 refs #6475 ajout des traductions françaises à partir du fichier fourni dans le ticket adds 699a97a refs #6475 revue de la décoration des calées adds 050b28e fixes #6475: Traductions à améliorer Merge branch 'feature/6475' into develop adds 3748b29 refs #6983 mise à jour aussi du topiaversion adds a39a8c0 refs #6991 ajout migration pour renommage du palangrier inconnu adds a635b4d fixes #6991: Renommage du navire Palengirer inconnu en Palengrier inconnu Merge branch 'feature/6991' into develop adds 0ea6327 add migration db for tests adds 59ef834 use last release of topia adds 0d1bcfa [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development adds d0f8f52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 64cdd52 add missing license headers adds 9cbec54 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions adds 9973bd8 Merge branch 'release/4.0-RC3' adds 6a676be Merge branch 'master' into develop adds f3882e2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2112692 add compute trip for map new 03b30ce add shape file and options map in config new 2f0a5e5 add map in trip seine UI new 3074603 mouse Translation new 691da9d fix show config new 6c426d7 add french translation fr i18n new 3d15aef rename functions new 9616e42 add point and fix style new aa7fd12 add Date on map new 080c26d use style file for map new 174d9b3 zoom (or un-zoom) on pointer new ddd5406 add layers new 873c628 fix zoom new 83842ed refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path new 2efc056 refs #6944 creation de la resources sur la partie catographie dans le build new 3b04b05 refs #6944 copie des resources de cartographie new 9bcb782 fix zoom NPE new cde5ed7 add scale mpa and creat jaxx file for map new 42063c6 fix default values map options This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e14b489) \ N -- N -- N refs/heads/feature/6944 (42063c6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 19 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 42063c6e73e242a255a67d9e5d15571cdc7d6aa8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Apr 21 10:33:51 2015 +0200 fix default values map options commit cde5ed7e9ce41fc353f84974afe87ae7592bb165 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Apr 21 10:20:21 2015 +0200 add scale mpa and creat jaxx file for map commit 9bcb782963554e0155656955b0a7cc490bbdda20 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Apr 20 10:33:20 2015 +0200 fix zoom NPE commit 3b04b05a7f3bc74fd7f2e5d0ea83cc871f6c4d8f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie commit 2efc05628cddf441d192a0da66967a3bfd96787b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:42:46 2015 +0200 refs #6944 creation de la resources sur la partie catographie dans le build commit 83842edae16279f958c62a71a9316254b79ca89d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:41:54 2015 +0200 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path commit 873c628a889ed62a1fa9a74049129f602d85ff41 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Apr 17 17:35:08 2015 +0200 fix zoom commit ddd5406f654d3cb0a52311e267464f223f01b856 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Apr 17 17:31:40 2015 +0200 add layers commit 174d9b31d128ef66b491bab4e6f5bfc62b287679 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Apr 17 16:08:47 2015 +0200 zoom (or un-zoom) on pointer commit 080c26d66cf2e6bbe3fb24d0973288918f22c5de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Apr 17 15:16:05 2015 +0200 use style file for map commit aa7fd12cafa9188b215886dfe173e748321e3f24 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 17:52:10 2015 +0200 add Date on map commit 9616e429909d4b2d134a0b91d459890ea88ba267 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 16:09:54 2015 +0200 add point and fix style commit 3d15aef049094a6d9e569b057dee783d36a20cea Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 15:52:51 2015 +0200 rename functions commit 6c426d7b7bdd5a68abe79a6bbf4e2d302858b220 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 11:17:32 2015 +0200 add french translation fr i18n commit 691da9d1ef6ab1919f2ab008c633f04c0ee6d84a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 11:06:37 2015 +0200 fix show config commit 30746033be08531d553a8385ab7586f38d5148e7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 10:55:22 2015 +0200 mouse Translation commit 2f0a5e5665ca79829f3693f523453a3eeff231e5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 08:58:08 2015 +0200 add map in trip seine UI commit 03b30ce302610ab1304802142b3f631c36380e7b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 08:56:52 2015 +0200 add shape file and options map in config commit 2112692748716c64ed4fd9e687735f7b51c30d51 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 08:42:39 2015 +0200 add compute trip for map 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>.