branch develop updated (3d5aeba -> 83dbe28)
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 3d5aeba Ne rien afficher si la position est nulle + utilisation dernière api jaxx pour le reset du quadrant (See #8326) new 83dbe28 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 83dbe2869ccaba23cf024c0f45b9f0be0ca82fd5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 14 19:48:24 2016 +0200 Utilisation dernière api jaxx pour le reset du quadrant (See #8326) Summary of changes: .../swing/ui/content/ContentUIHandler.java | 28 ---------------------- .../impl/longline/SetLonglineUIHandler.java | 8 +++---- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- 3 files changed, 5 insertions(+), 33 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 83dbe2869ccaba23cf024c0f45b9f0be0ca82fd5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 14 19:48:24 2016 +0200 Utilisation dernière api jaxx pour le reset du quadrant (See #8326) --- .../swing/ui/content/ContentUIHandler.java | 28 ---------------------- .../impl/longline/SetLonglineUIHandler.java | 8 +++---- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index b7a6b2b..176c605 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -55,7 +55,6 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.ReferentialReferences; import jaxx.runtime.JAXXContext; -import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -68,7 +67,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.validator.NuitonValidatorScope; @@ -807,32 +805,6 @@ public abstract class ContentUIHandler<E extends IdDto> { getModel().setMode(newMode); } - //FIXME Do it in jaxx - protected void resetQuadrant(CoordinatesEditor editor) { - - editor.setQuadrant(null); - JAXXButtonGroup quadrantBG = editor.getQuadrantBG(); - - quadrantBG.setSelectedValue(null); - quadrantBG.setSelectedButton(null); - - quadrantBG.remove(editor.getQuadrant1()); - quadrantBG.remove(editor.getQuadrant2()); - quadrantBG.remove(editor.getQuadrant3()); - quadrantBG.remove(editor.getQuadrant4()); - - editor.getQuadrant1().setSelected(false); - editor.getQuadrant2().setSelected(false); - editor.getQuadrant3().setSelected(false); - editor.getQuadrant4().setSelected(false); - - quadrantBG.add(editor.getQuadrant1()); - quadrantBG.add(editor.getQuadrant2()); - quadrantBG.add(editor.getQuadrant3()); - quadrantBG.add(editor.getQuadrant4()); - - } - /** * Pour mettre à jour les composants graphiques avec les référentiels chargés dans le modèle */ diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index d05a46c..ae4549c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -182,10 +182,10 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { getUi().getHaulingEndCoordinates().resetModel(); // Reset quandrant - resetQuadrant(getUi().getSettingStartCoordinates()); - resetQuadrant(getUi().getSettingEndCoordinates()); - resetQuadrant(getUi().getHaulingStartCoordinates()); - resetQuadrant(getUi().getHaulingEndCoordinates()); + getUi().getSettingStartCoordinates().resetQuadrant(); + getUi().getSettingEndCoordinates().resetQuadrant(); + getUi().getHaulingStartCoordinates().resetQuadrant(); + getUi().getHaulingEndCoordinates().resetQuadrant(); if (log.isInfoEnabled()) { log.info("OpenUI: " + getModel()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 3c153de..b85a5e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -204,7 +204,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin if (bean.getQuadrant() != null) { getUi().getCoordinatesEditor().setQuadrant(bean.getQuadrant()); } else { - resetQuadrant(getUi().getCoordinatesEditor()); + getUi().getCoordinatesEditor().resetQuadrant(); } getUi().getCoordinatesEditor().setQuadrant(bean.getQuadrant()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm