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

designer_base/src/com/fr/design/mainframe/templateinfo/JFormProcessInfo.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.templateinfo;
 
 import com.fr.form.main.Form;
-import com.fr.form.ui.container.WFitLayout;
+import com.fr.form.ui.container.WLayout;
 
 /**
  * Created by plough on 2017/3/17.
@@ -32,11 +32,9 @@ public class JFormProcessInfo extends TemplateProcessInfo<Form> {
     public int getWidgetCount() {
         int widgetCount = 0;
         for (int i = 0; i < template.getContainer().getWidgetCount(); i++) {
-            WFitLayout wf = (WFitLayout) template.getContainer().getWidget(i);
+            WLayout wl = (WLayout) template.getContainer().getWidget(i);
-            widgetCount += wf.getWidgetCount();
+            widgetCount += wl.getWidgetCount();
         }
-        int a = 1;
-        int b = 2;
         return widgetCount;
     }
 }