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

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

branch feature/6944 updated (05de7fb -> 734d720)
by codelutin.com scm 17 Apr '15

17 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 05de7fb zoom (or un-zoom) on pointer new 644cbb7 add layers new 734d720 fix zoom 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 734d7206ef7d3b807397449ad1bc62f7869adb1b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 17:35:08 2015 +0200 fix zoom commit 644cbb7c02420d73bb175ef56b337b82bb2aefb8 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 17:31:40 2015 +0200 add layers Summary of changes: .../java/fr/ird/observe/ObserveConfigOption.java | 10 +-- .../ui/content/open/impl/seine/TripMapHandler.java | 25 ++++--- .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin 0 -> 40956 bytes .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 1 + .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin 0 -> 139420 bytes .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin 0 -> 3692 bytes .../map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin 0 -> 1227230 bytes .../map/shapeFiles/continents/GSHHS_l_L1.prj | 1 + .../map/shapeFiles/continents/GSHHS_l_L1.shp | Bin 0 -> 1221404 bytes .../map/shapeFiles/continents/GSHHS_l_L1.shx | Bin 0 -> 45756 bytes .../map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin 0 -> 20435 bytes .../map/shapeFiles/continents/GSHHS_l_L6.prj | 1 + .../map/shapeFiles/continents/GSHHS_l_L6.shp | Bin 0 -> 48740 bytes .../map/shapeFiles/continents/GSHHS_l_L6.shx | Bin 0 -> 852 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin 0 -> 939130 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 1 + .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin 0 -> 721340 bytes .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin 0 -> 35036 bytes observe-swing/src/main/resources/map/style.xml | 77 +++++++++++++++++++++ 19 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.dbf create mode 100644 observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.prj create mode 100644 observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shp create mode 100644 observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shx create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.dbf create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.prj create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shp create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shx create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.dbf create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.prj create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shp create mode 100644 observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shx create mode 100644 observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf create mode 100644 observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj create mode 100644 observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp create mode 100644 observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx -- 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 (82b697f -> 05de7fb)
by codelutin.com scm 17 Apr '15

17 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 82b697f use style file for map new 05de7fb zoom (or un-zoom) on pointer 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 05de7fbfce9a4bbe3ce8d7d08b2892df977b1671 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 16:08:47 2015 +0200 zoom (or un-zoom) on pointer Summary of changes: .../ui/content/open/impl/seine/TripMapHandler.java | 34 ++++++++++++++++++---- observe-swing/src/main/resources/log4j.properties | 2 +- 2 files changed, 30 insertions(+), 6 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 feature/6944 updated (f9fa186 -> 82b697f)
by codelutin.com scm 17 Apr '15

17 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 f9fa186 add Date on map new 82b697f use style file for map 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 82b697f0d6ae0bedb222abd214b196c6f219bd70 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Apr 17 15:16:05 2015 +0200 use style file for map Summary of changes: .../main/java/fr/ird/observe/ObserveConfig.java | 5 + .../java/fr/ird/observe/ObserveConfigOption.java | 12 +- .../ird/observe/ui/actions/ShowConfigAction.java | 1 + .../ui/content/open/impl/seine/TripMapHandler.java | 399 +++++++++++++++++++++ .../open/impl/seine/TripSeineUIHandler.java | 365 +------------------ .../resources/i18n/observe-swing_en_GB.properties | 1 + .../resources/i18n/observe-swing_es_ES.properties | 1 + .../resources/i18n/observe-swing_fr_FR.properties | 3 +- .../{ => 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 .../shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../{ => map}/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin observe-swing/src/main/resources/map/style.xml | 126 +++++++ 16 files changed, 556 insertions(+), 357 deletions(-) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripMapHandler.java 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%) create mode 100644 observe-swing/src/main/resources/map/style.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch release/4.0-RC3 deleted (was 9cbec54)
by codelutin.com scm 17 Apr '15

17 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC3 in repository observe. See http://git.codelutin.com/observe.git was 9cbec54 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (0d1bcfa -> f3882e2)
by codelutin.com scm 17 Apr '15

17 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 0d1bcfa [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development new d0f8f52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 64cdd52 add missing license headers new 9cbec54 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions new 9973bd8 Merge branch 'release/4.0-RC3' new 6a676be Merge branch 'master' into develop new f3882e2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 f3882e294c8ab5b40a36ada8706705c65c938548 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 6a676be5a6a8d7c79629fc2f4a7fd7d81fe1ee86 Merge: d0f8f52 9973bd8 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 Merge branch 'master' into develop commit d0f8f52ad7e85898d18e03a3b9a7e98b0391ad88 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 9973bd87311cb2ca44d612e76df914f8a6943595 Merge: 2b2c42d 9cbec54 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Apr 17 10:45:05 2015 +0000 Merge branch 'release/4.0-RC3' commit 9cbec54074430b9ba05fbaf34dfbf02754ff892f 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 64cdd5213b0fd272e4eb919eaa126919b3893cb5 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers Summary of changes: .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 21 +++++++++++++++++++++ 6 files changed, 127 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 6

annotated tag observe-4.0-RC3 created (now daf5912)
by codelutin.com scm 17 Apr '15

17 Apr '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-4.0-RC3 in repository observe. See http://git.codelutin.com/observe.git at daf5912 (tag) tagging 9973bd87311cb2ca44d612e76df914f8a6943595 (commit) replaces observe-4.0-RC2 tagged by Maven Release on Fri Apr 17 10:45:06 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC3 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0