Merge branch 'release' of http://www.finedevelop.com:2015/scm/~grey/design into release

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

@@ -271,6 +271,16 @@ public class XWCardLayout extends XLayoutContainer {
 		return true;
 	}
 
+	/**
+	 *  得到属性名
+	 * @return 属性名
+	 * @throws IntrospectionException
+	 */
+	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crp = null;
+		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,6 +112,16 @@ public class XWTabFitLayout extends XWFitLayout {
 		super(widget, initSize);
 	}
 
+	/**
+	 *  得到属性名
+	 * @return 属性名
+	 * @throws IntrospectionException
+	 */
+	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crp = null;
+		return ArrayUtils.addAll(defaultDescriptor(), crp);
+	}
+
 	protected CRPropertyDescriptor[] getisCustomStyle() throws IntrospectionException {
 		return new CRPropertyDescriptor[]{
 				//标题样式