From d9a13704c3ed3cc881c0927a7149bcf880cef5d4 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Tue, 10 Oct 2017 09:21:44 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=9E=E6=80=A7-=E5=85=B6=E4=BB=96-=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E8=A1=8C=E7=AD=96=E7=95=A5=20=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/editor/ValueEditorPaneFactory.java |  2 +-
 .../editor/editor/SpinnerIntegerEditor.java   | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java

diff --git a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
index 29ee9e60a..e63b3c974 100644
--- a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
+++ b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java
@@ -202,7 +202,7 @@ public class ValueEditorPaneFactory {
         FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula"));
         return new Editor[]{
                 new TextEditor(),
-                new IntegerEditor(),
+                new SpinnerIntegerEditor(),
                 new DoubleEditor(),
                 new DateEditor(true, Inter.getLocText("Date")),
                 new BooleanEditor(),
diff --git a/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java b/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java
new file mode 100644
index 000000000..2366350f6
--- /dev/null
+++ b/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java
@@ -0,0 +1,66 @@
+package com.fr.design.editor.editor;
+
+import com.fr.base.Utils;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
+public class SpinnerIntegerEditor extends Editor<Integer> {
+
+    private UISpinner spinner;
+    private String oldValue = StringUtils.EMPTY;
+
+    public SpinnerIntegerEditor(){
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        spinner = new UISpinner(-Integer.MAX_VALUE, Integer.MAX_VALUE, 1, 0);
+        this.add(spinner, BorderLayout.CENTER);
+        this.spinner.addKeyListener(textKeyListener);
+        this.setName(Inter.getLocText("Parameter-Integer"));
+    }
+
+    @Override
+    public Integer getValue() {
+        return new Integer((int) this.spinner.getValue());
+    }
+
+    @Override
+    public void setValue(Integer value) {
+        if (value == null) {
+            value = new Integer(0);
+        }
+        this.spinner.setValue(value.intValue());
+        oldValue = Utils.objectToString(value);
+    }
+
+    @Override
+    public boolean accept(Object object) {
+        return object != null && object instanceof Integer;
+    }
+
+    public String getIconName() {
+        return "type_int";
+    }
+
+    KeyListener textKeyListener = new KeyAdapter() {
+
+        public void keyReleased(KeyEvent evt) {
+            int code = evt.getKeyCode();
+
+            if (code == KeyEvent.VK_ESCAPE) {
+                spinner.setValue(Double.parseDouble(oldValue));
+            }
+            if (code == KeyEvent.VK_ENTER) {
+                fireEditingStopped();
+            } else {
+                fireStateChanged();
+            }
+        }
+    };
+}