From b33fa93ae2469105a63292b8679c063baba8d335 Mon Sep 17 00:00:00 2001
From: Kalven <Kalven@fanruan.com>
Date: Mon, 2 Sep 2019 14:10:40 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-1117=20=E6=8C=89=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fanruan/api/base/ScriptFormula.java    | 17 -----------------
 .../api/design/util/FunctionDefNAD.java        | 15 ---------------
 .../api/design/util/FunctionManagerKit.java    | 18 ------------------
 .../com/fanruan/api/function/FunctionKit.java  |  8 ++++++++
 .../com/fanruan/api/macro/OperatingSystem.java |  1 +
 .../com/fanruan/api/structure/Formula.java     | 14 --------------
 6 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 src/main/java/com/fanruan/api/base/ScriptFormula.java
 delete mode 100644 src/main/java/com/fanruan/api/design/util/FunctionDefNAD.java
 delete mode 100644 src/main/java/com/fanruan/api/design/util/FunctionManagerKit.java
 delete mode 100644 src/main/java/com/fanruan/api/structure/Formula.java

diff --git a/src/main/java/com/fanruan/api/base/ScriptFormula.java b/src/main/java/com/fanruan/api/base/ScriptFormula.java
deleted file mode 100644
index 59a0124..0000000
--- a/src/main/java/com/fanruan/api/base/ScriptFormula.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.fanruan.api.base;
-
-/**
- * 使用script语言的脚本公式
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/30
- */
-public class ScriptFormula extends com.fr.base.ScriptFormula {
-    public ScriptFormula() {
-        super();
-    }
-
-    public ScriptFormula(String text) {
-        super(text);
-    }
-}
diff --git a/src/main/java/com/fanruan/api/design/util/FunctionDefNAD.java b/src/main/java/com/fanruan/api/design/util/FunctionDefNAD.java
deleted file mode 100644
index fdf1608..0000000
--- a/src/main/java/com/fanruan/api/design/util/FunctionDefNAD.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.fanruan.api.design.util;
-
-import com.fr.stable.script.FunctionDef;
-
-/**
- * 函数名和描述
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class FunctionDefNAD extends com.fr.design.formula.FunctionDefNAD {
-    public FunctionDefNAD(FunctionDef functionDef) {
-        super(functionDef);
-    }
-}
diff --git a/src/main/java/com/fanruan/api/design/util/FunctionManagerKit.java b/src/main/java/com/fanruan/api/design/util/FunctionManagerKit.java
deleted file mode 100644
index 72552d4..0000000
--- a/src/main/java/com/fanruan/api/design/util/FunctionManagerKit.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.fanruan.api.design.util;
-
-/**
- * 函数管理器
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class FunctionManagerKit  {
-    /**
-     * 得到函数管理器实例
-     * @return 函数管理器
-     */
-    public static com.fr.file.FunctionManager getInstance() {
-        return com.fr.file.FunctionManager.getInstance();
-    }
-
-}
diff --git a/src/main/java/com/fanruan/api/function/FunctionKit.java b/src/main/java/com/fanruan/api/function/FunctionKit.java
index 3784174..d43b9e5 100644
--- a/src/main/java/com/fanruan/api/function/FunctionKit.java
+++ b/src/main/java/com/fanruan/api/function/FunctionKit.java
@@ -55,4 +55,12 @@ public class FunctionKit {
             FunctionManager.getInstance().addFunctionDef(fun);
         }
     }
+
+    /**
+     * 得到函数管理器实例
+     * @return 函数管理器
+     */
+    public static com.fr.file.FunctionManager getInstance() {
+        return com.fr.file.FunctionManager.getInstance();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/fanruan/api/macro/OperatingSystem.java b/src/main/java/com/fanruan/api/macro/OperatingSystem.java
index da783a3..485266f 100644
--- a/src/main/java/com/fanruan/api/macro/OperatingSystem.java
+++ b/src/main/java/com/fanruan/api/macro/OperatingSystem.java
@@ -3,6 +3,7 @@ package com.fanruan.api.macro;
 import com.fr.stable.os.AbstractOperatingSystem;
 
 /**
+ * 操作系统判断类，判断操作系统种类
  * @author Kalven
  * @version 10.0
  * Created by Kalven on 2019/8/31
diff --git a/src/main/java/com/fanruan/api/structure/Formula.java b/src/main/java/com/fanruan/api/structure/Formula.java
deleted file mode 100644
index 7c378d9..0000000
--- a/src/main/java/com/fanruan/api/structure/Formula.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.fanruan.api.structure;
-
-/**
- * 公式， 公式中可以运用已有的各种函数进行复杂的运算
- */
-public class Formula extends com.fr.base.Formula {
-    public Formula() {
-        super();
-    }
-
-    public Formula(String text) {
-        super(text);
-    }
-}