From 3e957e6c1f2549634409992ead1ef29272aa95cf Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Fri, 17 Feb 2023 15:43:02 +0100 Subject: [PATCH] IDEMPIERE-5581 : Dialog.askForInput : allow Integer (#1680) * IDEMPIERE-5581 : Dialog.askForInput : allow Integer https://idempiere.atlassian.net/browse/IDEMPIERE-5581 * IDEMPIERE-5581 : Dialog.askForInput : allow Integer Add check on displaytype as suggested by @hengsin Co-Authored-By: hengsin <152246+hengsin@users.noreply.github.com> --------- Co-authored-by: hengsin <152246+hengsin@users.noreply.github.com> --- .../org/adempiere/webui/editor/WNumberEditor.java | 15 ++++++++++++++- .../src/org/adempiere/webui/window/Dialog.java | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java index 43c2aae6e9..1a41bd4336 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java @@ -63,7 +63,16 @@ public class WNumberEditor extends WEditor implements ContextMenuListener public WNumberEditor() { - this("Number", false, false, true, DisplayType.Number, ""); + this(DisplayType.Number); + } + + /** + * + * @param displayType + */ + public WNumberEditor(int displayType) + { + this("Number", false, false, true, displayType, ""); } /** @@ -136,6 +145,10 @@ public class WNumberEditor extends WEditor implements ContextMenuListener { super(new NumberBox(displayType == DisplayType.Integer), columnName, title, null, mandatory, readonly, updateable); + + if (!DisplayType.isNumeric(displayType)) + throw new IllegalArgumentException("DisplayType must be numeric"); + this.displayType = displayType; init(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java index b6a45ddf8e..170411fe1e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java @@ -347,6 +347,8 @@ public final class Dialog { return new WStringEditor(); case DisplayType.Number: return new WNumberEditor(); + case DisplayType.Integer: + return new WNumberEditor(editorType); case DisplayType.TableDir: return new WTableDirEditor(lookup, "", "", true, false, true); case DisplayType.Search: