From 2a044e543111713902bdb5651865ef0359469bff Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 19 Jan 2018 09:13:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-6645=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=87=8C=E7=9A=84bug2=3D>=E5=8F=82=E6=95=B0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E4=B8=80=E4=B8=AA=E5=8A=A0=E4=BC=9A=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=92=8Cbody=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/mainframe/ComponentTree.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java index c7b2412518..2d7b56d67d 100644 --- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java +++ b/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结构出问题 + } /** * 刷新 From 3b29cb9066ae2ecbe300eee37fb03bfe3a6dbcfc Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 19 Jan 2018 11:34:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-6558=20=E7=BB=84=E4=BB=B6=E5=8F=A0?= =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=8C=96=E4=BA=A4=E4=BA=92=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=3D>=E9=A1=B6=E9=83=A8=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=8E=A7=E4=BB=B6=E6=A0=91=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81=E4=B8=80=E8=87=B4=EF=BC=9Bform?= =?UTF-8?q?=EF=BC=8Cbody=EF=BC=8C=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/event/DesignerOpenedListener.java | 13 ++++++++ .../fr/design/mainframe/DesignerFrame.java | 30 +++++++++++++++++++ .../src/com/fr/start/BaseDesigner.java | 4 ++- .../designer/beans/actions/CopyAction.java | 9 ++++++ .../designer/beans/actions/CutAction.java | 10 +++++++ .../beans/actions/FormDeleteAction.java | 10 +++++++ .../com/fr/design/mainframe/FormDesigner.java | 27 +++++++++++++++-- 7 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 designer_base/src/com/fr/design/event/DesignerOpenedListener.java diff --git a/designer_base/src/com/fr/design/event/DesignerOpenedListener.java b/designer_base/src/com/fr/design/event/DesignerOpenedListener.java new file mode 100644 index 0000000000..77c6bcf8f1 --- /dev/null +++ b/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(); +} \ No newline at end of file diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 115980e6c7..bec8df3b70 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/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,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private static final Integer TOP_LAYER = new Integer((200)); private static java.util.List> appList = new java.util.ArrayList>(); + private List designerOpenedListenerList = new ArrayList<>(); + + private boolean isDesignerOpened = false; // 加一个标记。可以通过它来判断设计器是否初始化完成 + private ToolBarMenuDock ad; private DesktopCardPane centerTemplateCardPane; @@ -284,6 +289,31 @@ 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(); + } + isDesignerOpened = true; + } + + /** + * 判断设计器是否初始化完成 + */ + public boolean isDesignerOpened() { + return isDesignerOpened; + } + + protected DesktopCardPane getCenterTemplateCardPane() { return centerTemplateCardPane; } diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index eb4b2c6f23..65c31a02b4 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/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(); 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 a93da2a60d..940bbbca75 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 @@ -29,4 +29,13 @@ 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 39b7ee47d6..3ce0329088 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 @@ -30,4 +30,14 @@ 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 525449eac6..b1bdef9c56 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 @@ -58,4 +58,14 @@ 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/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java index c9b311d502..41ff874712 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java +++ b/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
implements TreeSelection } }); + + DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() { + @Override + public void designerOpened() { + setToolbarButtons(); + } + }); } /** @@ -1039,8 +1047,21 @@ public class FormDesigner extends TargetComponent 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 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() { From 573f856c2481a24edd87d6eb4ed866450a0d38af Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 19 Jan 2018 11:46:42 +0800 Subject: [PATCH 3/5] =?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 Date: Fri, 19 Jan 2018 12:07:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/DesignerFrame.java | 11 ----------- .../beans/actions/FormWidgetEditAction.java | 13 +++++++------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index bec8df3b70..ea02476682 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -95,8 +95,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private List designerOpenedListenerList = new ArrayList<>(); - private boolean isDesignerOpened = false; // 加一个标记。可以通过它来判断设计器是否初始化完成 - private ToolBarMenuDock ad; private DesktopCardPane centerTemplateCardPane; @@ -303,17 +301,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta for (DesignerOpenedListener listener : designerOpenedListenerList) { listener.designerOpened(); } - isDesignerOpened = true; - } - - /** - * 判断设计器是否初始化完成 - */ - public boolean isDesignerOpened() { - return isDesignerOpened; } - protected DesktopCardPane getCenterTemplateCardPane() { return centerTemplateCardPane; } 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 88e102a126..2e30ef1d01 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 @@ -13,7 +13,12 @@ import java.awt.event.ActionEvent; public abstract class FormWidgetEditAction extends TemplateComponentAction { - private UpdateBehavior updateBehavior; + private UpdateBehavior updateBehavior = new UpdateBehavior() { + @Override + public void doUpdate(FormWidgetEditAction action) { + action.setEnabled(true); + } + }; protected FormWidgetEditAction(FormDesigner t) { super(t); @@ -21,11 +26,7 @@ public abstract class FormWidgetEditAction extends TemplateComponentAction Date: Fri, 19 Jan 2018 13:52:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/beans/actions/FormWidgetEditAction.java | 2 +- .../designer/beans/actions/behavior/ComponentEnable.java | 2 +- .../designer/beans/actions/behavior/MovableDownEnable.java | 2 +- .../designer/beans/actions/behavior/MovableUpEnable.java | 2 +- .../designer/beans/actions/behavior/UpdateBehavior.java | 6 ++---- 5 files changed, 6 insertions(+), 8 deletions(-) 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 2e30ef1d01..142d21aaf3 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 @@ -13,7 +13,7 @@ import java.awt.event.ActionEvent; public abstract class FormWidgetEditAction extends TemplateComponentAction { - private UpdateBehavior updateBehavior = new UpdateBehavior() { + private UpdateBehavior updateBehavior = new UpdateBehavior() { @Override public void doUpdate(FormWidgetEditAction action) { action.setEnabled(true); diff --git a/designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java b/designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java index bb16872696..051691e64f 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/behavior/ComponentEnable.java @@ -7,7 +7,7 @@ import com.fr.design.mainframe.FormDesigner; * 只对控件有效，对底层布局（form/body）无效 * Created by plough on 2018/1/19. */ -public class ComponentEnable implements UpdateBehavior { +public class ComponentEnable implements UpdateBehavior { @Override public void doUpdate(FormWidgetEditAction action) { FormDesigner designer = action.getEditingComponent(); diff --git a/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java b/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java index 0baee302bb..ad73be1b1c 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableDownEnable.java @@ -6,7 +6,7 @@ import com.fr.design.mainframe.FormDesigner; /** * Created by plough on 2018/1/19. */ -public class MovableDownEnable implements UpdateBehavior { +public class MovableDownEnable implements UpdateBehavior { @Override public void doUpdate(FormWidgetEditAction action) { FormDesigner designer = action.getEditingComponent(); diff --git a/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java b/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java index 5c2ca89780..85c12039ae 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/behavior/MovableUpEnable.java @@ -6,7 +6,7 @@ import com.fr.design.mainframe.FormDesigner; /** * Created by plough on 2018/1/19. */ -public class MovableUpEnable implements UpdateBehavior { +public class MovableUpEnable implements UpdateBehavior { @Override public void doUpdate(FormWidgetEditAction action) { FormDesigner designer = action.getEditingComponent(); diff --git a/designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java b/designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java index d78edc043c..fa56bca018 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/behavior/UpdateBehavior.java @@ -1,10 +1,8 @@ package com.fr.design.designer.beans.actions.behavior; -import com.fr.design.designer.beans.actions.FormWidgetEditAction; - /** * Created by plough on 2018/1/19. */ -public interface UpdateBehavior { - public void doUpdate(FormWidgetEditAction action); +public interface UpdateBehavior { + public void doUpdate(T t); }