- Observe-commits - mailman.cloud.codelutin.com

branch feature/7007 deleted (was 7aae4d0)
by codelutin.com scm 22 Apr '15

22 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7007 in repository observe. See http://git.codelutin.com/observe.git was 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) This change permanently discards the following revisions: discards 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) discards 345cf56 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) discards 98f86a2 utilisation jaxx en snapshot (refs #7007) discards e7fe3f1 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7007 created (now 7aae4d0)
by codelutin.com scm 22 Apr '15

22 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7007 in repository observe. See http://git.codelutin.com/observe.git at 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) This branch includes the following new commits: new e7fe3f1 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) new 98f86a2 utilisation jaxx en snapshot (refs #7007) new 345cf56 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) new 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) The 4 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 7aae4d0059d4d7641807077981a0d2d7019beba2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 12:36:32 2015 +0200 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) commit 345cf56fcc3f9819581a4bf389a273d2aa0a96f9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 12:36:18 2015 +0200 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) commit 98f86a2eb1f7f5c33723c630d29cf8ab9e379717 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 12:35:26 2015 +0200 utilisation jaxx en snapshot (refs #7007) commit e7fe3f1ddc0a593eca9b7a6e88b5275f475d1fba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 22 12:34:57 2015 +0200 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 4

branch feature/6944 updated (f971ce3 -> ad5649f)
by codelutin.com scm 21 Apr '15

21 Apr '15

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 f971ce3 move scale in map and add compass new ad5649f fix code, hide actions buttons, tab name The 1 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 ad5649fd98f9f880bcda95459e10cd7d44c79fa0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 18:05:42 2015 +0200 fix code, hide actions buttons, tab name Summary of changes: .../ui/content/open/impl/seine/TripSeineUI.css | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 59 ++++++++++++++-------- .../observe/ui/util/tripMap/ObserveMapPane.java | 11 ++-- .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 6 +-- .../observe/ui/util/tripMap/TripMapUIHandler.java | 49 ++++++++---------- 5 files changed, 69 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (f3882e2 -> 9afba5d)
by codelutin.com scm 21 Apr '15

21 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from f3882e2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c2d0267 refs #7006 use new topia tag value to generate deterministice foreign key names new 9afba5d fixes #7006: Nommer les clef étrangères Merge branch 'feature/7006' into develop The 2 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 9afba5d27d4eca27c2151e6cfb95183db75a341e Merge: f3882e2 c2d0267 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 21 17:47:18 2015 +0200 fixes #7006: Nommer les clef étrangères Merge branch 'feature/7006' into develop commit c2d0267ea19dbb6d6eba4e464f48f185d78922b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 07:41:17 2015 +0200 refs #7006 use new topia tag value to generate deterministice foreign key names Summary of changes: observe-entities/src/main/xmi/observe-common.properties | 1 + observe-entities/src/main/xmi/observe-longline.properties | 1 + observe-entities/src/main/xmi/observe-seine.properties | 1 + pom.xml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/6944 updated (42063c6 -> f971ce3)
by codelutin.com scm 21 Apr '15

21 Apr '15

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 42063c6 fix default values map options new f971ce3 move scale in map and add compass The 1 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 f971ce33e03ee01a5c068eef473644dbb488b617 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 16:18:29 2015 +0200 move scale in map and add compass Summary of changes: .../observe/ui/util/tripMap/ObserveMapPane.java | 221 +++++++++++++++++++++ .../ird/observe/ui/util/tripMap/TripMapScale.java | 133 ------------- .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 19 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 1 - .../resources/i18n/observe-swing_en_GB.properties | 5 + .../resources/i18n/observe-swing_es_ES.properties | 5 + .../resources/i18n/observe-swing_fr_FR.properties | 5 + 7 files changed, 238 insertions(+), 151 deletions(-) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/ObserveMapPane.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapScale.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/6944 updated (e14b489 -> 42063c6)
by codelutin.com scm 21 Apr '15

21 Apr '15

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(a)codelutin.com> Date: Tue Apr 21 10:33:51 2015 +0200 fix default values map options commit cde5ed7e9ce41fc353f84974afe87ae7592bb165 Author: Sylvain Bavencoff <bavencoff(a)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(a)codelutin.com> Date: Mon Apr 20 10:33:20 2015 +0200 fix zoom NPE commit 3b04b05a7f3bc74fd7f2e5d0ea83cc871f6c4d8f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie commit 2efc05628cddf441d192a0da66967a3bfd96787b Author: Tony CHEMIT <chemit(a)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(a)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(a)codelutin.com> Date: Fri Apr 17 17:35:08 2015 +0200 fix zoom commit ddd5406f654d3cb0a52311e267464f223f01b856 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 17:31:40 2015 +0200 add layers commit 174d9b31d128ef66b491bab4e6f5bfc62b287679 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 16:08:47 2015 +0200 zoom (or un-zoom) on pointer commit 080c26d66cf2e6bbe3fb24d0973288918f22c5de Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 15:16:05 2015 +0200 use style file for map commit aa7fd12cafa9188b215886dfe173e748321e3f24 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 17:52:10 2015 +0200 add Date on map commit 9616e429909d4b2d134a0b91d459890ea88ba267 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 16:09:54 2015 +0200 add point and fix style commit 3d15aef049094a6d9e569b057dee783d36a20cea Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 15:52:51 2015 +0200 rename functions commit 6c426d7b7bdd5a68abe79a6bbf4e2d302858b220 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 11:17:32 2015 +0200 add french translation fr i18n commit 691da9d1ef6ab1919f2ab008c633f04c0ee6d84a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 11:06:37 2015 +0200 fix show config commit 30746033be08531d553a8385ab7586f38d5148e7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 10:55:22 2015 +0200 mouse Translation commit 2f0a5e5665ca79829f3693f523453a3eeff231e5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Apr 16 08:58:08 2015 +0200 add map in trip seine UI commit 03b30ce302610ab1304802142b3f631c36380e7b Author: Sylvain Bavencoff <bavencoff(a)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(a)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(a)list.forge.codelutin.com>.

1 19

branch feature/6944 updated (360fd05 -> e14b489)
by codelutin.com scm 21 Apr '15

