Merge pull request #69 in BA/design from ~VITO/design:dev to dev

* commit 'd941231d760c72ad4861bd9146b884d88788b301':
  去掉无用返回值
  private
  改成循环存取
  邮件图片导出设置part5 in 5

designer/src/com/fr/design/report/ExcelExportPane.java

@@ -4,8 +4,10 @@ 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.JPanel;
+
+import javax.swing.*;
 
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itextfield.UITextField;
@@ -32,7 +34,7 @@ public class ExcelExportPane extends BasicPane {
 
 	protected void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+		this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Excel" + Inter.getLocText("ReportD-Excel_Export"));
 		JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
 		this.add(outnorthPane);

designer/src/com/fr/design/report/PDFExportPane.java

@@ -4,7 +4,7 @@ package com.fr.design.report;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.JPanel;
+import javax.swing.*;
 
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -26,7 +26,7 @@ public class PDFExportPane extends BasicPane {
 
 	protected void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+		this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("PDF" + Inter.getLocText("ReportD-Excel_Export"));
 		JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
 		this.add(outnorthPane);

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

@@ -1,67 +1,89 @@
 package com.fr.design.report;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
-import javax.swing.BoxLayout;
 
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.AbstractExportPane;
+import com.fr.design.fun.ExportAttrTabProvider;
+import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.general.Inter;
 import com.fr.io.attr.ReportExportAttr;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class ReportExportAttrPane extends BasicPane {
-	private ExcelExportPane excelExportPane;
+    private ExcelExportPane excelExportPane;
-	private PDFExportPane pdfExportPane;
+    private PDFExportPane pdfExportPane;
-	private WordExportPane wordExportPane;
+    private WordExportPane wordExportPane;
-	
+    private List<AbstractExportPane> paneList;
-	public ReportExportAttrPane() {
+
-		this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+    public ReportExportAttrPane() {
-		this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        UITabbedPane uiTabbedPane = new UITabbedPane();
-		excelExportPane = new ExcelExportPane();
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-		this.add(excelExportPane);
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		pdfExportPane = new PDFExportPane();
+        excelExportPane = new ExcelExportPane();
-		this.add(pdfExportPane);
+        uiTabbedPane.addTab("Excel", excelExportPane);
-		wordExportPane = new WordExportPane();
+        pdfExportPane = new PDFExportPane();
-		this.add(wordExportPane);
+        uiTabbedPane.addTab("PDF", pdfExportPane);
-	}
+        wordExportPane = new WordExportPane();
-	
+        uiTabbedPane.addTab("Word", wordExportPane);
-	@Override
+        ExportAttrTabProvider[] providers = ExtraDesignClassManager.getInstance().getExportAttrTabProviders();
-	protected String title4PopupWindow() {
+        paneList = new ArrayList<AbstractExportPane>();
-		return Inter.getLocText("ReportD-Excel_Export");
+        for (ExportAttrTabProvider provider : providers) {
-	}
+            uiTabbedPane.addTab(provider.title(), provider.toSwingComponent());
-
+            paneList.add(provider.toExportPane());
-	public void populate(ReportExportAttr reportExportAttr) {
+        }
-		if (reportExportAttr == null) {
+        this.add(uiTabbedPane);
-			reportExportAttr = new ReportExportAttr();
+    }
-		}
+
-
+    @Override
-		if (this.excelExportPane != null) {
+    protected String title4PopupWindow() {
-			this.excelExportPane.populate(reportExportAttr.getExcelExportAttr());
+        return Inter.getLocText("ReportD-Excel_Export");
-		}
+    }
-
+
-		if (this.pdfExportPane != null) {
+    public void populate(ReportExportAttr reportExportAttr) {
-			this.pdfExportPane.populate(reportExportAttr.getPDFExportAttr());
+        if (reportExportAttr == null) {
-		}
+            reportExportAttr = new ReportExportAttr();
-		
+        }
-		if (this.wordExportPane != null) {
+
-			this.wordExportPane.populate(reportExportAttr.getWordExportAttr());
+        if (this.excelExportPane != null) {
-		}
+            this.excelExportPane.populate(reportExportAttr.getExcelExportAttr());
-	}
+        }
-
+
-	public ReportExportAttr update() {
+        if (this.pdfExportPane != null) {
-		
+            this.pdfExportPane.populate(reportExportAttr.getPDFExportAttr());
-		ReportExportAttr reportExportAttr = new ReportExportAttr();
+        }
-		if (this.excelExportPane != null) {
+
-			reportExportAttr.setExcelExportAttr(this.excelExportPane.update());
+        if (this.wordExportPane != null) {
-		}
+            this.wordExportPane.populate(reportExportAttr.getWordExportAttr());
-
+        }
-		if (this.pdfExportPane != null) {
+
-			reportExportAttr.setPDFExportAttr(this.pdfExportPane.update());
+        for (AbstractExportPane exportpane : paneList) {
-		}
+            exportpane.populate(reportExportAttr);
-		
+        }
-		if (this.wordExportPane != null) {
+    }
-			reportExportAttr.setWordExportAttr(this.wordExportPane.update());
+
-		}
+    public ReportExportAttr update() {
-		
+
-		return reportExportAttr;
+        ReportExportAttr reportExportAttr = new ReportExportAttr();
-	}
+        if (this.excelExportPane != null) {
+            reportExportAttr.setExcelExportAttr(this.excelExportPane.update());
+        }
+
+        if (this.pdfExportPane != null) {
+            reportExportAttr.setPDFExportAttr(this.pdfExportPane.update());
+        }
+
+        if (this.wordExportPane != null) {
+            reportExportAttr.setWordExportAttr(this.wordExportPane.update());
+        }
+
+        for (AbstractExportPane exportPane : paneList) {
+            exportPane.update(reportExportAttr);
+        }
+        return reportExportAttr;
+    }
 }

designer/src/com/fr/design/report/WordExportPane.java

@@ -4,7 +4,7 @@ package com.fr.design.report;
 import java.awt.Color;
 import java.awt.Dimension;
 
-import javax.swing.JPanel;
+import javax.swing.*;
 
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.MultilineLabel;
@@ -23,7 +23,7 @@ public class WordExportPane extends BasicPane {
 
 	protected void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+		this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Word" + Inter.getLocText("ReportD-Excel_Export"));
 		this.add(outnorthPane);
 		

designer_base/src/com/fr/design/ExtraDesignClassManager.java

@@ -132,6 +132,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<WidgetAttrProvider> widgetAttrProviders;
 
+    private Set<ExportAttrTabProvider> exportAttrTabProviders;
+
     public TableDataTreePaneProcessor getTableDataTreePaneProcessor() {
         return tableDataTreePaneProcessor;
     }
@@ -753,6 +755,21 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         widgetAttrProviders.add((WidgetAttrProvider) level);
     }
 
+    public ExportAttrTabProvider[] getExportAttrTabProviders() {
+        if (exportAttrTabProviders == null) {
+            return new ExportAttrTabProvider[0];
+        }
+        return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]);
+    }
+
+    public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception {
+        if (exportAttrTabProviders == null) {
+            exportAttrTabProviders = new HashSet<ExportAttrTabProvider>();
+        }
+        validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName());
+        exportAttrTabProviders.add((ExportAttrTabProvider) level);
+    }
+
     /**
      * 文件名
      *
@@ -847,6 +864,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
                 addElementUIProvider(impl, simplify);
             } else if (tagName.equals(WidgetAttrProvider.XML_TAG)) {
                 addWidgetAttrProvider(impl, simplify);
+            } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) {
+                addExportAttrTabProvider(impl, simplify);
             }
         } catch (PluginInvalidLevelException e) {
             PluginMessage.remindUpdate(e.getMessage());

designer_base/src/com/fr/design/fun/AbstractExportPane.java

@@ -0,0 +1,13 @@
+package com.fr.design.fun;
+
+import com.fr.design.dialog.BasicPane;
+
+/**
+ * Created by vito on 16/5/5.
+ */
+public abstract class AbstractExportPane extends BasicPane {
+
+    public abstract void populate(Object t);
+
+    public abstract void update(Object t);
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.fun;
+
+import com.fr.stable.fun.Level;
+
+import javax.swing.*;
+
+/**
+ * Created by vito on 16/5/5.
+ */
+public interface ExportAttrTabProvider extends Level{
+    String XML_TAG = "ExportAttrTabProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    JComponent toSwingComponent();
+
+    AbstractExportPane toExportPane();
+
+    String title();
+
+    String tag();
+}

designer_base/src/com/fr/design/fun/impl/AbstractExportAttrTabProvider.java

@@ -0,0 +1,19 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.ExportAttrTabProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+
+/**
+ * Created by vito on 16/5/5.
+ */
+public abstract class AbstractExportAttrTabProvider extends AbstractProvider implements ExportAttrTabProvider  {
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return this.getClass().getName();
+    }
+}