From 699c8c655182de91bb8c88cd5ebac496cc8cdda8 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 4 Jun 2018 14:12:32 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4634=20=E7=BB=84=E4=BB=B6=E5=8F=A0?= =?UTF-8?q?=E5=8A=A0=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96=3D>=E5=9F=8B?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/beans/actions/CopyAction.java | 2 +- .../designer/beans/actions/CutAction.java | 2 +- .../beans/actions/FormDeleteAction.java | 7 +--- .../beans/actions/FormEditAction.java | 17 -------- .../beans/actions/FormWidgetEditAction.java | 39 +++++++++++++++++++ .../beans/actions/MoveDownAction.java | 2 +- .../beans/actions/MoveToBottomAction.java | 2 +- .../beans/actions/MoveToTopAction.java | 2 +- .../designer/beans/actions/MoveUpAction.java | 2 +- .../designer/beans/actions/PasteAction.java | 2 +- 10 files changed, 47 insertions(+), 30 deletions(-) delete mode 100644 designer-form/src/com/fr/design/designer/beans/actions/FormEditAction.java create mode 100644 designer-form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.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 d3906040da..a93da2a60d 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 @@ -10,7 +10,7 @@ import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; -public class CopyAction extends FormEditAction { +public class CopyAction extends FormWidgetEditAction { public CopyAction(FormDesigner t) { super(t); 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 79a005e54b..e47a2c2893 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 @@ -11,7 +11,7 @@ import com.fr.design.mainframe.FormDesigner; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; -public class CutAction extends FormEditAction { +public class CutAction extends FormWidgetEditAction { public CutAction(FormDesigner t) { super(t); 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 6678200cfd..d799fed63b 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 @@ -17,7 +17,7 @@ import com.fr.design.mainframe.FormSelection; * @author richer * @since 6.5.3 */ -public class FormDeleteAction extends FormUndoableAction { +public class FormDeleteAction extends FormWidgetEditAction { public FormDeleteAction(FormDesigner t) { super(t); @@ -55,9 +55,4 @@ public class FormDeleteAction extends FormUndoableAction { creator.deleteRelatedComponent(creator, designer); return false; } - - @Override - public void update() { - this.setEnabled(true); - } } \ No newline at end of file diff --git a/designer-form/src/com/fr/design/designer/beans/actions/FormEditAction.java b/designer-form/src/com/fr/design/designer/beans/actions/FormEditAction.java deleted file mode 100644 index ae53ebc533..0000000000 --- a/designer-form/src/com/fr/design/designer/beans/actions/FormEditAction.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fr.design.designer.beans.actions; - -import com.fr.design.actions.TemplateComponentAction; -import com.fr.design.mainframe.FormDesigner; - -public abstract class FormEditAction extends TemplateComponentAction { - - protected FormEditAction(FormDesigner t) { - super(t); - } - - @Override - public void update() { - this.setEnabled(true); - } - -} \ 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 new file mode 100644 index 0000000000..8fbaec430f --- /dev/null +++ b/designer-form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java @@ -0,0 +1,39 @@ +package com.fr.design.designer.beans.actions; + +import com.fr.design.actions.TemplateComponentAction; +import com.fr.design.mainframe.FormDesigner; +import com.fr.plugin.ExtraClassManager; +import com.fr.stable.ReportFunctionProcessor; +import com.fr.stable.fun.FunctionProcessor; + +import javax.swing.JButton; +import java.awt.event.ActionEvent; + +public abstract class FormWidgetEditAction extends TemplateComponentAction { + + protected FormWidgetEditAction(FormDesigner t) { + super(t); + } + + @Override + public void update() { + this.setEnabled(true); + } + + @Override + public void actionPerformed(ActionEvent evt) { + super.actionPerformed(evt); + // 记录功能点 + FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor(); + if (processor != null) { + FunctionProcessor functionProcessor; + if (evt.getSource() instanceof JButton) { + functionProcessor = ReportFunctionProcessor.FORM_WIDGET_EDIT_TOOLBAR; + } else { + functionProcessor = ReportFunctionProcessor.FORM_WIDGET_EDIT_POPUPMENU; + } + processor.recordFunction(functionProcessor); + } + } + +} \ No newline at end of file diff --git a/designer-form/src/com/fr/design/designer/beans/actions/MoveDownAction.java b/designer-form/src/com/fr/design/designer/beans/actions/MoveDownAction.java index ce57343c29..03e7657ab0 100644 --- a/designer-form/src/com/fr/design/designer/beans/actions/MoveDownAction.java +++ b/designer-form/src/com/fr/design/designer/beans/actions/MoveDownAction.java @@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M * Created by plough on 2017/12/4. */ -public class MoveDownAction extends FormEditAction { +public class MoveDownAction extends FormWidgetEditAction { public MoveDownAction(FormDesigner t) { super(t); diff --git a/designer-form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java b/designer-form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java index 5a69805253..ab8f813282 100644 --- a/designer-form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java +++ b/designer-form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java @@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M * Created by plough on 2017/12/4. */ -public class MoveToBottomAction extends FormEditAction { +public class MoveToBottomAction extends FormWidgetEditAction { public MoveToBottomAction(FormDesigner t) { super(t); diff --git a/designer-form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java b/designer-form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java index 0995df3ca1..1a2e4be8f6 100644 --- a/designer-form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java +++ b/designer-form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java @@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M * Created by plough on 2017/12/4. */ -public class MoveToTopAction extends FormEditAction { +public class MoveToTopAction extends FormWidgetEditAction { public MoveToTopAction(FormDesigner t) { super(t); diff --git a/designer-form/src/com/fr/design/designer/beans/actions/MoveUpAction.java b/designer-form/src/com/fr/design/designer/beans/actions/MoveUpAction.java index 94852b5d83..073156aaf8 100644 --- a/designer-form/src/com/fr/design/designer/beans/actions/MoveUpAction.java +++ b/designer-form/src/com/fr/design/designer/beans/actions/MoveUpAction.java @@ -19,7 +19,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M * Created by plough on 2017/12/4. */ -public class MoveUpAction extends FormEditAction { +public class MoveUpAction extends FormWidgetEditAction { public MoveUpAction(FormDesigner t) { super(t); diff --git a/designer-form/src/com/fr/design/designer/beans/actions/PasteAction.java b/designer-form/src/com/fr/design/designer/beans/actions/PasteAction.java index 7cf93950c5..6fc5458fea 100644 --- a/designer-form/src/com/fr/design/designer/beans/actions/PasteAction.java +++ b/designer-form/src/com/fr/design/designer/beans/actions/PasteAction.java @@ -11,7 +11,7 @@ import com.fr.design.mainframe.FormDesigner; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; -public class PasteAction extends FormEditAction { +public class PasteAction extends FormWidgetEditAction { public PasteAction(FormDesigner t) { super(t);