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>.