Merge pull request #668 in BA/design from ~ZHOUPING/design:release to release

* commit 'de903cf9a2fdae8cfd60f54fe64033e75fc631eb':
  REPORT-1814 表单tab块的改良bug 功能屏蔽

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@@ -271,17 +271,6 @@ public class XWCardLayout extends XLayoutContainer {
 		return true;
 	}
 
-	
-	/**
-	*  得到属性名
-	 * @return 属性名
-	* @throws IntrospectionException
-	*/
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel();
-		return ArrayUtils.addAll(getDefaultDescriptor(), crp);
-	}
-
 	public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {
 		return new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("carousel", this.data.getClass())

designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -112,17 +112,6 @@ public class XWTabFitLayout extends XWFitLayout {
 		super(widget, initSize);
 	}
 
-	/**
-	*  得到属性名
-	 * @return 属性名
-	* @throws IntrospectionException
-	*/
-	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-		checkButonType();
-		CRPropertyDescriptor[] crp = ((WTabFitLayout) data).isCustomStyle() ? getisCustomStyle() : getisnotCustomStyle();
-		return ArrayUtils.addAll(defaultDescriptor(), crp);
-	}
-
 	protected CRPropertyDescriptor[] getisCustomStyle() throws IntrospectionException {
 		return new CRPropertyDescriptor[]{
 				//标题样式