21 Apr '15

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 360fd05 [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards 0618db0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts discards 94f5263 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions discards 055b734 add missing license headers discards da613b2 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development discards 30befff use last release of topia discards e93fc76 add migration db for tests discards 42101d5 refs #6991 ajout migration pour renommage du palangrier inconnu discards 5915a0c refs #6983 mise à jour aussi du topiaversion discards 9753766 refs #6475 revue de la décoration des calées discards 4645d56 refs #6475 ajout des traductions françaises à partir du fichier fourni dans le ticket discards 6dc7d9a refs #6988 bien réinitilisé le quadrant sur les écrans d'activité discards 2836c5d refs #6986 revue de la gestion du quadrant sur l'écran d'opération de peche palangre discards 4dfb4f0 refs #6976 Add default measurements when creating a new gearusefeature discards b5eb644 refs #6975 mise en lazy de GearCaracteristicType car toujours utilise discards d010e19 refs #6983 Ajout migration de usedInTrip pour l'engin Senne pour toutes les marées de type senne discards a6da7de refs #6977 amélioration du layout discards 1df36b0 refs #6978 ajout icone pour l'action de consolidation des données discards ba5988f passage sur topia en snapshot pour la generation des index discards c4dcfe0 refs #6964 migration 4.0-RC3 pour ajouter les index sur fk manquants + regeneration de ces index via hibernate discards 62068e3 refs #6964 ajout de l'id de la marée à repliquer This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/feature/6944 (e14b489) \ O -- O -- O (360fd05) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. 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 +- .../test/resources/db/4.0-RC3/referentiel.sql.gz | Bin 138124 -> 0 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 ----- .../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 +++--- .../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, 148 insertions(+), 802 deletions(-) delete mode 100644 observe-business/src/test/resources/db/4.0-RC3/referentiel.sql.gz delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/6944 updated (e14b489 -> 360fd05)
by codelutin.com scm 21 Apr '15

21 Apr '15

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(a)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(a)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(a)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(a)codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers commit da613b27c5d4ccbd1b7d5b2a680b74aea03f7d69 Author: Maven Release <maven-release(a)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(a)codelutin.com> Date: Fri Apr 17 12:04:29 2015 +0200 use last release of topia commit e93fc7619a7ef222aea6e3ba6f0e562854fb4930 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 17 11:50:43 2015 +0200 add migration db for tests commit 42101d5f2b5607c97382389d6d41c249bb6ac16b Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Fri Apr 17 11:41:34 2015 +0200 refs #6983 mise à jour aussi du topiaversion commit 9753766c2daa88bfe4af98d92695ff5e1f1e1b05 Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)codelutin.com> Date: Thu Apr 16 19:25:34 2015 +0200 refs #6977 amélioration du layout commit 1df36b03a392cd49ea0032c46031913805772008 Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)list.forge.codelutin.com>.

1 21

branch feature/6944 updated (1859e26 -> e14b489)
by codelutin.com scm 21 Apr '15

21 Apr '15

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 1859e26 refs #6944 copie des resources de cartographie new 4592b6c fix zoom NPE new 5d68707 add scale mpa and creat jaxx file for map new e14b489 fix default values map options The 3 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 e14b4892f4bdeedc2c69cde3887e5ad7e6216be6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 10:33:51 2015 +0200 fix default values map options commit 5d6870758c008147ee940d2095be1c8254c1950c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Apr 21 10:20:21 2015 +0200 add scale mpa and creat jaxx file for map commit 4592b6ccd5b11f960ae2b9a9510968dd1bbc4f4b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Apr 20 10:33:20 2015 +0200 fix zoom NPE Summary of changes: .../java/fr/ird/observe/ObserveConfigOption.java | 12 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 5 +- .../open/impl/seine/TripSeineUIHandler.java | 17 +-- .../ird/observe/ui/util/tripMap/TripMapScale.java | 133 ++++++++++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 45 ++++++ .../tripMap/TripMapUIHandler.java} | 152 ++++++++++++++++----- observe-swing/src/main/resources/log4j.properties | 2 +- 7 files changed, 310 insertions(+), 56 deletions(-) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapScale.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx rename observe-swing/src/main/java/fr/ird/observe/ui/{content/open/impl/seine/TripMapHandler.java => util/tripMap/TripMapUIHandler.java} (81%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch feature/6944 updated (734d720 -> 1859e26)
by codelutin.com scm 21 Apr '15

21 Apr '15

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 734d720 fix zoom new 6395c16 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path new 628da48 refs #6944 creation de la resources sur la partie catographie dans le build new 1859e26 refs #6944 copie des resources de cartographie The 3 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 1859e267e5d86a8802d9a933ebd184bb3fd348a9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie commit 628da48a0691f154eca34d245486f097e8a44416 Author: Tony CHEMIT <chemit(a)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 6395c16aa62ef227b65aafb7cb4b42635133b425 Author: Tony CHEMIT <chemit(a)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 Summary of changes: .../main/java/fr/ird/observe/IObserveConfig.java | 2 ++ observe-swing/pom.xml | 22 ++++++++++++++++++ observe-swing/src/main/assembly/map.xml | 20 +++++++++++++++++ .../java/fr/ird/observe/ObserveConfigOption.java | 11 +++++++++ .../fr/ird/observe/ObserveResourceManager.java | 25 ++++++++++++++++----- .../main/java/fr/ird/observe/ObserveRunner.java | 9 +++++--- .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L1.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L1.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L6.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L6.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L6.shx | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 0 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.prj | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin .../src/main/{resources => }/map/style.xml | 0 .../resources/i18n/observe-swing_en_GB.properties | 2 ++ .../resources/i18n/observe-swing_es_ES.properties | 2 ++ .../resources/i18n/observe-swing_fr_FR.properties | 2 ++ 33 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 observe-swing/src/main/assembly/map.xml rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.sbn (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.sbx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shx (100%) rename observe-swing/src/main/{resources => }/map/style.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3