Merge branch 'master' of http://www.finedevelop.com:2015/scm/ba/design

designer/designer.iml

@@ -17,5 +17,6 @@
     <orderEntry type="module" module-name="designer_base" />
     <orderEntry type="module" module-name="engine" />
     <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="module" module-name="engine-write" />
   </component>
 </module>

designer/src/com/fr/design/actions/report/ReportMobileAttrAction.java

@@ -45,7 +45,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{
 
         final ReportMobileAttrPane mobileAttrPane = new ReportMobileAttrPane();
         mobileAttrPane.populateBean(mobileAttr);
-        BasicDialog dialog = mobileAttrPane.showMediumWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        BasicDialog dialog = mobileAttrPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
             @Override
             public void doOk() {
                 wbTpl.setReportMobileAttr(mobileAttrPane.updateBean());

designer/src/com/fr/design/actions/report/ReportWriteAttrAction.java

@@ -51,7 +51,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
             @Override
             public void doOk() {
                 isChange = true;
-                tplEC.setReportWriteAttr(reportWritePane.update());
+                tplEC.addAttributeTarget(reportWritePane.update());
                 if (hasActionPerformed) {
                     final JTemplate targetComponent = DesignerContext.getDesignerFrame().getSelectedJTemplate();
                     if (targetComponent != null) {

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

@@ -0,0 +1,35 @@
+package com.fr.design.report;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.report.write.ValueVerifier;
+
+import java.awt.*;
+
+/**
+ * Created by richie on 16/6/12.
+ */
+public class BuildInVerifierPane extends BasicBeanPane<ValueVerifier> {
+    private ValueVerifierEditPane valueVerifierEditPane;
+
+    public BuildInVerifierPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        valueVerifierEditPane = new ValueVerifierEditPane();
+        this.add(valueVerifierEditPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populateBean(ValueVerifier ob) {
+        valueVerifierEditPane.populate(ob);
+    }
+
+    @Override
+    public ValueVerifier updateBean() {
+        return valueVerifierEditPane.update();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "BuiltIn";
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.fr.design.report;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.report.write.WClassVerifier;
+
+import java.awt.*;
+
+/**
+ * Created by richie on 16/6/12.
+ */
+public class CustomVerifierPane extends BasicBeanPane<WClassVerifier> {
+    private CustomVerifyJobPane pane;
+
+    public CustomVerifierPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        pane = new CustomVerifyJobPane();
+        this.add(pane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populateBean(WClassVerifier ob) {
+        this.pane.populateBean(ob.getClassVerifyJob());
+    }
+
+    @Override
+    public WClassVerifier updateBean() {
+        WClassVerifier verifier = new WClassVerifier();
+        verifier.setClassVerifyJob(this.pane.updateBean());
+        return verifier;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "custom";
+    }
+}

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

@@ -1,15 +1,15 @@
 package com.fr.design.report;
 
 import com.fr.base.Formula;
-import com.fr.data.Verifier;
+import com.fr.data.VerifyItem;
 import com.fr.design.gui.itableeditorpane.ActionStyle;
 import com.fr.design.gui.itableeditorpane.UIArrayTableModel;
 import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.GeneralUtils;
 import com.fr.general.Inter;
-import com.fr.stable.bridge.StableFactory;
+import com.fr.report.write.ValueVerifier;
-import com.fr.write.ReportWriteAttrProvider;
+import com.fr.stable.FormulaProvider;
-import com.fr.write.ValueVerifierProvider;
 
 import javax.swing.*;
 import java.awt.*;
@@ -32,116 +32,35 @@ public class ValueVerifierEditPane extends JPanel {
 	/**
 	 * populate
 	 */
-	public void populate(ReportWriteAttrProvider reportWriteAttr) {
+	public void populate(ValueVerifier valueVerifier) {
-		if (reportWriteAttr == null) {
+		if (valueVerifier == null) {
 			return;
 		}
-		int rowCount = reportWriteAttr.getVerifierCount();
+		int rowCount = valueVerifier.getVerifyItemsCount();
-		Object[][] os = new Object[reportWriteAttr.getValueVerifierCount()][];
+		Object[][] os = new Object[rowCount][];
-		int cnt = 0;
+		int tableDataCount = 0;
-		for (int i = 0; i < rowCount; i++) {
+		for (int i = 0; i < rowCount; i ++) {
-			if (!(reportWriteAttr.getVerifier(i) instanceof ValueVerifierProvider)) {
+			VerifyItem item = valueVerifier.getVerifyItem(i);
-				continue;
+			FormulaProvider formula = item.getFormula();
-			}
-			Formula formula = ((ValueVerifierProvider)reportWriteAttr.getVerifier(i)).getFormula();
 			if (formula == null) {
 				continue;
 			}
-			String formulaContent = formula.getContent().substring(1);
+			os[tableDataCount++] = new Object[]{formula.getPureContent(), item.getMessage()};
-			String message = reportWriteAttr.getVerifier(i).getMessage();
-			os[cnt++] = new Object[] { formulaContent, message };
 		}
 		this.tableEditorPane.populate(os);
 	}
 
-	/**
+	public ValueVerifier update() {
-	 * update
+		ValueVerifier valueVerifier = new ValueVerifier();
-	 */
-	public void update(ReportWriteAttrProvider reportWriteAttr, String name) {
 		java.util.List<Object[]> list = tableEditorPane.update();
-		reportWriteAttr.clearVerifiers(true);
 		for (int i = 0; i < list.size(); i++) {
 			Object[] o = list.get(i);
 			if (o == null || o[0] == null) {
 				continue;
 			}
-			ValueVerifierProvider p = StableFactory.getMarkedInstanceObjectFromClass(ValueVerifierProvider.TAG, ValueVerifierProvider.class);
+			VerifyItem item = new VerifyItem(new Formula(GeneralUtils.objectToString(o[0])), GeneralUtils.objectToString(o[1]));
-			p.setFormula(new Formula(readValueVerifyObject(o[0])));
+			valueVerifier.addVerifyItem(item);
-			p.setMessage(readValueVerifyObject(o[1]));
-			reportWriteAttr.addVerifier(name, (Verifier) p);
-//			reportWriteAttr.addVerifier(name, new ValueVerifier(readValueVerifyObject(o[0]), readValueVerifyObject(o[1])));
 		}
-	}
+		return valueVerifier;
-
-	private String readValueVerifyObject(Object obj) {
-		if (obj == null) {
-			return null;
-		}
-		return obj.toString();
 	}
 }
-
-
-//public class ValueVerifierEditPane extends BasicBeanPane<ValueVerifier> {
-//	private ValueVerifier valueVerifier;
-//	private UITextArea formula = new UITextArea();
-//	private UITextArea message = new UITextArea();
-//	private int col = 60;
-//	private int row = 5;
-//
-//	public ValueVerifierEditPane() {
-//		valueVerifier = new ValueVerifier();
-//
-//		this.setLayout(new FlowLayout());
-//
-//		JPanel formulaPane = new JPanel();
-//		UIScrollPane formulaScrollPane = new UIScrollPane(formula);
-//		formula.setRows(row);
-//		formula.setColumns(col);
-//		formula.setLineWrap(true);
-//		formula.setToolTipText(Inter.getLocText("Verify-ToolTips"));
-//		UILabel fl = new UILabel(Inter.getLocText("Verify-Verify_Formula"));
-//		fl.setPreferredSize(new Dimension(80, 20));
-//		formulaPane.add(fl);
-//		formulaPane.add(formulaScrollPane);
-//
-//		JPanel messagePane = new JPanel();
-//		UIScrollPane messageScrollPane = new UIScrollPane(message);
-//		message.setRows(row);
-//		message.setColumns(col);
-//		message.setLineWrap(true);
-//		UILabel ml = new UILabel(Inter.getLocText("Verify-Error_Information"));
-//		ml.setPreferredSize(new Dimension(80, 20));
-//		messagePane.add(ml);
-//		messagePane.add(messageScrollPane);
-//
-//		this.add(formulaPane);
-//		this.add(messagePane);
-//	}
-//
-//	@Override
-//	public void populateBean(ValueVerifier ob) {
-//		valueVerifier = ob;
-//		if (ob != null) {
-//			if (ob.getFormula() != null) {
-//				String content = ob.getFormula().getContent();
-//				formula.setText(content.startsWith("=") ? content.substring(1) : content);
-//			} else {
-//				formula.setText("");
-//			}
-//			message.setText(ob.getMessage());
-//		}
-//	}
-//
-//	@Override
-//	public ValueVerifier updateBean() {
-//		valueVerifier.setFormula(new Formula(formula.getText()));
-//		valueVerifier.setMessage(message.getText());
-//		return valueVerifier;
-//	}
-//
-//	@Override
-//	protected String title4PopupWindow() {
-//		return "valueVerifierPane";
-//	}
-//}

designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java

@@ -0,0 +1,94 @@
+package com.fr.design.report.mobile;
+
+import com.fr.base.mobile.MobileFitAttrState;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.Inter;
+import com.fr.report.mobile.ElementCaseMobileAttr;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by 夏翔 on 2016/5/28.
+ */
+public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
+    //横屏设置面板
+    private MobileRadioGroupPane horizionPane;
+    //竖屏设置面板
+    private MobileRadioGroupPane verticalPane;
+    //缩放选项面板
+    private MobileRadioCheckPane radioCheckPane;
+    //效果预览面板
+    private AppFitPreviewPane appFitPreviewPane;
+
+
+    public AppFitBrowserPane(){
+        initComponents();
+
+    }
+
+    private void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow());
+        JPanel fitOpsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        horizionPane = new MobileRadioGroupPane(Inter.getLocText("FR-Designer_Mobile-Horizontal"));
+        verticalPane = new MobileRadioGroupPane(Inter.getLocText("FR-Designer_Mobile-Vertical"));
+        radioCheckPane = new MobileRadioCheckPane(Inter.getLocText("FR-Designer_Mobile-Zoom"));
+        ActionListener actionListener = getAppPreviewActionListener();
+        horizionPane.addActionListener(actionListener);
+        verticalPane.addActionListener(actionListener);
+        fitOpsPane.add(horizionPane, BorderLayout.NORTH);
+        fitOpsPane.add(verticalPane, BorderLayout.CENTER);
+        fitOpsPane.add(radioCheckPane, BorderLayout.SOUTH);
+        borderPane.add(fitOpsPane);
+        this.add(borderPane);
+
+    }
+
+    public void setAppFitPreviewPane(AppFitPreviewPane appFitPreviewPane) {
+        this.appFitPreviewPane = appFitPreviewPane;
+    }
+
+    //纵向和横向独立设置
+    public int[] getCurrentFitOptions() {
+        return new int[]{horizionPane.getSelectRadioIndex(), verticalPane.getSelectRadioIndex(), radioCheckPane.getCurrentState()};
+    }
+
+    @Override
+    public void populateBean(ElementCaseMobileAttr ob) {
+        if (ob == null) {
+            ob = new ElementCaseMobileAttr();
+        }
+        horizionPane.populateBean(ob.getHorziontalAttr());
+        verticalPane.populateBean(ob.getVerticalAttr());
+        radioCheckPane.populateBean(ob.isZoom());
+        appFitPreviewPane.refreshPreview(getCurrentFitOptions());
+
+    }
+
+    @Override
+    public ElementCaseMobileAttr updateBean() {
+        MobileFitAttrState horizonState = horizionPane.updateBean();
+        MobileFitAttrState verticalState = verticalPane.updateBean();
+        boolean isZoom = radioCheckPane.updateBean();
+        return new ElementCaseMobileAttr(horizonState, verticalState, isZoom);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("FR-Designer_Fit-App");
+    }
+
+    private ActionListener getAppPreviewActionListener() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                int[] fitOptions = getCurrentFitOptions();
+                appFitPreviewPane.refreshPreview(fitOptions);
+            }
+        };
+    }
+}

designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java

@@ -0,0 +1,71 @@
+package com.fr.design.report.mobile;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import java.util.ArrayList;
+
+/**
+ * Created by 夏翔 on 2016/5/28.
+ */
+public class AppFitPreviewPane extends BasicPane{
+
+    private UILabel horizontalImageLabel;
+
+    private UILabel verticalImagelabel;
+
+    private ArrayList<ImageIcon> cachedVerticalPreviewImage = new ArrayList<ImageIcon>();
+
+    private ArrayList<ImageIcon> cachedHorizonPreviewImage = new ArrayList<ImageIcon>();
+
+
+    public AppFitPreviewPane() {
+        //初始化缓存图片
+        initCacheImage();
+        //初始化组件
+        initComponents();
+    }
+
+    private void initCacheImage() {
+        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V0.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png")));
+        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png")));
+        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png")));
+        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png")));
+        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png")));
+    }
+
+    private void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+
+        JPanel outnorthPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow());
+        this.add(outnorthPane);
+
+        horizontalImageLabel = new UILabel();
+        horizontalImageLabel.setIcon(cachedHorizonPreviewImage.get(1));
+        outnorthPane.add(horizontalImageLabel);
+
+        verticalImagelabel = new UILabel();
+        verticalImagelabel.setIcon(cachedVerticalPreviewImage.get(0));
+        outnorthPane.add(verticalImagelabel);
+    }
+
+    public void refreshPreview(int[] index) {
+        ImageIcon newHorizonImageIcon =  cachedHorizonPreviewImage.get(index[0]) ;
+        ImageIcon newVerticalImageIcon = cachedVerticalPreviewImage.get(index[1]);
+        horizontalImageLabel.setIcon(newHorizonImageIcon);
+        verticalImagelabel.setIcon(newVerticalImageIcon);
+
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("FR-Plugin_Preview");
+    }
+}

designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java

@@ -1,11 +1,11 @@
 package com.fr.design.report.mobile;
 
-import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * Created by Administrator on 2016/5/16/0016.
  */
-public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState> {
+public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
 
     private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
 

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -1,43 +1,33 @@
 package com.fr.design.report.mobile;
 
-import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.Inter;
 import com.fr.report.mobile.ElementCaseMobileAttr;
 
 import javax.swing.*;
-import java.awt.*;
 
 /**
  * Created by Administrator on 2016/5/12/0012.
  */
-public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr> {
+public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
 
-    //横屏设置面板
+
-    private MobileRadioGroupPane horizionPane;
+    private AppFitBrowserPane appFitBrowserPane;
-    //竖屏设置面板
-    private MobileRadioGroupPane verticalPane;
-    //缩放设置面板
-    private MobileRadioCheckPane radioCheckPane;
 
     public ReportMobileAttrPane() {
         initComponents();
     }
 
     private void initComponents() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow());
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        AppFitPreviewPane appFitPreviewPane = new AppFitPreviewPane();
+
+        appFitBrowserPane = new AppFitBrowserPane();
+        appFitBrowserPane.setAppFitPreviewPane(appFitPreviewPane);
+        this.add(appFitBrowserPane);
 
-        JPanel fitOpsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.add(appFitPreviewPane);
-        horizionPane = new MobileRadioGroupPane(Inter.getLocText("FR-Designer_Mobile-Horizontal"));
-        verticalPane = new MobileRadioGroupPane(Inter.getLocText("FR-Designer_Mobile-Vertical"));
-        radioCheckPane = new MobileRadioCheckPane(Inter.getLocText("FR-Designer_Mobile-Zoom"));
-        fitOpsPane.add(horizionPane, BorderLayout.NORTH);
-        fitOpsPane.add(verticalPane, BorderLayout.CENTER);
-        fitOpsPane.add(radioCheckPane, BorderLayout.SOUTH);
-        borderPane.add(fitOpsPane);
-        this.add(borderPane);
     }
 
     @Override
@@ -45,18 +35,13 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr> {
         if (ob == null) {
             ob = new ElementCaseMobileAttr();
         }
+        appFitBrowserPane.populateBean(ob);
 
-        horizionPane.populateBean(ob.getHorziontalAttr());
-        verticalPane.populateBean(ob.getVerticalAttr());
-        radioCheckPane.populateBean(ob.isZoom());
     }
 
     @Override
     public ElementCaseMobileAttr updateBean() {
-        MobileFitAttrState horizonState = horizionPane.updateBean();
+        return appFitBrowserPane.updateBean();
-        MobileFitAttrState verticalState = verticalPane.updateBean();
-        boolean isZoom = radioCheckPane.updateBean();
-        return new ElementCaseMobileAttr(horizonState, verticalState, isZoom);
     }
 
     @Override

designer/src/com/fr/design/webattr/ReportWriteAttrPane.java

@@ -6,17 +6,16 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.report.VerifierListPane;
 import com.fr.design.report.WriteShortCutsPane;
-import com.fr.design.write.submit.SubmiterListPane;
+import com.fr.design.write.submit.SubmitVisitorListPane;
 import com.fr.general.Inter;
 import com.fr.report.worksheet.WorkSheet;
-import com.fr.stable.bridge.StableFactory;
+import com.fr.report.write.ReportWriteAttr;
-import com.fr.write.ReportWriteAttrProvider;
 
 import javax.swing.*;
 import java.awt.*;
 
 public class ReportWriteAttrPane extends LoadingBasicPane {
-	private SubmiterListPane submiterListPane;
+	private SubmitVisitorListPane submiterListPane;
 //	private ValueVerifierEditPane valueVerifierEditPane;
 	private VerifierListPane verifierListPane;
 	private WriteShortCutsPane writeShortCutsPane;
@@ -33,7 +32,7 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 
 		// peter: writeSQLAttrList的编辑.
 		if (submiterListPane == null) {
-			submiterListPane = new SubmiterListPane(ePane);
+			submiterListPane = new SubmitVisitorListPane(ePane);
 		}
 //		valueVerifierEditPane = new ValueVerifierEditPane();
 		if (verifierListPane == null) {
@@ -44,27 +43,6 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 		tabbedPane.addTab(Inter.getLocText("FR-Utils_Submit"), submiterListPane);
 		tabbedPane.addTab(Inter.getLocText("Verify-Data_Verify"), verifierListPane);
 		tabbedPane.addTab(Inter.getLocText("Writer-ShortCuts_Setting"), writeShortCutsPane);
-
-//		tabbedPane.addChangeListener(new ChangeListener() {
-//			@Override
-//			public void stateChanged(ChangeEvent e) {
-//				// 切换的时候这里会先于UITabbedPaneUI的MousePressed事件
-//				// 会导致弹窗两次
-//				int idx = ReportWriteAttrPane.this.getInvalidIndex();
-//				if (idx >= 0 && idx != tabbedPane.getSelectedIndex()) {
-//					try {
-//	                    if (idx == 0) {
-//							ReportWriteAttrPane.this.submiterListPane.checkValid();
-//						} else {
-//							ReportWriteAttrPane.this.verifierListPane.checkValid();
-//						}
-//					} catch (Exception exp) {
-//						JOptionPane.showMessageDialog(ReportWriteAttrPane.this, exp.getMessage());
-//						tabbedPane.setSelectedIndex(idx);
-//					}
-//				}
-//			}
-//		});
 	}
 
 	@Override
@@ -77,9 +55,9 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 			return;
 		}
 
-		ReportWriteAttrProvider reportWriteAttr = report.getReportWriteAttr();
+		ReportWriteAttr reportWriteAttr = report.getAttributeTarget(ReportWriteAttr.XML_TAG);
 		if (reportWriteAttr == null) {
-			reportWriteAttr =  StableFactory.getMarkedInstanceObjectFromClass(ReportWriteAttrProvider.XML_TAG, ReportWriteAttrProvider.class);
+			reportWriteAttr =  new ReportWriteAttr();
 		}
 
 		this.submiterListPane.populate(reportWriteAttr);
@@ -87,8 +65,8 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 
 	}
 
-    public ReportWriteAttrProvider update() {
+    public ReportWriteAttr update() {
-        ReportWriteAttrProvider reportWriteAttr = StableFactory.getMarkedInstanceObjectFromClass(ReportWriteAttrProvider.XML_TAG, ReportWriteAttrProvider.class);
+        ReportWriteAttr reportWriteAttr = new ReportWriteAttr();
 
         this.submiterListPane.updateReportWriteAttr(reportWriteAttr);
         this.verifierListPane.updateReportWriteAttr(reportWriteAttr);

designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java

@@ -17,13 +17,14 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
+import com.fr.report.write.BuiltInSQLSubmiter;
+import com.fr.report.write.ReportWriteAttr;
 import com.fr.report.write.SubmitVisitor;
+import com.fr.report.write.WClassSubmiter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
-import com.fr.stable.bridge.StableFactory;
 import com.fr.write.BuiltInSQLSubmiterProvider;
 import com.fr.write.DBManipulation;
-import com.fr.write.ReportWriteAttrProvider;
 import com.fr.write.WClassSubmiterProvider;
 
 import javax.swing.*;
@@ -35,9 +36,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class SubmiterListPane extends ObjectJControlPane {
+public class SubmitVisitorListPane extends ObjectJControlPane {
 
-    public SubmiterListPane(ElementCasePane ePane) {
+    public SubmitVisitorListPane(ElementCasePane ePane) {
         super(ePane);
     }
 
@@ -50,14 +51,12 @@ public class SubmiterListPane extends ObjectJControlPane {
         return new NameableCreator[]{
                 new NameObjectCreator(Inter.getLocText("RWA-BuildIn_SQL"),
                         "/com/fr/web/images/reportlet.png",
-//				BuiltInSQLSubmiter.class,
+                        BuiltInSQLSubmiter.class,
-                        StableFactory.getRegisteredClass(BuiltInSQLSubmiterProvider.TAG),
                         BuildInSQLPane.class),
                 new NameObjectCreator(
                         Inter.getLocText(new String[]{"Custom", "RWA-Submit"}),
                         "/com/fr/web/images/reportlet.png",
-//				WClassSubmiter.class,
+                        WClassSubmiter.class,
-                        StableFactory.getRegisteredClass(WClassSubmiterProvider.TAG),
                         CustomPane.class)
         };
     }
@@ -67,18 +66,17 @@ public class SubmiterListPane extends ObjectJControlPane {
         return "write";
     }
 
-    public void populate(ReportWriteAttrProvider reportWriteAttr) {
+    public void populate(ReportWriteAttr reportWriteAttr) {
         if (reportWriteAttr == null) {
             return;
         }
 
-        List<NameObject> nameObjectList = new ArrayList<NameObject>();
+        List<NameObject> nameObjectList = new ArrayList<>();
 
         int submiterCount = reportWriteAttr.getSubmitVisitorCount();
         for (int i = 0; i < submiterCount; i++) {
-            SubmitVisitor submiter = reportWriteAttr.getSubmitVisitor(i);
+            SubmitVisitor visitor = reportWriteAttr.getSubmitVisitor(i);
-            String name = reportWriteAttr.getSubmitVisitorNameList(i);
+            nameObjectList.add(new NameObject(visitor.getName(), visitor));
-            nameObjectList.add(new NameObject(name, submiter));
         }
 
         this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
@@ -89,7 +87,7 @@ public class SubmiterListPane extends ObjectJControlPane {
      *
      * @param reportWriteAttr 报表填报属性
      */
-    public void updateReportWriteAttr(ReportWriteAttrProvider reportWriteAttr) {
+    public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
         // Nameable[]居然不能强转成NameObject[],一定要这么写...
         Nameable[] res = this.update();
         NameObject[] res_array = new NameObject[res.length];
@@ -100,7 +98,9 @@ public class SubmiterListPane extends ObjectJControlPane {
         for (int i = 0; i < res_array.length; i++) {
             NameObject nameObject = res_array[i];
             if (nameObject.getObject() instanceof SubmitVisitor) {
-                reportWriteAttr.addSubmitVisitor(nameObject.getName(), (SubmitVisitor) nameObject.getObject());
+                SubmitVisitor visitor = (SubmitVisitor) nameObject.getObject();
+                visitor.setName(nameObject.getName());
+                reportWriteAttr.addSubmitVisitor(visitor);
             }
         }
     }
@@ -137,9 +137,9 @@ public class SubmiterListPane extends ObjectJControlPane {
             DBManipulation dbManipulation = dbManipulationPane.updateBean();
 
             //复制对象用于撤销
-            try{
+            try {
-                editing = (BuiltInSQLSubmiterProvider)editing.clone();
+                editing = (BuiltInSQLSubmiterProvider) editing.clone();
-            }catch (Exception e){
+            } catch (Exception e) {
                 FRLogger.getLogger().error(e.getMessage());
             }
             editing.setDBManipulation(dbManipulation);
@@ -176,7 +176,7 @@ public class SubmiterListPane extends ObjectJControlPane {
             comboItemsMap = new HashMap<String, String>();
 
             SubmitProvider[] providers = ExtraDesignClassManager.getInstance().getSubmitProviders();
-            providers = (SubmitProvider[])ArrayUtils.add(providers, new DefaultSubmit());
+            providers = (SubmitProvider[]) ArrayUtils.add(providers, new DefaultSubmit());
             for (SubmitProvider provider : providers) {
                 customSubmitPanes.put(provider.keyForSubmit(), provider.appearanceForSubmit());
                 comboItemsMap.put(provider.keyForSubmit(), provider.dataForSubmit());
@@ -226,7 +226,7 @@ public class SubmiterListPane extends ObjectJControlPane {
                 }
                 return;
             }
-            String pantype=submitJob.getJobType();
+            String pantype = submitJob.getJobType();
             BasicBeanPane pane = customSubmitPanes.get(pantype);
             if (pane != null) {
                 csjConfigComboBox.setSelectedItem(comboItemsMap.get(pantype));

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

@@ -130,6 +130,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<ElementUIProvider> elementUIProviders;
 
+    private Set<VerifyDefineProvider> verifyDefineProviders;
+
     private Set<WidgetPropertyUIProvider> widgetAttrProviders;
 
     private Set<ExportAttrTabProvider> exportAttrTabProviders;
@@ -814,6 +816,21 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         backgroundUIProviders.add((BackgroundUIProvider) level);
     }
 
+    public VerifyDefineProvider[] getVerifyDefineProviders() {
+        if (verifyDefineProviders == null) {
+            return new VerifyDefineProvider[0];
+        }
+        return verifyDefineProviders.toArray(new VerifyDefineProvider[verifyDefineProviders.size()]);
+    }
+
+    private void addVerifyDefineProvider(Level level, PluginSimplify simplify) throws Exception {
+        if (verifyDefineProviders == null) {
+            verifyDefineProviders = new HashSet<>();
+        }
+        validAPILevel(level, VerifyDefineProvider.CURRENT_LEVEL, simplify.getPluginName());
+        verifyDefineProviders.add((VerifyDefineProvider) level);
+    }
+
     /**
      * 文件名
      *
@@ -914,6 +931,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
                 addWidgetAttrProvider(impl, simplify);
             } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) {
                 addExportAttrTabProvider(impl, simplify);
+            } else if (tagName.equals(VerifyDefineProvider.MARK_STRING)) {
+                addVerifyDefineProvider(impl, simplify);
             }
         } catch (PluginInvalidLevelException e) {
             PluginMessage.remindUpdate(e.getMessage());

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

@@ -0,0 +1,40 @@
+package com.fr.design.fun;
+
+import com.fr.data.Verifier;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.stable.fun.Level;
+import com.fr.stable.fun.Provider;
+
+/**
+ * Created by richie on 16/6/8.
+ */
+public interface VerifyDefineProvider extends Level, Provider {
+
+    String MARK_STRING = "VerifyDefineProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 对应的校验类
+     * @return 校验类
+     */
+    Class<? extends Verifier> classForVerifier();
+
+    /**
+     * 校验设置的界面
+     * @return 界面
+     */
+    Class<? extends BasicBeanPane> appearanceForVerifier();
+
+    /**
+     * 此种类型的校验的名字
+     * @return 名字
+     */
+    String nameForVerifier();
+
+    /**
+     * 菜单图标
+     * @return 图标路径
+     */
+    String iconPath();
+}

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

@@ -0,0 +1,20 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.VerifyDefineProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+
+/**
+ * Created by richie on 16/6/8.
+ */
+public abstract class AbstractVerifyDefineProvider extends AbstractProvider implements VerifyDefineProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -81,7 +81,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
 		Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
 		hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
-		hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("StyleAlignment-Tooltips_Right"),
+		hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
 		Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"),Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")});
 		hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
 		vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));

designer_base/src/com/fr/env/RemoteEnv.java

@@ -28,6 +28,8 @@ import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.plugin.Plugin;
+import com.fr.plugin.PluginLicense;
+import com.fr.plugin.PluginLicenseManager;
 import com.fr.plugin.PluginLoader;
 import com.fr.stable.*;
 import com.fr.stable.file.XMLFileManagerProvider;
@@ -2044,25 +2046,25 @@ public class RemoteEnv implements Env {
 
     }
 
-    public InputStream readPluginConfig() throws Exception {
+    public void readPluginLicenses() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         HashMap<String, String> para = new HashMap<String, String>();
         para.put("op", "fr_remote_design");
-        para.put("cmd", "design_get_plugin_info");
+        para.put("cmd", "design_plugin_licenses");
 
-        return postBytes2ServerB(out.toByteArray(), para);
+        InputStream inputStream = postBytes2ServerB(out.toByteArray(), para);
+        String pluginsLicensesStr = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8);
+        if (StringUtils.isNotBlank(pluginsLicensesStr) && pluginsLicensesStr.startsWith("[")) {
+            JSONArray jsonArray = new JSONArray(pluginsLicensesStr);
+            for (int i = 0; i < jsonArray.length(); i++) {
+                PluginLicense pluginLicense = new PluginLicense();
+                pluginLicense.parseJSON(jsonArray.getJSONObject(i));
+                PluginLicenseManager.getInstance().addRemotePluginLicense(pluginLicense);
+            }
+        }
     }
 
-    /**
-     * 远程设计先不需要检测MD5
-     *
-     * @return 是否正确
-     * @throws Exception MD5算法异常
-     */
     @Override
-    public boolean isTruePluginMD5(Plugin plugin, File file) throws Exception {
+    public void checkAndRegisterLic(FileNode node, Plugin plugin) throws Exception {
-        return true;
     }
-
-
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -7,6 +7,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.ChartEditPane;
@@ -37,8 +38,28 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		content.add(buttonPane, BorderLayout.NORTH);
 		
 		chartTypePane = new ComboBoxPane();
-		chartTypePane.setBorder(BorderFactory.createEmptyBorder(0,0, 0, 10));
+		BasicScrollPane scrollPane = new BasicScrollPane() {
-		content.add(chartTypePane, BorderLayout.CENTER);
+			@Override
+			protected JPanel createContentPane() {
+				return chartTypePane;
+			}
+
+			@Override
+			protected void layoutContentPane() {
+				leftcontentPane = createContentPane();
+				this.add(leftcontentPane);
+			}
+
+			@Override
+			public void populateBean(Object ob) {
+			}
+
+			@Override
+			protected String title4PopupWindow() {
+				return null;
+			}
+		};
+		content.add(scrollPane, BorderLayout.CENTER);
 		
 		buttonPane.setEditingChartPane(chartTypePane);