Browse Source

Merge pull request #81 in BA/design from ~VITO/design:master to master

* commit '31915106e6c3f3404d6554ba7167fc5f50026837':
  更换包名
  更改下包的位置,添加注释
master
superman 9 years ago
parent
commit
a0e2ca7c3a
  1. 1
      designer/src/com/fr/design/report/ExcelExportPane.java
  2. 1
      designer/src/com/fr/design/report/ReportExportAttrPane.java
  3. 26
      designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java
  4. 2
      designer_base/src/com/fr/design/report/AbstractExportPane.java

1
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.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import com.fr.design.fun.AbstractExportPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.*; import javax.swing.*;

1
designer/src/com/fr/design/report/ReportExportAttrPane.java

@ -4,7 +4,6 @@ import javax.swing.*;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.AbstractExportPane;
import com.fr.design.fun.ExportAttrTabProvider; import com.fr.design.fun.ExportAttrTabProvider;
import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.general.Inter; import com.fr.general.Inter;

26
designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java

@ -1,5 +1,6 @@
package com.fr.design.fun; package com.fr.design.fun;
import com.fr.design.report.AbstractExportPane;
import com.fr.stable.fun.Level; import com.fr.stable.fun.Level;
import javax.swing.*; import javax.swing.*;
@ -7,16 +8,41 @@ import javax.swing.*;
/** /**
* Created by vito on 16/5/5. * Created by vito on 16/5/5.
*/ */
/**
* 导出属性Tab页的接口
*/
public interface ExportAttrTabProvider extends Level{ public interface ExportAttrTabProvider extends Level{
String XML_TAG = "ExportAttrTabProvider"; String XML_TAG = "ExportAttrTabProvider";
int CURRENT_LEVEL = 1; int CURRENT_LEVEL = 1;
/**
* 转换成SwingComponent
*
* @return JComponent
*/
JComponent toSwingComponent(); JComponent toSwingComponent();
/**
* 转换成AbstractExportPane
*
* @return AbstractExportPane
*/
AbstractExportPane toExportPane(); AbstractExportPane toExportPane();
/**
* tab的标题
*
* @return
*/
String title(); String title();
/**
* tag标签
*
* @return tag名称
* @deprecated 将来不使用tag作为区分
*/
String tag(); String tag();
} }

2
designer_base/src/com/fr/design/fun/AbstractExportPane.java → designer_base/src/com/fr/design/report/AbstractExportPane.java

@ -1,4 +1,4 @@
package com.fr.design.fun; package com.fr.design.report;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
Loading…
Cancel
Save