Merge pull request #1607 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '99d5d6b30f9c4fb7e2a768120cf6df51270def42':
  无JIRA任务，代码规范
  无JIRA任务，代码规范
  无JIRA任务，使用策略模式重构代码
  REPORT-6558 组件叠加优化交互验收=>顶部工具栏中的按钮状态，与右侧控件树的按钮状态一致；form，body，不可编辑
  REPORT-6645 参数面板里的bug2=>参数一个一个加会导致参数面板和body结构出问题

designer_base/src/com/fr/design/event/DesignerOpenedListener.java

@@ -0,0 +1,13 @@
+package com.fr.design.event;
+
+import java.util.EventListener;
+
+/**
+ * Created by plough on 2018/1/19.
+ */
+public interface DesignerOpenedListener extends EventListener {
+    /**
+     * Invoked when the target of the listener has changed the rpt content.
+     */
+    public void designerOpened();
+}

designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@@ -14,6 +14,7 @@ import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
+import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.*;
@@ -92,6 +93,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     private static final Integer TOP_LAYER = new Integer((200));
     private static java.util.List<App<?>> appList = new java.util.ArrayList<App<?>>();
 
+    private List<DesignerOpenedListener> designerOpenedListenerList = new ArrayList<>();
+
     private ToolBarMenuDock ad;
 
     private DesktopCardPane centerTemplateCardPane;
@@ -284,6 +287,22 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     }
 
+    /**
+     * 注册"设计器初始化完成"的监听
+     */
+    public void addDesignerOpenedListener(DesignerOpenedListener listener) {
+        designerOpenedListenerList.add(listener);
+    }
+
+    /**
+     * 触发"设计器初始化完成"事件
+     */
+    public void fireDesignerOpened() {
+        for (DesignerOpenedListener listener : designerOpenedListenerList) {
+            listener.designerOpened();
+        }
+    }
+
     protected DesktopCardPane getCenterTemplateCardPane() {
         return centerTemplateCardPane;
     }

designer_base/src/com/fr/start/BaseDesigner.java

@@ -137,7 +137,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         for (int i = 0; !TemplateTreePane.getInstance().getTemplateFileTree().isTemplateShowing() && i < LOAD_TREE_MAXNUM; i++) {
             TemplateTreePane.getInstance().getTemplateFileTree().refresh();
         }
-        
+
+        df.fireDesignerOpened();
+
         splashWindow.setVisible(false);
         splashWindow.dispose();
         

designer_form/src/com/fr/design/designer/beans/actions/CopyAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.general.Inter;
 
@@ -18,6 +19,7 @@ public class CopyAction extends FormWidgetEditAction {
         this.setMnemonic('C');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
+        setUpdateBehavior(new ComponentEnable());
     }
 
     @Override
@@ -28,5 +30,4 @@ public class CopyAction extends FormWidgetEditAction {
         }
         return false;
     }
-
 }

designer_form/src/com/fr/design/designer/beans/actions/CutAction.java

@@ -6,6 +6,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.KeyStroke;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.FormDesigner;
 
@@ -19,6 +20,7 @@ public class CutAction extends FormWidgetEditAction {
 		this.setMnemonic('T');
 		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
 		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
+		this.setUpdateBehavior(new ComponentEnable());
 	}
 
 	@Override
@@ -29,5 +31,4 @@ public class CutAction extends FormWidgetEditAction {
 		}
 		return editPane.cut();
 	}
-
 }

designer_form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -8,6 +8,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.*;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.general.Inter;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.FormDesigner;
@@ -27,6 +28,7 @@ public class FormDeleteAction extends FormWidgetEditAction {
         // Richie:删除菜单图标
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
+        this.setUpdateBehavior(new ComponentEnable());
     }
 
     @Override

designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.design.actions.TemplateComponentAction;
+import com.fr.design.designer.beans.actions.behavior.UpdateBehavior;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.general.Inter;
 import com.fr.plugin.ExtraClassManager;
@@ -12,13 +13,20 @@ import java.awt.event.ActionEvent;
 
 public abstract class FormWidgetEditAction extends TemplateComponentAction<FormDesigner> {
 
+	private UpdateBehavior updateBehavior = new UpdateBehavior<FormWidgetEditAction>() {
+		@Override
+		public void doUpdate(FormWidgetEditAction action) {
+			action.setEnabled(true);
+		}
+	};
+
 	protected FormWidgetEditAction(FormDesigner t) {
 		super(t);
 	}
 
 	@Override
 	public void update() {
-		this.setEnabled(true);
+		updateBehavior.doUpdate(this);
 	}
 
 	@Override
@@ -37,4 +45,8 @@ public abstract class FormWidgetEditAction extends TemplateComponentAction<FormD
 		}
 	}
 
+	public void setUpdateBehavior(UpdateBehavior updateBehavior) {
+		this.updateBehavior = updateBehavior;
+	}
+
 }

designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.MovableDownEnable;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
@@ -28,6 +29,7 @@ public class MoveDownAction extends FormWidgetEditAction {
         this.setMnemonic('B');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER));
+        this.setUpdateBehavior(new MovableDownEnable());
     }
 
     @Override
