From 436a592e92d363053f42d45b7b64999d88180a20 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Fri, 19 Jan 2018 12:07:50 +0800
Subject: [PATCH] =?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<DesignerOpenedListener> 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<FormDesigner> {
 
-	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<FormD
 
 	@Override
 	public void update() {
-		if (updateBehavior != null) {
-			updateBehavior.doUpdate(this);
-		} else {
-			this.setEnabled(true);
-		}
+		updateBehavior.doUpdate(this);
 	}
 
 	@Override