From 573f856c2481a24edd87d6eb4ed866450a0d38af Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 19 Jan 2018 11:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=AD=96=E7=95=A5=E6=A8=A1=E5=BC=8F=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/beans/actions/CopyAction.java | 12 ++--------- .../designer/beans/actions/CutAction.java | 13 ++---------- .../beans/actions/FormDeleteAction.java | 12 ++--------- .../beans/actions/FormWidgetEditAction.java | 13 +++++++++++- .../beans/actions/MoveDownAction.java | 12 ++--------- .../beans/actions/MoveToBottomAction.java | 13 ++---------- .../beans/actions/MoveToTopAction.java | 13 ++---------- .../designer/beans/actions/MoveUpAction.java | 13 ++---------- .../actions/behavior/ComponentEnable.java | 20 +++++++++++++++++++ .../actions/behavior/MovableDownEnable.java | 19 ++++++++++++++++++ .../actions/behavior/MovableUpEnable.java | 19 ++++++++++++++++++ .../actions/behavior/UpdateBehavior.java | 10 ++++++++++ 12 files changed, 94 insertions(+), 75 deletions(-) create mode 100644 designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java create mode 100644 designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java create mode 100644 designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java create mode 100644 designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java diff --git a/designer_form/src/com/fr/design/designer/beans/actions/CopyAction.java b/designer_form/src/com/fr/design/designer/beans/actions/CopyAction.java index 940bbbca75..96d3970425 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/CopyAction.java +++ b/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,14 +30,4 @@ public class CopyAction extends FormWidgetEditAction { } return false; } - - @Override - public void update() { - FormDesigner designer = getEditingComponent(); - if (designer == null) { - this.setEnabled(false); - return; - } - this.setEnabled(!designer.isRootSelected()); - } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/beans/actions/CutAction.java b/designer_form/src/com/fr/design/designer/beans/actions/CutAction.java index 3ce0329088..86d4079385 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/CutAction.java +++ b/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,15 +31,4 @@ public class CutAction extends FormWidgetEditAction { } return editPane.cut(); } - - @Override - public void update() { - FormDesigner designer = getEditingComponent(); - if (designer == null) { - this.setEnabled(false); - return; - } - this.setEnabled(!designer.isRootSelected()); - } - } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java b/designer_form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java index b1bdef9c56..2e9912f1e6 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java +++ b/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 @@ -58,14 +60,4 @@ public class FormDeleteAction extends FormWidgetEditAction { return false; } - - @Override - public void update() { - FormDesigner designer = getEditingComponent(); - if (designer == null) { - this.setEnabled(false); - return; - } - this.setEnabled(!designer.isRootSelected()); - } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java b/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java index 765980b296..88e102a126 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java +++ b/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,19 @@ import java.awt.event.ActionEvent; public abstract class FormWidgetEditAction extends TemplateComponentAction { + private UpdateBehavior updateBehavior; + protected FormWidgetEditAction(FormDesigner t) { super(t); } @Override public void update() { - this.setEnabled(true); + if (updateBehavior != null) { + updateBehavior.doUpdate(this); + } else { + this.setEnabled(true); + } } @Override @@ -37,4 +44,8 @@ public abstract class FormWidgetEditAction extends TemplateComponentAction