This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git from 8d2dc7b [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0837af7 Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) new c7f7c0f Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (See #7431) new f062c82 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (See #7486) 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 f062c82ba4cb58a05e5170b8a4474e4007cd4fd7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:05:46 2015 +0200 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (See #7486) commit c7f7c0f2e65fa6df71ef6b09d35bef08e5936c88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:59:27 2015 +0200 Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (See #7431) commit 0837af74374d7e33f2ca9cc340d9c5ca14e18734 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:58:44 2015 +0200 Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) Summary of changes: observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java | 2 +- .../ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java | 5 +++++ .../ui/content/open/impl/longline/ActivityLonglineUIHandler.java | 2 ++ .../observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java | 2 ++ .../ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java | 2 +- pom.xml | 2 +- 6 files changed, 12 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 0837af74374d7e33f2ca9cc340d9c5ca14e18734 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:58:44 2015 +0200 Réinitialisation des éditeurs de position à l'ouverture des écrans (See #7431) --- .../ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java | 5 +++++ .../ui/content/open/impl/longline/ActivityLonglineUIHandler.java | 2 ++ .../observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java | 2 ++ .../ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 102ccf2..7687c39 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -190,6 +190,11 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { @Override public void openUI() throws Exception { + getUi().getSettingStartCoordinates().resetModel(); + getUi().getSettingEndCoordinates().resetModel(); + getUi().getHaulingStartCoordinates().resetModel(); + getUi().getHaulingEndCoordinates().resetModel(); + // Reset quandrant resetQuadrant(getUi().getSettingStartCoordinates()); resetQuadrant(getUi().getSettingEndCoordinates()); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 59094f0..910615e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -143,6 +143,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity public void openUI() throws Exception { super.openUI(); + getUi().getCoordinatesEditor().resetModel(); + resetQuadrant(getUi().getCoordinatesEditor()); String tripId = getSelectedParentId(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 4ad839f..42901f0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -170,6 +170,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public void openUI() throws Exception { super.openUI(); + getUi().getCoordinatesEditor().resetModel(); + resetQuadrant(getUi().getCoordinatesEditor()); String routeId = getSelectedParentId(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index 5a5e851..dc7825f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -97,7 +97,7 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeine> BinderModelBuilder<ActivitySeine, ActivitySeine> builder = binderService.newBinderBuilder( ActivitySeine.class, - ActivitySeine.PROPERTY_QUADRANT, +// ActivitySeine.PROPERTY_QUADRANT, ActivitySeine.PROPERTY_LATITUDE, ActivitySeine.PROPERTY_LONGITUDE, ActivitySeine.PROPERTY_ERS_ID, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit c7f7c0f2e65fa6df71ef6b09d35bef08e5936c88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 18:59:27 2015 +0200 Utilisation de jaxx 2.25 qui permet de réinitialiser les modèles des édituers de position (See #7431) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a73de2b..87d558c 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <eugenePluginVersion>3.0-alpha-2</eugenePluginVersion> <topiaVersion>2.11</topiaVersion> - <jaxxVersion>2.24</jaxxVersion> + <jaxxVersion>2.25</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit f062c82ba4cb58a05e5170b8a4474e4007cd4fd7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 19:05:46 2015 +0200 Ne pas utiliser la fonction format qui n'existe pas sur PG 8 (See #7486) --- observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java index 9350fab..23f6781 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java @@ -349,7 +349,7 @@ public abstract class PGInstall { protected Set<String> getPostgisFunctions(Connection conn, String functionPattern) throws SQLException { final Set<String> result = new LinkedHashSet<String>(); - String sql = String.format("SELECT format('%%I.%%I(%%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes))" + + String sql = String.format("SELECT ns.nspname::text || '.' || p.proname::text || '(' || oidvectortypes(p.proargtypes)::text || ')'" + " FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)" + " WHERE ns.nspname = 'public' AND p.proname ILIKE '%s%%';", functionPattern); PreparedStatement sta = -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm