Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev

designer/src/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.templateinfo;
 
 import com.fr.base.parameter.ParameterUI;
 import com.fr.main.impl.WorkBook;
+import com.fr.main.parameter.ReportParameterAttr;
 import com.fr.report.cellcase.CellCase;
 import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.worksheet.WorkSheet;
@@ -68,7 +69,12 @@ public class JWorkBookProcessInfo extends TemplateProcessInfo<WorkBook> {
     }
     // 获取模板控件数
     public int getWidgetCount() {
-        ParameterUI pui = template.getReportParameterAttr().getParameterUI();
+        ReportParameterAttr attr = template.getReportParameterAttr();
+        if (attr == null) {
+            return 0;
+        }
+
+        ParameterUI pui = attr.getParameterUI();
         return pui == null ? 0 : (pui.getAllWidgets().length - 1);
     }
 }

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

@@ -2,6 +2,7 @@ package com.fr.design.fun.impl;
 
 import com.fr.design.fun.DesignerFrameUpButtonProvider;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
 /**
@@ -10,7 +11,7 @@ import com.fr.stable.fun.mark.API;
  * Time: 15:50
  */
 @API(level = DesignerFrameUpButtonProvider.CURRENT_LEVEL)
-public abstract class AbstractDsinFrameUpButtonProvider implements DesignerFrameUpButtonProvider {
+public abstract class AbstractDsinFrameUpButtonProvider extends AbstractProvider implements DesignerFrameUpButtonProvider {
     @Override
     public UIButton[] getUpButtons(int menuState) {
         return new UIButton[0];