From 1206e8a98cd88d326420040273617bee23051ea5 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Wed, 28 Aug 2019 16:28:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B7=BB?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fanruan/api/cal/formula/BaseFormula.java | 8 ++++++++ .../fanruan/api/config/DefaultConfiguration.java | 4 ++++ .../java/com/fanruan/api/script/ScriptKit.java | 14 ++++++++++++++ .../com/fanruan/api/uniqueKey/UniqueKeyKit.java | 4 ++++ .../fanruan/api/util/eval/error/UtilEvalError.java | 4 ++++ 5 files changed, 34 insertions(+) create mode 100644 src/main/java/com/fanruan/api/cal/formula/BaseFormula.java create mode 100644 src/main/java/com/fanruan/api/config/DefaultConfiguration.java create mode 100644 src/main/java/com/fanruan/api/script/ScriptKit.java create mode 100644 src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java create mode 100644 src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java diff --git a/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java b/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java new file mode 100644 index 0000000..8759942 --- /dev/null +++ b/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java @@ -0,0 +1,8 @@ +package com.fanruan.api.cal.formula; + +public class BaseFormula extends com.fr.base.BaseFormula{ + @Override + public String getXmlTag(){ + return ""; + } +} diff --git a/src/main/java/com/fanruan/api/config/DefaultConfiguration.java b/src/main/java/com/fanruan/api/config/DefaultConfiguration.java new file mode 100644 index 0000000..9135649 --- /dev/null +++ b/src/main/java/com/fanruan/api/config/DefaultConfiguration.java @@ -0,0 +1,4 @@ +package com.fanruan.api.config; + +public class DefaultConfiguration extends com.fr.config.DefaultConfiguration{ +} diff --git a/src/main/java/com/fanruan/api/script/ScriptKit.java b/src/main/java/com/fanruan/api/script/ScriptKit.java new file mode 100644 index 0000000..67108f2 --- /dev/null +++ b/src/main/java/com/fanruan/api/script/ScriptKit.java @@ -0,0 +1,14 @@ +package com.fanruan.api.script; +import com.fr.script.ScriptFactory; + +import javax.script.ScriptEngine; + +public class ScriptKit { + /** + * 获取一个全新的脚本执行引擎 + * @return 一个全新的脚本执行引擎 + */ + public static ScriptEngine newScriptEngine() { + return ScriptFactory.newScriptEngine(); + } +} diff --git a/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java b/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java new file mode 100644 index 0000000..f2f83e2 --- /dev/null +++ b/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java @@ -0,0 +1,4 @@ +package com.fanruan.api.uniqueKey; + +public class UniqueKeyKit extends com.fr.config.utils.UniqueKey{ +} diff --git a/src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java b/src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java new file mode 100644 index 0000000..cda74ac --- /dev/null +++ b/src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java @@ -0,0 +1,4 @@ +package com.fanruan.api.util.eval.error; + +public class UtilEvalError extends com.fr.stable.UtilEvalError{ +} From 5e5e46ed1c26d3caa872eb9d9c9fd2e0101c824b Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Wed, 28 Aug 2019 18:03:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=8C=89=E7=85=A7pr=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0ui=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fanruan/api/cal/formula/BaseFormula.java | 8 ------- .../api/config/DefaultConfiguration.java | 4 ---- .../api/design/ui/component/UICheckBox.java | 24 +++++++++++++++++++ .../design/ui/component/UIIntNumberField.java | 2 +- .../eval/error => err}/UtilEvalError.java | 2 +- .../fanruan/api/uniqueKey/UniqueKeyKit.java | 4 ---- 6 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/com/fanruan/api/cal/formula/BaseFormula.java delete mode 100644 src/main/java/com/fanruan/api/config/DefaultConfiguration.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java rename src/main/java/com/fanruan/api/{util/eval/error => err}/UtilEvalError.java (62%) delete mode 100644 src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java diff --git a/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java b/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java deleted file mode 100644 index 8759942..0000000 --- a/src/main/java/com/fanruan/api/cal/formula/BaseFormula.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.fanruan.api.cal.formula; - -public class BaseFormula extends com.fr.base.BaseFormula{ - @Override - public String getXmlTag(){ - return ""; - } -} diff --git a/src/main/java/com/fanruan/api/config/DefaultConfiguration.java b/src/main/java/com/fanruan/api/config/DefaultConfiguration.java deleted file mode 100644 index 9135649..0000000 --- a/src/main/java/com/fanruan/api/config/DefaultConfiguration.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.config; - -public class DefaultConfiguration extends com.fr.config.DefaultConfiguration{ -} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java b/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java new file mode 100644 index 0000000..41b9504 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java @@ -0,0 +1,24 @@ +package com.fanruan.api.design.ui.component; + +import javax.swing.*; + +/** + * @author zhaojunzhe + * @version 10.0 + * Created by zhaojunzhe on 2019-08-28 + * checkbox组件 + */ +public class UICheckBox extends com.fr.design.gui.icheckbox.UICheckBox{ + + public UICheckBox(String string){super(string);} + + public UICheckBox(){} + + public UICheckBox(String LocText, boolean b){ + super(LocText, b); + } + + public UICheckBox(String text, Icon icon){ + super(text, icon); + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java b/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java index 15b5c26..cb1e76b 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java +++ b/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java @@ -1,5 +1,5 @@ package com.fanruan.api.design.ui.component; public class UIIntNumberField extends com.fr.design.gui.itextfield.UIIntNumberField { - + public UIIntNumberField(){}; } diff --git a/src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java b/src/main/java/com/fanruan/api/err/UtilEvalError.java similarity index 62% rename from src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java rename to src/main/java/com/fanruan/api/err/UtilEvalError.java index cda74ac..fed9c53 100644 --- a/src/main/java/com/fanruan/api/util/eval/error/UtilEvalError.java +++ b/src/main/java/com/fanruan/api/err/UtilEvalError.java @@ -1,4 +1,4 @@ -package com.fanruan.api.util.eval.error; +package com.fanruan.api.err; public class UtilEvalError extends com.fr.stable.UtilEvalError{ } diff --git a/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java b/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java deleted file mode 100644 index f2f83e2..0000000 --- a/src/main/java/com/fanruan/api/uniqueKey/UniqueKeyKit.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.uniqueKey; - -public class UniqueKeyKit extends com.fr.config.utils.UniqueKey{ -} From f416ee4ab3b8edc692e35f8d022c0e6f5eafd4cc Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Wed, 28 Aug 2019 19:30:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E4=B8=8D?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=9A=84=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/api/design/ui/component/UICheckBox.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java b/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java index 41b9504..c6ccbe9 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java +++ b/src/main/java/com/fanruan/api/design/ui/component/UICheckBox.java @@ -14,8 +14,8 @@ public class UICheckBox extends com.fr.design.gui.icheckbox.UICheckBox{ public UICheckBox(){} - public UICheckBox(String LocText, boolean b){ - super(LocText, b); + public UICheckBox(String LocText, boolean checked){ + super(LocText, checked); } public UICheckBox(String text, Icon icon){