branch develop updated (7bd7807 -> 3318653)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé new 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) 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 3318653bb2f3fda3f28719652dee1a8a3a17de67 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 09:22:39 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) Summary of changes: .../fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java | 2 +- .../tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 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 tutti. See http://git.codelutin.com/tutti.git commit 3318653bb2f3fda3f28719652dee1a8a3a17de67 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 21 09:22:39 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) --- .../fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java | 2 +- .../tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java index 86e5fd7..6f2d688 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java @@ -133,7 +133,7 @@ public class CreateBenthosMelagAction extends AbstractTuttiAction<BenthosBatchUI // pas de poids de sous-echantillon sur le lot // impossible de calculer le melag JOptionPane.showMessageDialog( - getUI(), + getDialogParentComponent(), t("tutti.createBenthosMelag.error.message", selectedRowIndex + 1), t("tutti.createBenthosMelag.error.title"), JOptionPane.ERROR_MESSAGE); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java index eab0d18..0fc90ae 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java @@ -133,7 +133,7 @@ public class CreateSpeciesMelagAction extends AbstractTuttiAction<SpeciesBatchUI // pas de poids de sous-echantillon sur le lot // impossible de calculer le melag JOptionPane.showMessageDialog( - getUI(), + getDialogParentComponent(), t("tutti.createSpeciesMelag.error.message", selectedRowIndex + 1), t("tutti.createSpeciesMelag.error.title"), JOptionPane.ERROR_MESSAGE); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java index 8dd1801..0412d4a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java @@ -79,12 +79,15 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon } protected Float openAndGetWeightValue(WeightUnit weightUnit) { + ui.setWeightUnit(weightUnit); - SwingUtil.center(getTopestUI(), ui); + SwingUtil.center(getContext().getMainUI(), ui); ui.pack(); ui.getEditor().requestFocusInWindow(); ui.setVisible(true); - return ui.getEditor().getModel() == null ? null : ui.getEditor().getModel().floatValue(); + Number weight = ui.getEditor().getModel(); + return weight == null ? null : weight.floatValue(); + } protected String getTile(WeightUnit weightUnit) { return t("tutti.createSpeciesMelag.title", weightUnit.getShortLabel()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm