This is an automated email from the git hooks/post-receive script. New commit to branch feature/7007 in repository observe. See http://git.codelutin.com/observe.git commit 7aae4d0059d4d7641807077981a0d2d7019beba2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:36:32 2015 +0200 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) --- .../entities/longline/ActivityLonglineImpl.java | 6 ++--- .../open/impl/longline/ActivityLonglineUI.css | 3 --- .../impl/longline/ActivityLonglineUIHandler.java | 29 ++++++++-------------- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index 73c28d8..dd84045 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -102,13 +102,13 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { @Override public Integer getQuadrant() { - return CoordinateHelper.getQuadrant(longitude, latitude); + return quadrant; +// return CoordinateHelper.getQuadrant(longitude, latitude); } @Override public void setQuadrant(Integer quadrant) { - Integer old = quadrant; - fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); + Integer old = this.quadrant; this.quadrant = quadrant; fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 97bb4b3..40ec502 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -38,9 +38,6 @@ propertyLatitude:{ActivityLongline.PROPERTY_LATITUDE}; propertyLongitude:{ActivityLongline.PROPERTY_LONGITUDE}; propertyQuadrant:{ActivityLongline.PROPERTY_QUADRANT}; - latitude:{bean.getLatitude()}; - longitude:{bean.getLongitude()}; - quadrant:{bean.getQuadrant()}; } #vesselActivityLonglineLabel { 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 b5cef09..b41a7c2 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 @@ -160,8 +160,6 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity // update mode dataService.loadEditEntity(source, activityId, getLoadExecutor()); - // passage en coordonnes absolues + utilisation du quadrant - bean.initCoordinates(); } if (log.isDebugEnabled()) { @@ -170,28 +168,24 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } finalizeOpenUI(mode, create); + getUi().getCoordinatesEditor().setLatitudeAndLongitude(bean.getLatitude(), bean.getLongitude()); + if (create) { + Integer quadrant = bean.getQuadrant(); + getUi().getCoordinatesEditor().setQuadrant(null); + getUi().getCoordinatesEditor().setQuadrant(quadrant); + } + // on annule la modification engendree par ce binding getModel().setModified(create); } @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; bean.setOpen(true); + bean.setLatitude(null); + bean.setLongitude(null); Date timestamp; @@ -214,7 +208,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity if (log.isDebugEnabled()) { log.debug("use quadrant of previous activity [" + quadrant + "]"); } - getUi().getCoordinatesEditor().getModel().setQuadrant(quadrant); + bean.setQuadrant(quadrant); // on reprend la date et l'heure de la dernière activité timestamp = lastActivityLongline.getTimeStamp(); @@ -251,9 +245,6 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity super.startEditUI( ActivityLonglineUI.BINDING_TIME_STAMP_DATE, - ActivityLonglineUI.BINDING_COORDINATES_EDITOR_LATITUDE, - ActivityLonglineUI.BINDING_COORDINATES_EDITOR_LONGITUDE, - ActivityLonglineUI.BINDING_COORDINATES_EDITOR_QUADRANT, ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_MODEL, ActivityLonglineUI.BINDING_COMMENT2_TEXT, ActivityLonglineUI.BINDING_VESSEL_ACTIVITY_LONGLINE_SELECTED_ITEM, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.