From 29fdfce305b17460eadcaad1f52df877b4d7aca2 Mon Sep 17 00:00:00 2001
From: hugh <hugh@finereport.com>
Date: Wed, 11 Jan 2017 17:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=9C=B0=E6=96=B9=E5=86=8D?=
 =?UTF-8?q?=E5=BC=80~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/formula/FunctionDefNAD.java | 2 +-
 .../{formula => fun}/FunctionGroupDefineProvider.java       | 2 +-
 .../design/{formula => fun/impl}/AbstractFunctionGroup.java | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename designer_base/src/com/fr/design/{formula => fun}/FunctionGroupDefineProvider.java (91%)
 rename designer_base/src/com/fr/design/{formula => fun/impl}/AbstractFunctionGroup.java (79%)

diff --git a/designer_base/src/com/fr/design/formula/FunctionDefNAD.java b/designer_base/src/com/fr/design/formula/FunctionDefNAD.java
index c7c2177b58..7156601697 100644
--- a/designer_base/src/com/fr/design/formula/FunctionDefNAD.java
+++ b/designer_base/src/com/fr/design/formula/FunctionDefNAD.java
@@ -6,7 +6,7 @@ import com.fr.stable.StringUtils;
 public class FunctionDefNAD extends AbstractNameAndDescription {
 	private FunctionDef def;
 	
-	FunctionDefNAD(FunctionDef def) {
+	public FunctionDefNAD(FunctionDef def) {
 		this.def = def;
 	}
 	
diff --git a/designer_base/src/com/fr/design/formula/FunctionGroupDefineProvider.java b/designer_base/src/com/fr/design/fun/FunctionGroupDefineProvider.java
similarity index 91%
rename from designer_base/src/com/fr/design/formula/FunctionGroupDefineProvider.java
rename to designer_base/src/com/fr/design/fun/FunctionGroupDefineProvider.java
index 671a07fc72..906a567712 100644
--- a/designer_base/src/com/fr/design/formula/FunctionGroupDefineProvider.java
+++ b/designer_base/src/com/fr/design/fun/FunctionGroupDefineProvider.java
@@ -1,4 +1,4 @@
-package com.fr.design.formula;
+package com.fr.design.fun;
 
 import com.fr.design.formula.FunctionGroup;
 import com.fr.stable.fun.mark.Mutable;
diff --git a/designer_base/src/com/fr/design/formula/AbstractFunctionGroup.java b/designer_base/src/com/fr/design/fun/impl/AbstractFunctionGroup.java
similarity index 79%
rename from designer_base/src/com/fr/design/formula/AbstractFunctionGroup.java
rename to designer_base/src/com/fr/design/fun/impl/AbstractFunctionGroup.java
index c8a80f8094..12cfce71ed 100644
--- a/designer_base/src/com/fr/design/formula/AbstractFunctionGroup.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractFunctionGroup.java
@@ -1,8 +1,12 @@
-package com.fr.design.formula;
+package com.fr.design.fun.impl;
 
+import com.fr.design.formula.FunctionDefNAD;
+import com.fr.design.formula.NameAndDescription;
+import com.fr.design.fun.FunctionGroupDefineProvider;
 import com.fr.stable.fun.mark.API;
 import com.fr.stable.script.FunctionDef;
 
+
 @API(level = FunctionGroupDefineProvider.CURRENT_LEVEL)
 public abstract class AbstractFunctionGroup implements FunctionGroupDefineProvider {