This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f1861db369e201ec733fb3a5ee640c7805ab31af Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 16 23:08:02 2015 +0200 refs #6988 bien réinitilisé le quadrant sur les écrans d'activité --- .../open/impl/longline/ActivityLonglineUIHandler.java | 16 ++++++++++++++++ .../content/open/impl/seine/ActivitySeineUIHandler.java | 15 +++++++++++++++ 2 files changed, 31 insertions(+) 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 5e575d1..b5cef09 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 @@ -65,6 +65,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity n("observe.common.longitude"); } + public ActivityLonglineUIHandler(ActivityLonglineUI ui) { super(ui, DataContextType.TripLongline, @@ -124,6 +125,8 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity public void openUI() throws Exception { super.openUI(); + resetQuadrant(getUi().getCoordinatesEditor()); + String tripId = getSelectedParentId(); String activityId = getSelectedId(); @@ -172,6 +175,19 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } @Override + protected void onLoad(TopiaContext tx, ActivityLongline bean) throws TopiaException { + + Float latitude = bean.getLatitude(); + Float longitude = bean.getLongitude(); + + super.onLoad(tx, bean); + + getBean().setLatitude(latitude); + getBean().setLongitude(longitude); + + } + + @Override protected ActivityLongline onPreCreate(TopiaContext tx, Object parent, ActivityLongline bean) throws TopiaException { TripLongline parentBean = (TripLongline) parent; 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 8497a03..19608ea 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 @@ -159,6 +159,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public void openUI() throws Exception { super.openUI(); + resetQuadrant(getUi().getCoordinatesEditor()); + String routeId = getSelectedParentId(); String activityId = getSelectedId(); @@ -212,6 +214,19 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } @Override + protected void onLoad(TopiaContext tx, ActivitySeine bean) throws TopiaException { + + Float latitude = bean.getLatitude(); + Float longitude = bean.getLongitude(); + + super.onLoad(tx, bean); + + getBean().setLatitude(latitude); + getBean().setLongitude(longitude); + + } + + @Override protected ActivitySeine onPreCreate(TopiaContext tx, Object parent, ActivitySeine bean) throws TopiaException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.