From 3497c80e25c39632df0c49b21060aac14d44c29b Mon Sep 17 00:00:00 2001
From: Kalven <Kalven@fanruan.com>
Date: Sat, 31 Aug 2019 22:50:21 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-1117=20=E5=86=8D=E6=AC=A1=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fanruan/api/cal/CalculatorKit.java     | 10 ++++++++++
 .../namespace/SimpleCellValueNameSpaceKit.java | 13 -------------
 .../java/com/fanruan/api/function/AVERAGE.java | 10 ----------
 .../java/com/fanruan/api/function/CHAR.java    | 10 ----------
 .../java/com/fanruan/api/function/COUNT.java   | 10 ----------
 .../java/com/fanruan/api/function/DATE.java    | 10 ----------
 .../java/com/fanruan/api/function/MAX.java     | 10 ----------
 .../java/com/fanruan/api/function/MIN.java     | 10 ----------
 .../java/com/fanruan/api/function/RANGE.java   | 10 ----------
 .../java/com/fanruan/api/function/SUM.java     | 10 ----------
 .../java/com/fanruan/api/function/TIME.java    | 10 ----------
 src/main/java/com/fanruan/api/log/LogKit.java  |  1 -
 .../api/plugin/ExtraClassManagerKit.java       | 18 ------------------
 13 files changed, 10 insertions(+), 122 deletions(-)
 delete mode 100644 src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java
 delete mode 100644 src/main/java/com/fanruan/api/function/AVERAGE.java
 delete mode 100644 src/main/java/com/fanruan/api/function/CHAR.java
 delete mode 100644 src/main/java/com/fanruan/api/function/COUNT.java
 delete mode 100644 src/main/java/com/fanruan/api/function/DATE.java
 delete mode 100644 src/main/java/com/fanruan/api/function/MAX.java
 delete mode 100644 src/main/java/com/fanruan/api/function/MIN.java
 delete mode 100644 src/main/java/com/fanruan/api/function/RANGE.java
 delete mode 100644 src/main/java/com/fanruan/api/function/SUM.java
 delete mode 100644 src/main/java/com/fanruan/api/function/TIME.java
 delete mode 100644 src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java

diff --git a/src/main/java/com/fanruan/api/cal/CalculatorKit.java b/src/main/java/com/fanruan/api/cal/CalculatorKit.java
index 4a370e5..a4b3bac 100644
--- a/src/main/java/com/fanruan/api/cal/CalculatorKit.java
+++ b/src/main/java/com/fanruan/api/cal/CalculatorKit.java
@@ -5,6 +5,7 @@ import com.fanruan.api.session.SessionKit;
 import com.fr.base.ParameterMapNameSpace;
 import com.fr.base.TableDataNameSpace;
 import com.fr.data.TableDataSource;
+import com.fr.report.core.namespace.SimpleCellValueNameSpace;
 import com.fr.report.report.Report;
 import com.fr.script.Calculator;
 import com.fr.stable.StringUtils;
@@ -77,6 +78,7 @@ public class CalculatorKit {
         return calculator;
     }
 
