From c17f1a17b1e0bbd86812e7e35894385e54f3b1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 27 Feb 2018 10:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=8D=E5=B0=84=E7=9A=84=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=8AFieldEditorDefinePane=E4=B8=AD=E7=9A=84designer?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=E6=8D=A2=E6=88=90=E4=BB=8E?=
 =?UTF-8?q?WidgetPropertyPane=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/parameter/RootDesignDefinePane.java  | 7 -------
 .../fr/design/widget/FormWidgetDefinePaneFactoryBase.java  | 4 ++--
 .../design/widget/ui/designer/FieldEditorDefinePane.java   | 7 ++-----
 .../widget/ui/designer/TextFieldEditorDefinePane.java      | 4 ----
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
index 82d17f9ff8..16863ba1de 100644
--- a/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
+++ b/designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
@@ -54,13 +54,6 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         initComponent();
     }
 
-    public RootDesignDefinePane(XCreator xCreator, FormDesigner designer) {
-        super(xCreator, designer);
-        this.root = (XWParameterLayout) xCreator;
-        initComponent();
-    }
-
-
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);
diff --git a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
index 9c69ec3e10..0de1e2bdaf 100644
--- a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
+++ b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
@@ -85,8 +85,8 @@ public class FormWidgetDefinePaneFactoryBase {
         Appearance dn = defineMap.get(widget.getClass());
         DataModify<Widget> definePane = null;
         try {
-            Constructor con =  dn.getDefineClass().getConstructor(XCreator.class, FormDesigner.class);
-            definePane  = (DataModify)con.newInstance(creator, designer);
+            Constructor con =  dn.getDefineClass().getConstructor(XCreator.class);
+            definePane  = (DataModify)con.newInstance(creator);
             operator.did(definePane.dataUI(), dn.getDisplayName());
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
index d2f7911455..5a3c37bf9e 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
@@ -10,6 +10,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.form.ui.FieldEditor;
 import com.fr.form.ui.Widget;
@@ -38,11 +39,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         this.initComponents();
     }
 
-    public FieldEditorDefinePane(XCreator xCreator, FormDesigner designer) {
-        super(xCreator, designer);
-        this.initComponents();
-    }
-
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         labelNameTextField = new UITextField();
@@ -79,6 +75,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         e.setAllowBlank(this.allowBlankCheckBox.isSelected());
         e.setErrorMessage(this.errorMsgTextField.getText());
         e.setFontSize(fontSizePane.getValue());
+        designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         if (!ComparatorUtils.equals(e.getLabelName(), labelNameTextField.getText())) {
             XCreator xCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
             Widget selectedWidget = xCreator.toData();
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
index 0d22cc99b1..35f918da46 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
@@ -28,10 +28,6 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         super(xCreator);
     }
 
-    public TextFieldEditorDefinePane(XCreator xCreator, FormDesigner designer) {
-        super(xCreator, designer);
-    }
-
     @Override
     protected JPanel setFirstContentPane() {
         regPane = createRegPane();