@@ -47,14 +49,4 @@ public class MoveDownAction extends FormWidgetEditAction {
         designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED);
         return true;
     }
-
-    @Override
-    public void update() {
-        FormDesigner designer = getEditingComponent();
-        if (designer == null) {
-            this.setEnabled(false);
-            return;
-        }
-        this.setEnabled(designer.isCurrentComponentMovableDown());
-    }
 }

designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.MovableDownEnable;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
@@ -28,6 +29,7 @@ public class MoveToBottomAction extends FormWidgetEditAction {
         this.setMnemonic('K');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK));
+        this.setUpdateBehavior(new MovableDownEnable());
     }
 
     @Override
@@ -53,15 +55,4 @@ public class MoveToBottomAction extends FormWidgetEditAction {
         designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED);
         return true;
     }
-
-
-    @Override
-    public void update() {
-        FormDesigner designer = getEditingComponent();
-        if (designer == null) {
-            this.setEnabled(false);
-            return;
-        }
-        this.setEnabled(designer.isCurrentComponentMovableDown());
-    }
 }

designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.MovableUpEnable;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
@@ -28,6 +29,7 @@ public class MoveToTopAction extends FormWidgetEditAction {
         this.setMnemonic('T');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK));
+        this.setUpdateBehavior(new MovableUpEnable());
     }
 
     @Override
@@ -52,15 +54,4 @@ public class MoveToTopAction extends FormWidgetEditAction {
         designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED);
         return true;
     }
-
-    @Override
-    public void update() {
-        FormDesigner designer = getEditingComponent();
-        if (designer == null) {
-            this.setEnabled(false);
-            return;
-        }
-        this.setEnabled(designer.isCurrentComponentMovableUp());
-    }
-
 }

designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.designer.beans.actions.behavior.MovableUpEnable;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
@@ -27,6 +28,7 @@ public class MoveUpAction extends FormWidgetEditAction {
         this.setMnemonic('F');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER));
+        this.setUpdateBehavior(new MovableUpEnable());
     }
 
     @Override
@@ -47,15 +49,4 @@ public class MoveUpAction extends FormWidgetEditAction {
         designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED);
         return true;
     }
-
-    @Override
-    public void update() {
-        FormDesigner designer = getEditingComponent();
-        if (designer == null) {
-            this.setEnabled(false);
-            return;
-        }
-        this.setEnabled(designer.isCurrentComponentMovableUp());
-    }
-
 }

designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java

@@ -0,0 +1,20 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+/**
+ * 只对控件有效，对底层布局（form/body）无效
+ * Created by plough on 2018/1/19.
+ */
+public class ComponentEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(!designer.isRootSelected());
+    }
+}

designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java

@@ -0,0 +1,19 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+/**
+ * Created by plough on 2018/1/19.
+ */
+public class MovableDownEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentMovableDown());
+    }
+}

designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java

@@ -0,0 +1,19 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+/**
+ * Created by plough on 2018/1/19.
+ */
+public class MovableUpEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentMovableUp());
+    }
+}

designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java

@@ -0,0 +1,8 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+/**
+ * Created by plough on 2018/1/19.
+ */
+public interface UpdateBehavior<T> {
+    public void doUpdate(T t);
+}

designer_form/src/com/fr/design/mainframe/ComponentTree.java

@@ -125,6 +125,11 @@ public class ComponentTree extends JTree {
         scrollPathToVisible(treepath[0]);
     }
 
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        designer.getSelectionModel();  // 否则参数一个一个加会导致参数面板和body结构出问题
+    }
 
     /**
      * 刷新

designer_form/src/com/fr/design/mainframe/FormDesigner.java

@@ -21,6 +21,7 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.beans.models.StateModel;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
+import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
@@ -678,6 +679,13 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             }
 
         });
+
+        DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
+            @Override
+            public void designerOpened() {
+                setToolbarButtons();
+            }
+        });
     }
 
     /**
@@ -1039,8 +1047,21 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                 showAuthorityEditPane();
             }
             //先选中再检查
-            setToolbarButtons(paths.length == 1 && tree.getSelectionPath().getParentPath() == null);
+            setToolbarButtons();
+        }
+    }
+
+    /**
+     * 是否选中了自适应布局或底层form
+     */
+    public boolean isRootSelected() {
+        ComponentTree tree = FormHierarchyTreePane.getInstance().getComponentTree();
+        TreePath[] paths = tree.getSelectionPaths();
+        if (paths == null) {
+            return true;
         }
+        boolean isForm = paths.length == 1 && tree.getSelectionPath().getParentPath() == null;
+        return isForm || isRoot(getSelectionModel().getSelection().getSelectedCreator());
     }
 
     /**
@@ -1073,9 +1094,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     }
 
 
-    protected void setToolbarButtons(boolean flag) {
+    protected void setToolbarButtons() {
         //自适应布局和底层都不能删除
-        DesignerContext.getDesignerFrame().checkCombineUp(!(isRoot(getSelectionModel().getSelection().getSelectedCreator()) || flag), NAME_ARRAY_LIST);
+        DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
     }
 
     private void invalidateLayout() {