From 46f43d6a949620c5179e5e43ac668ace77060272 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 29 Sep 2017 17:38:16 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4899=20[9.0=E4=BA=8C=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E8=A1=A8=E5=8D=95=E6=8A=A5=E8=A1=A8=E5=9D=97?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=8A=9F=E8=83=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccessibleElementCaseToolBarEditor.java    | 18 ------------------
 .../layout/ElementEditorDefinePane.java        |  8 +++-----
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java
index 4321ab1dc8..0fcf1e25bf 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java
@@ -2,15 +2,11 @@ package com.fr.design.mainframe.widget.accessibles;
 
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.mainframe.FormWebWidgetConstants;
 import com.fr.design.mainframe.widget.editors.ElementCaseToolBarPane;
-import com.fr.design.mainframe.widget.editors.ITextComponent;
-import com.fr.design.mainframe.widget.editors.TextField;
 import com.fr.design.mainframe.widget.wrappers.ElementCaseToolBarWrapper;
 import com.fr.form.web.FormToolBarManager;
-import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.SwingUtilities;
@@ -59,18 +55,4 @@ public class AccessibleElementCaseToolBarEditor extends UneditableAccessibleEdit
         return options.toArray(new WidgetOption[options.size()]);
     }
 
-    protected ITextComponent createTextField() {
-        TextField textField = new TextField() {
-            public void registerChangeListener(UIObserverListener listener) {
-                return;
-            }
-
-            public boolean shouldResponseChangeListener() {
-                return false;
-            }
-        };
-        textField.setGlobalName(Inter.getLocText("Form-EC_toolbar"));
-        return textField;
-    }
-
 }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
index 662137f1ed..469e28e477 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
@@ -40,7 +40,7 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
-        CRPropertyDescriptor[] extraTableEditor = ((XElementCase)creator).getExtraTableEditor();
+        CRPropertyDescriptor[] extraTableEditor = ((XElementCase) creator).getExtraTableEditor();
         extraPropertyGroupPane = new PropertyGroupPane(extraTableEditor, creator);
         centerPane.add(panel, BorderLayout.NORTH);
         centerPane.add(extraPropertyGroupPane, BorderLayout.CENTER);
@@ -49,12 +49,10 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
 
     protected ElementCaseEditor updateSubBean() {
         ElementCaseEditor elementCaseEditor = (ElementCaseEditor) creator.toData();
-        if(ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Layout-Padding"))){
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Layout-Padding"))) {
             paddingBoundPane.update(elementCaseEditor);
         }
-        if(ComparatorUtils.equals(getGlobalName(), Inter.getLocText("Form-EC_toolbar"))){
-            elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
-        }
+        elementCaseEditor.setToolBars((FormToolBarManager[]) elementCaseToolBarEditor.getValue());
 
         return elementCaseEditor;
     }