+
     /**
      * 返回服务器数据集的算子空间（可以通过调用calculator.pushNameSpace()将算子空间塞进算子实例，从而支持服务器数据集相关的函数计算）
      * @return 算子空间对象
@@ -84,4 +86,12 @@ public class CalculatorKit {
     public static NameSpace getServerTableDataNameSpace(){
         return TableDataNameSpace.getInstance();
     }
+
+    /**
+     * 单例模式，SimpleCellValueNameSpace
+     * @return SimpleCellValueNameSpace实例对象
+     */
+    public static NameSpace createSimpleCellValueNameSpace() {
+            return SimpleCellValueNameSpace.getInstance();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java b/src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java
deleted file mode 100644
index 83423cf..0000000
--- a/src/main/java/com/fanruan/api/cal/namespace/SimpleCellValueNameSpaceKit.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.fanruan.api.cal.namespace;
-
-import com.fr.report.core.namespace.SimpleCellValueNameSpace;
-
-public class SimpleCellValueNameSpaceKit {
-    /**
-     * 单例模式，SimpleCellValueNameSpace
-     * @return SimpleCellValueNameSpace实例对象
-     */
-    public static SimpleCellValueNameSpace getInstance() {
-        return SimpleCellValueNameSpace.getInstance();
-    }
-}
diff --git a/src/main/java/com/fanruan/api/function/AVERAGE.java b/src/main/java/com/fanruan/api/function/AVERAGE.java
deleted file mode 100644
index 837d4ee..0000000
--- a/src/main/java/com/fanruan/api/function/AVERAGE.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求平均值
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class AVERAGE extends com.fr.function.AVERAGE {
-}
diff --git a/src/main/java/com/fanruan/api/function/CHAR.java b/src/main/java/com/fanruan/api/function/CHAR.java
deleted file mode 100644
index 796f550..0000000
--- a/src/main/java/com/fanruan/api/function/CHAR.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求ASCII码对应的字符
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class CHAR extends com.fr.function.CHAR {
-}
diff --git a/src/main/java/com/fanruan/api/function/COUNT.java b/src/main/java/com/fanruan/api/function/COUNT.java
deleted file mode 100644
index 2ad9646..0000000
--- a/src/main/java/com/fanruan/api/function/COUNT.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，计算区域内所含项的个数
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class COUNT extends com.fr.function.COUNT {
-}
diff --git a/src/main/java/com/fanruan/api/function/DATE.java b/src/main/java/com/fanruan/api/function/DATE.java
deleted file mode 100644
index a4b22c3..0000000
--- a/src/main/java/com/fanruan/api/function/DATE.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，获取一个表示某一特定日期的系列数。
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class DATE extends com.fr.function.DATE {
-}
diff --git a/src/main/java/com/fanruan/api/function/MAX.java b/src/main/java/com/fanruan/api/function/MAX.java
deleted file mode 100644
index 536a1ed..0000000
--- a/src/main/java/com/fanruan/api/function/MAX.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求最大值
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class MAX extends com.fr.function.MAX {
-}
diff --git a/src/main/java/com/fanruan/api/function/MIN.java b/src/main/java/com/fanruan/api/function/MIN.java
deleted file mode 100644
index c3ee021..0000000
--- a/src/main/java/com/fanruan/api/function/MIN.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求最小值
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class MIN extends com.fr.function.MIN {
-}
diff --git a/src/main/java/com/fanruan/api/function/RANGE.java b/src/main/java/com/fanruan/api/function/RANGE.java
deleted file mode 100644
index 4d4733f..0000000
--- a/src/main/java/com/fanruan/api/function/RANGE.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，取范围内满足条件的数据序列
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class RANGE extends com.fr.function.RANGE {
-}
diff --git a/src/main/java/com/fanruan/api/function/SUM.java b/src/main/java/com/fanruan/api/function/SUM.java
deleted file mode 100644
index 13eb4f7..0000000
--- a/src/main/java/com/fanruan/api/function/SUM.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求和
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class SUM extends com.fr.function.SUM {
-}
diff --git a/src/main/java/com/fanruan/api/function/TIME.java b/src/main/java/com/fanruan/api/function/TIME.java
deleted file mode 100644
index 6c12000..0000000
--- a/src/main/java/com/fanruan/api/function/TIME.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fanruan.api.function;
-
-/**
- * 基本函数，求代表指定时间的小数
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class TIME extends com.fr.function.TIME {
-}
diff --git a/src/main/java/com/fanruan/api/log/LogKit.java b/src/main/java/com/fanruan/api/log/LogKit.java
index 4eeb09f..fb349de 100644
--- a/src/main/java/com/fanruan/api/log/LogKit.java
+++ b/src/main/java/com/fanruan/api/log/LogKit.java
@@ -1,6 +1,5 @@
 package com.fanruan.api.log;
 
-import com.fr.general.FRLogger;
 import com.fr.log.FineLoggerFactory;
 
 /**
diff --git a/src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java b/src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java
deleted file mode 100644
index 90561da..0000000
--- a/src/main/java/com/fanruan/api/plugin/ExtraClassManagerKit.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.fanruan.api.plugin;
-
-import com.fr.plugin.ExtraClassManager;
-
-/**
- * @author Kalven
- * @version 10.0
- * Created by Kalven on 2019/8/31
- */
-public class ExtraClassManagerKit  {
-    /**
-     * 获取ExtraClassManager实例
-     * @return ExtraClassManager实例
-     */
-    public static ExtraClassManager getInstance() {
-        return ExtraClassManager.getInstance();
-    }
-}