branch develop updated (9afba5d -> 3765f2f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 9afba5d fixes #7006: Nommer les clef étrangères Merge branch 'feature/7006' into develop new e7fe3f1 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) new 98f86a2 utilisation jaxx en snapshot (refs #7007) new 345cf56 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran Activityseine (refs #7007) new 7aae4d0 amélioration de la façon d'initialiser l'éditeur des coordonnées sur l'écran ActivityLongline (refs #7007) new 3765f2f fixes #7007: Améliorer l'affichage des coordonnées Merge branch 'feature/7007' into develop The 5 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 3765f2f4ee81110100e7b5aa8a4ead4e91a3efa3 Merge: 9afba5d 7aae4d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 13:48:12 2015 +0200 fixes #7007: Améliorer l'affichage des coordonnées Merge branch 'feature/7007' into develop 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) 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) commit 98f86a2eb1f7f5c33723c630d29cf8ab9e379717 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:35:26 2015 +0200 utilisation jaxx en snapshot (refs #7007) commit e7fe3f1ddc0a593eca9b7a6e88b5275f475d1fba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:34:57 2015 +0200 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) Summary of changes: .../entities/longline/ActivityLonglineImpl.java | 6 ++-- .../observe/entities/seine/ActivitySeineImpl.java | 15 ++++++++-- .../main/java/fr/ird/observe/ui/content/Common.css | 1 + .../open/impl/longline/ActivityLonglineUI.css | 3 -- .../impl/longline/ActivityLonglineUIHandler.java | 29 +++++++------------- .../ui/content/open/impl/seine/ActivitySeineUI.css | 3 -- .../open/impl/seine/ActivitySeineUIHandler.java | 32 +++++++--------------- pom.xml | 2 +- 8 files changed, 37 insertions(+), 54 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 in repository observe. See http://git.codelutin.com/observe.git commit e7fe3f1ddc0a593eca9b7a6e88b5275f475d1fba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:34:57 2015 +0200 voir des zero à la place d'une chaine vide sur les composants d'une coordonnée nulle (refs #7007) --- observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css index 5aa1b22..e9f939a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/Common.css @@ -30,6 +30,7 @@ DateTimeEditor { CoordinatesEditor { bean: {bean}; + displayZeroWhenNull: true; } NumberEditor { -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 98f86a2eb1f7f5c33723c630d29cf8ab9e379717 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 12:35:26 2015 +0200 utilisation jaxx en snapshot (refs #7007) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 522919a..809c67f 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> <topiaVersion>2.10-SNAPSHOT</topiaVersion> - <jaxxVersion>2.23</jaxxVersion> + <jaxxVersion>2.24-SNAPSHOT</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 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>.
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 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>.
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 3765f2f4ee81110100e7b5aa8a4ead4e91a3efa3 Merge: 9afba5d 7aae4d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 13:48:12 2015 +0200 fixes #7007: Améliorer l'affichage des coordonnées Merge branch 'feature/7007' into develop .../entities/longline/ActivityLonglineImpl.java | 6 ++-- .../observe/entities/seine/ActivitySeineImpl.java | 15 ++++++++-- .../main/java/fr/ird/observe/ui/content/Common.css | 1 + .../open/impl/longline/ActivityLonglineUI.css | 3 -- .../impl/longline/ActivityLonglineUIHandler.java | 29 +++++++------------- .../ui/content/open/impl/seine/ActivitySeineUI.css | 3 -- .../open/impl/seine/ActivitySeineUIHandler.java | 32 +++++++--------------- pom.xml | 2 +- 8 files changed, 37 insertions(+), 54 deletions(-) -- 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