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

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

branch release/4.0-RC3 updated (59ef834 -> 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 from 59ef834 use last release of topia adds 64cdd52 add missing license headers adds 9cbec54 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- .../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 +++++++++++++++++++++ observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 132 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch master updated (2b2c42d -> 9973bd8)
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 master in repository observe. See http://git.codelutin.com/observe.git from 2b2c42d Merge branch 'release/4.0-RC2' adds 0f672e6 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development adds 866219a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 72573b7 Merge branch 'master' into develop adds 68bcb13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 783b02a refs #6963 Ajout d'un binder sur les SpeciesList adds 8236694 fixes #6963: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces Merge branch 'feature/6963' into develop adds 15302f4 fixes #6970 Problème technique lors de la tentative d'accès au formulaire Rencontres adds 0fd27fd refs #6971 ajout traduction pour la validation des coordonnées adds 9af21bd refs #6971 Rendre accessible l'ajout de calée uniquement si possible (LL) adds 697deee refs #6972 FIX NPE + ajout trads adds f56d065 fixes #6972: L'export d'une marée vers la base centrale échoue Merge branch 'feature/6972' into develop 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 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' 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 + .../fr/ird/observe/ObserveApplicationContext.java | 9 + .../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 +- .../java/fr/ird/observe/entities/Activity.java | 2 + .../src/main/java/fr/ird/observe/entities/Set.java | 3 + .../entities/longline/ActivityLonglineImpl.java | 17 ++ .../observe/entities/longline/SetLonglineImpl.java | 26 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../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 +++--- .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 22 ++ .../open/impl/seine/ActivitySeineUIHandler.java | 15 ++ .../ui/content/table/ContentTableUIHandler.java | 23 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 ++- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 3 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 10 + .../loadors/ActivityLonglineNodeChildLoador.java | 1 + .../tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../EditableTableWithCacheTableModelSupport.java | 4 +- .../resources/i18n/observe-swing_en_GB.properties | 11 + .../resources/i18n/observe-swing_es_ES.properties | 11 + .../resources/i18n/observe-swing_fr_FR.properties | 149 ++++++----- observe-validation/pom.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 12 +- pom.xml | 4 +- 53 files changed, 812 insertions(+), 165 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 0