From e0f727939e5304dd627e40f9b51e94556b0be570 Mon Sep 17 00:00:00 2001
From: zjz1993 <1429595365@qq.com>
Date: Tue, 3 Sep 2019 19:45:55 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fanruan/api/cal/ParameterKit.java  |  8 --------
 .../api/design/ui/editor/ValueEditors.java      | 17 ++++++++++++++++-
 .../com/fanruan/api/cal/ParameterKitTest.java   | 13 -------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/fanruan/api/cal/ParameterKit.java b/src/main/java/com/fanruan/api/cal/ParameterKit.java
index 67e316e..afb080d 100644
--- a/src/main/java/com/fanruan/api/cal/ParameterKit.java
+++ b/src/main/java/com/fanruan/api/cal/ParameterKit.java
@@ -109,12 +109,4 @@ public class ParameterKit {
         return ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps);
     }
 
-    /**
-     * 将ParameterProvider类型数组转换为Parameter类型数组
-     * @param providers ParameterProvider类型数组
-     * @return Parameter类型数组
-     * */
-    public static Parameter[] providers2Parameter(ParameterProvider[] providers) {
-        return Parameter.providers2Parameter(providers);
-    }
 }
diff --git a/src/main/java/com/fanruan/api/design/ui/editor/ValueEditors.java b/src/main/java/com/fanruan/api/design/ui/editor/ValueEditors.java
index 760464c..4dda75f 100644
--- a/src/main/java/com/fanruan/api/design/ui/editor/ValueEditors.java
+++ b/src/main/java/com/fanruan/api/design/ui/editor/ValueEditors.java
@@ -4,7 +4,22 @@ import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.ui.component.table.model.ParameterTableModel;
 import com.fanruan.api.util.StringKit;
 import com.fr.base.BaseFormula;
-import com.fr.design.editor.editor.*;
+import com.fr.design.editor.editor.BooleanEditor;
+import com.fr.design.editor.editor.ColumnRowEditor;
+import com.fr.design.editor.editor.ColumnRowGroupEditor;
+import com.fr.design.editor.editor.ColumnSelectedEditor;
+import com.fr.design.editor.editor.ConstantsEditor;
+import com.fr.design.editor.editor.CursorEditor;
+import com.fr.design.editor.editor.DateEditor;
+import com.fr.design.editor.editor.DoubleEditor;
+import com.fr.design.editor.editor.Editor;
+import com.fr.design.editor.editor.FormulaEditor;
+import com.fr.design.editor.editor.IntegerEditor;
+import com.fr.design.editor.editor.NoneEditor;
+import com.fr.design.editor.editor.ParameterEditor;
+import com.fr.design.editor.editor.SpinnerIntegerEditor;
+import com.fr.design.editor.editor.TextEditor;
+import com.fr.design.editor.editor.WidgetNameEditor;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/test/java/com/fanruan/api/cal/ParameterKitTest.java b/src/test/java/com/fanruan/api/cal/ParameterKitTest.java
index 2b05a31..4093687 100644
--- a/src/test/java/com/fanruan/api/cal/ParameterKitTest.java
+++ b/src/test/java/com/fanruan/api/cal/ParameterKitTest.java
@@ -114,17 +114,4 @@ public class ParameterKitTest extends Prepare {
         Assert.assertEquals(provider.getName(),"p1");
         Assert.assertEquals("", provider.getValue());
     }
-
-    @Test
-    public void providers2Parameter() {
-        ParameterProvider[] parameters = new ParameterProvider[]{
-                ParameterKit.newParameter("p1", 100),
-                ParameterKit.newParameter("p2", 200)
-        };
-        Parameter [] result = new Parameter[]{
-                new Parameter("p1", 100),
-                new Parameter("p2", 200)
-        };
-        Assert.assertEquals(ParameterKit.providers2Parameter(parameters), result);
-    }
 }
\ No newline at end of file