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 345cf56fcc3f9819581a4bf389a273d2aa0a96f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:36:18 2015 +0200 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) --- .../observe/entities/seine/ActivitySeineImpl.java | 15 ++++++++-- .../ui/content/open/impl/seine/ActivitySeineUI.css | 3 -- .../open/impl/seine/ActivitySeineUIHandler.java | 32 +++++++--------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index c729701..7093c52 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -26,6 +26,8 @@ import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.util.Numbers; import fr.ird.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.List; @@ -35,6 +37,9 @@ import static org.nuiton.i18n.I18n.n; /** @author Tony Chemit - chemit@codelutin.com */ public class ActivitySeineImpl extends ActivitySeineAbstract { + /** Logger. */ + private static final Log log = LogFactory.getLog(ActivitySeineImpl.class); + private static final long serialVersionUID = 2L; public static final String ACTIVITY_FIN_DE_VEILLE = "16"; @@ -110,13 +115,17 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { @Override public Integer getQuadrant() { - return CoordinateHelper.getQuadrant(longitude, latitude); +// return CoordinateHelper.getQuadrant(longitude, latitude); + return quadrant; } @Override public void setQuadrant(Integer quadrant) { - Integer old = quadrant; - fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); + if (log.isInfoEnabled()) { + log.info("New quadrant value: "+quadrant); + } + Integer old = this.quadrant; +// fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); this.quadrant = quadrant; fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css index fb4a19f..681e622 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUI.css @@ -43,9 +43,6 @@ propertyLatitude:{ActivitySeine.PROPERTY_LATITUDE}; propertyLongitude:{ActivitySeine.PROPERTY_LONGITUDE}; propertyQuadrant:{ActivitySeine.PROPERTY_QUADRANT}; - latitude:{bean.getLatitude()}; - longitude:{bean.getLongitude()}; - quadrant:{bean.getQuadrant()}; } #generalTab { 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 19608ea..933982b 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 @@ -186,21 +186,17 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei if (create) { // create mode - dataService.preCreate(source, routeId, bean, binder, getPreCreateExecutor() - ); + dataService.preCreate(source, routeId, bean, binder, getPreCreateExecutor()); } else { // update mode dataService.loadEditEntity(source, activityId, getLoadExecutor()); - // passage en coordonnes absolues + utilisation du quadrant - bean.initCoordinates(); } if (log.isDebugEnabled()) { - log.debug(" long - lat = " + bean.getLongitude() + - " - " + bean.getLatitude()); + log.debug(prefix + "long - lat = " + bean.getLongitude() + " - " + bean.getLatitude()); } SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); @@ -208,31 +204,26 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei 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, 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 { Route parentBean = (Route) parent; bean.setOpen(true); + bean.setLatitude(null); + bean.setLongitude(null); Date time; @@ -302,9 +293,6 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME, - ActivitySeineUI.BINDING_COORDINATES_EDITOR_LATITUDE, - ActivitySeineUI.BINDING_COORDINATES_EDITOR_LONGITUDE, - ActivitySeineUI.BINDING_COORDINATES_EDITOR_QUADRANT, ActivitySeineUI.BINDING_VESSEL_SPEED_MODEL, ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_MODEL, ActivitySeineUI.BINDING_COMMENT2_TEXT, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.