branch feature/8029 created (now 02e6144)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8029 in repository tutti. See http://git.codelutin.com/tutti.git at 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) This branch includes the following new commits: new 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) 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 02e61440cf232d03a3c7465d8ead75acb132a5b7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 17:12:38 2016 +0100 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) -- 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 feature/8029 in repository tutti. See http://git.codelutin.com/tutti.git commit 02e61440cf232d03a3c7465d8ead75acb132a5b7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 17:12:38 2016 +0100 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) --- .../calcifiedpiecessampling/MinSizePopupUIHandler.java | 3 ++- .../calcifiedpiecessampling/MinSizePopupUIModel.java | 13 +++++++++++++ .../calcifiedpiecessampling/actions/SplitSpeciesAction.java | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java index 4dfc83e..13548b4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java @@ -72,6 +72,7 @@ public class MinSizePopupUIHandler extends AbstractTuttiUIHandler<MinSizePopupUI public void open(int minMinSize, Integer maxMinSize) { getModel().setMinMinSize(minMinSize); getModel().setMaxMinSize(maxMinSize); + getModel().setValid(false); String message; if (maxMinSize != null) { @@ -88,7 +89,7 @@ public class MinSizePopupUIHandler extends AbstractTuttiUIHandler<MinSizePopupUI } public void validate() { - onCloseUI(); + getModel().setValid(true); onCloseUI(); } public void cancel() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java index 518007e..2372995 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java @@ -38,6 +38,11 @@ public class MinSizePopupUIModel extends AbstractSerializableBean { public static final String PROPERTY_MAX_MIN_SIZE = "maxMinSize"; + /** + * Is the model valid? + */ + protected boolean valid; + protected Integer minSize; protected int minMinSize; @@ -73,4 +78,12 @@ public class MinSizePopupUIModel extends AbstractSerializableBean { this.minSize = minSize; firePropertyChange(PROPERTY_MIN_SIZE, oldValue, minSize); } + + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + this.valid = valid; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java index d666f6f..64c2035 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java @@ -60,10 +60,10 @@ public class SplitSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSampl MinSizePopupUI minSizePopupUI = new MinSizePopupUI(ui); minSizePopupUI.open(minMinSize, maxMinSize); - Integer minSize = minSizePopupUI.getModel().getMinSize(); - if (minSize != null) { + if (minSizePopupUI.getModel().isValid()) { + Integer minSize = minSizePopupUI.getModel().getMinSize(); Integer exMaxSize = row.getMaxSize(); row.setMaxSize(minSize - 1); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm