Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java

@@ -92,6 +92,9 @@ public class XCardAddButton extends XButton {
     	if(cardLayout == null && tagLayout ==null ){
     		initRelateLayout();
     	}
+		if (cardLayout == null) {
+			throw new IllegalArgumentException("cardLayout can not be null");
+		}
     	int index = cardLayout.toData().getWidgetCount();
     	
     	//添加新的tab，并将原来的设为未选中状态

designer-form/src/main/java/com/fr/design/form/layout/FRTitleLayout.java

@@ -126,6 +126,7 @@ public class FRTitleLayout implements FRLayoutManager, LayoutManager{
 			int titleH = title==null ? 0 : WTitleLayout.TITLE_HEIGHT;
 			for (int i=0; i< target.getComponentCount(); i++) {
 				Component comp = target.getComponent(i);
+				if (comp != null) {
 					if (comp == title) {
 						comp.setBounds(0, 0, width, WTitleLayout.TITLE_HEIGHT);
 					} else if (comp == body) {
@@ -135,6 +136,7 @@ public class FRTitleLayout implements FRLayoutManager, LayoutManager{
 				}
 			}
 		}
+	}
 	
 	 public Object getConstraints(Component comp) {
         if (comp == null){

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -573,8 +573,8 @@ public class EditingMouseListener extends MouseInputAdapter {
                     GUICoreUtils.showPopupMenu(cellPopupMenu, designer, e.getX(), e.getY());
                 }
             }
-        }
             creator.doLayout();
+        }
         LayoutUtils.layoutRootContainer(designer.getRootComponent());
     }