branch develop updated (0839680 -> 3d5aeba)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 0839680 Fix release build new 3d5aeba Ne rien afficher si la position est nulle + utilisation dernière api jaxx pour le reset du quadrant (See #8326) The 1 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 3d5aebaacc8882792bc8b9b096170100a86cd3dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 14 19:45:30 2016 +0200 Ne rien afficher si la position est nulle + utilisation dernière api jaxx pour le reset du quadrant (See #8326) Summary of changes: .../ird/observe/application/swing/ui/ObserveCommon.jcss | 1 + .../content/open/impl/seine/ActivitySeineUIHandler.java | 15 +++++++++------ pom.xml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3d5aebaacc8882792bc8b9b096170100a86cd3dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 14 19:45:30 2016 +0200 Ne rien afficher si la position est nulle + utilisation dernière api jaxx pour le reset du quadrant (See #8326) --- .../ird/observe/application/swing/ui/ObserveCommon.jcss | 1 + .../content/open/impl/seine/ActivitySeineUIHandler.java | 15 +++++++++------ pom.xml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss index f75db75..6f6d345 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveCommon.jcss @@ -53,6 +53,7 @@ NumberEditor { CoordinatesEditor { format: {org.nuiton.jaxx.widgets.gis.CoordinateFormat.dms}; + displayZeroWhenNull: false; } FilterableDoubleList { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 2b7dc6d..53e75b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -21,9 +21,13 @@ */ package fr.ird.observe.application.swing.ui.content.open.impl.seine; +import com.google.common.base.Preconditions; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; @@ -33,9 +37,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDtos; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -228,10 +229,12 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> // 2. Mise à jour du quadrant : // Si le bean de données contient un quadrant, on met simplement à jour le composant de coordonnées pour sélectionner le quadrant voulu // sinon, on réinitialise les quadrants du composant afin qu'aucun d'eux ne soit sélectionné (par exemple dans le cas de la création de la première activité d'une route) - if (bean.getQuadrant() != null) { - getUi().getCoordinatesEditor().setQuadrant(bean.getQuadrant()); + if (bean.getQuadrant() == null) { + getUi().getCoordinatesEditor().resetQuadrant(); + Preconditions.checkState(getUi().getCoordinatesEditor().getModel().getQuadrant() == null); + Preconditions.checkState(bean.getQuadrant() == null); } else { - resetQuadrant(getUi().getCoordinatesEditor()); + getUi().getCoordinatesEditor().setQuadrant(bean.getQuadrant()); } // on annule la modification engendree par ce binding diff --git a/pom.xml b/pom.xml index 1f1aa34..a3c2192 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3</topiaVersion> - <jaxxVersion>2.32</jaxxVersion> + <jaxxVersion>2.33-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm