From add68778954f89a4d837e2dcbee83317d9cc7b0a Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Tue, 1 Sep 2020 09:23:20 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-36985=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BE=9D=E8=B5=96=EF=BC=8C=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/designer/creator/XCreator.java  | 10 +++++++---
 .../com/fr/design/mainframe/FormHierarchyTreePane.java |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
index 2eecf817c..20f278811 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
@@ -30,7 +30,12 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.third.javax.annotation.Nullable;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.border.Border;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -815,8 +820,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		return new BasicTopXCreator(this) {
 			@Override
 			protected void addComponent() {
-				BufferedImage image = getImage();
-				Icon icon = new ImageIcon(image);
+				Icon icon = new ImageIcon(getImage());
 				JLabel jLabel = new JLabel(icon, JLabel.CENTER);
 				jLabel.setSize(getSize());
 				this.add(jLabel);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java
index 0695813eb..f94475a76 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -94,7 +94,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
     //TODO 太乱了，需要重写，监听器里加了监听器是什么意思，每次调用该方法都会添加一个新的监听器
     public void refreshDockingView() {
         FormDesigner formDesigner = this.getEditingFormDesigner();
-        List<TreePath>list=new ArrayList<>();
+        List<TreePath> list = new ArrayList<>();
         removeAll();
         if (this.componentTree != null) {
             componentTree.getExpandNodes(list);