From 49d5d32b38f1cb97cf2e9673b4dbf6da7b4c0c7b Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 16 May 2016 15:31:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8B=E5=8C=85?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/report/ExcelExportPane.java | 1 - .../design/report/ReportExportAttrPane.java | 2 +- .../fr/design/fun/ExportAttrTabProvider.java | 26 +++++++++++++++++++ .../fun/{ => impl}/AbstractExportPane.java | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) rename designer_base/src/com/fr/design/fun/{ => impl}/AbstractExportPane.java (87%) diff --git a/designer/src/com/fr/design/report/ExcelExportPane.java b/designer/src/com/fr/design/report/ExcelExportPane.java index f2b699f3b9..3bd7378c97 100644 --- a/designer/src/com/fr/design/report/ExcelExportPane.java +++ b/designer/src/com/fr/design/report/ExcelExportPane.java @@ -4,7 +4,6 @@ package com.fr.design.report; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import com.fr.design.fun.AbstractExportPane; import com.fr.design.gui.ilable.UILabel; import javax.swing.*; diff --git a/designer/src/com/fr/design/report/ReportExportAttrPane.java b/designer/src/com/fr/design/report/ReportExportAttrPane.java index 93a690bb91..b381ad2164 100644 --- a/designer/src/com/fr/design/report/ReportExportAttrPane.java +++ b/designer/src/com/fr/design/report/ReportExportAttrPane.java @@ -4,7 +4,7 @@ import javax.swing.*; import com.fr.design.ExtraDesignClassManager; import com.fr.design.dialog.BasicPane; -import com.fr.design.fun.AbstractExportPane; +import com.fr.design.fun.impl.AbstractExportPane; import com.fr.design.fun.ExportAttrTabProvider; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.general.Inter; diff --git a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java index d16db4ea1b..b5fb6fbd51 100644 --- a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java +++ b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java @@ -1,5 +1,6 @@ package com.fr.design.fun; +import com.fr.design.fun.impl.AbstractExportPane; import com.fr.stable.fun.Level; import javax.swing.*; @@ -7,16 +8,41 @@ import javax.swing.*; /** * Created by vito on 16/5/5. */ + +/** + * 导出属性Tab页的接口 + */ public interface ExportAttrTabProvider extends Level{ String XML_TAG = "ExportAttrTabProvider"; int CURRENT_LEVEL = 1; + /** + * 转换成SwingComponent + * + * @return JComponent + */ JComponent toSwingComponent(); + /** + * 转换成AbstractExportPane + * + * @return AbstractExportPane + */ AbstractExportPane toExportPane(); + /** + * tab的标题 + * + * @return + */ String title(); + /** + * tag标签 + * + * @return tag名称 + * @deprecated 将来不使用tag作为区分 + */ String tag(); } diff --git a/designer_base/src/com/fr/design/fun/AbstractExportPane.java b/designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java similarity index 87% rename from designer_base/src/com/fr/design/fun/AbstractExportPane.java rename to designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java index bb585a02d2..f4371c7a27 100644 --- a/designer_base/src/com/fr/design/fun/AbstractExportPane.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java @@ -1,4 +1,4 @@ -package com.fr.design.fun; +package com.fr.design.fun.impl; import com.fr.design.dialog.BasicPane; From 31915106e6c3f3404d6554ba7167fc5f50026837 Mon Sep 17 00:00:00 2001 From: vito Date: Mon, 16 May 2016 15:46:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/report/ReportExportAttrPane.java | 1 - designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java | 2 +- .../com/fr/design/{fun/impl => report}/AbstractExportPane.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename designer_base/src/com/fr/design/{fun/impl => report}/AbstractExportPane.java (87%) diff --git a/designer/src/com/fr/design/report/ReportExportAttrPane.java b/designer/src/com/fr/design/report/ReportExportAttrPane.java index b381ad2164..f3df79528e 100644 --- a/designer/src/com/fr/design/report/ReportExportAttrPane.java +++ b/designer/src/com/fr/design/report/ReportExportAttrPane.java @@ -4,7 +4,6 @@ import javax.swing.*; import com.fr.design.ExtraDesignClassManager; import com.fr.design.dialog.BasicPane; -import com.fr.design.fun.impl.AbstractExportPane; import com.fr.design.fun.ExportAttrTabProvider; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.general.Inter; diff --git a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java index b5fb6fbd51..a3573794c2 100644 --- a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java +++ b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java @@ -1,6 +1,6 @@ package com.fr.design.fun; -import com.fr.design.fun.impl.AbstractExportPane; +import com.fr.design.report.AbstractExportPane; import com.fr.stable.fun.Level; import javax.swing.*; diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java b/designer_base/src/com/fr/design/report/AbstractExportPane.java similarity index 87% rename from designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java rename to designer_base/src/com/fr/design/report/AbstractExportPane.java index f4371c7a27..efbde8d37d 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractExportPane.java +++ b/designer_base/src/com/fr/design/report/AbstractExportPane.java @@ -1,4 +1,4 @@ -package com.fr.design.fun.impl; +package com.fr.design.report; import com.fr.design.dialog.BasicPane;