From a7ce8e87d007b9190f907109392f25a38ec125dd Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 3 Jan 2018 11:53:16 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6270=20=E5=8F=82=E6=95=B0=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E9=87=8C=E7=9A=84=E7=9B=B8=E5=85=B3bug=3D>=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/FormDesigner.java    |  5 +++--
 .../fr/design/mainframe/FormHierarchyTreePane.java   | 12 ++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
index 19425b18b2..4b2c664b40 100644
--- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java
+++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
@@ -46,7 +46,6 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.bridge.StableFactory;
 
 import javax.swing.*;
@@ -148,7 +147,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         new FormDesignerDropTarget(this);// 添加Drag and Drop.
 
         this.switchAction = switchAction;
-        populateParameterPropertyPane();
     }
 
     /**
@@ -1013,6 +1011,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     @Override
     public void valueChanged(TreeSelectionEvent e) {
+        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {  // 初始化完成前，不响应事件
+            return;
+        }
         ComponentTree tree = (ComponentTree) e.getSource();
         TreePath[] paths = tree.getSelectionPaths();
 
diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
index e908bb9f0d..c5a27044df 100644
--- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java
@@ -13,7 +13,6 @@ import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
-import com.fr.design.gui.style.BorderPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
@@ -110,18 +109,11 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 
 		add(getWidgetPane(), BorderLayout.CENTER);
 
-		try {
-			// 这里要刷新一下，否则控件树中没有任何一个控件处于选中状态
-			refreshComponentTree();
-		} catch (Throwable th) {
-			// do nothing
-		}
+		// 这里要刷新一下，否则控件树中没有任何一个控件处于选中状态
+		refreshComponentTree();
 	}
 
 	private void refreshComponentTree() {
-		if (DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {  // 还在初始化状态
-			return;
-		}
 		componentTree.setAndScrollSelectionPath(componentTree.getSelectedTreePath());
 		componentTree.refreshUI();
 	}