From e221f1de4c31b99d560505a4042b707d61953e14 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Mon, 14 Nov 2016 11:51:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9E=81=E9=80=9F=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A0=91=E6=9E=84=E5=BB=BA=E4=B8=AD=EF=BC=8C=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/frpane/TreeSettingPane.java   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
index 65df6f0625..70b0d2a402 100644
--- a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
@@ -18,6 +18,7 @@ import com.fr.form.ui.TreeEditor;
 import com.fr.form.ui.tree.LayerConfig;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
+import edu.emory.mathcs.backport.java.util.Arrays;
 
 import javax.swing.*;
 import java.awt.*;
@@ -133,7 +134,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 			for (LayerConfig layerConfig : layerConfigList) {
 				layerConfigs[i++] = layerConfig;
 			}
-			this.layerDataControlPane.populate(new NameObject("tree", layerConfigs));
+			this.layerDataControlPane.populate(new NameObject("Tree Layer Data", layerConfigs));
 		} else {
 			buildBox.setSelectedIndex(2);
 		}
@@ -154,10 +155,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			te.setAutoBuild(true);
+			te.setLayerBuild(false);
 			te.setDictionary(dictionary);
 			te.setNodeOrDict(dictionary);
 		} else if (buildBox.getSelectedIndex() == 2) {
 			te.setAutoBuild(false);
+			te.setLayerBuild(false);
 			NameObject no = this.controlPane.update();
 			if (no != null) {
 				TreeEditor editor = (TreeEditor) no.getObject();
@@ -174,6 +177,11 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 				te.setNodeOrDict(editor.getTreeNodeAttr());
 				te.setPerformanceFirst(editor.isPerformanceFirst());
 			}
+		} else {
+			LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
+			te.setAutoBuild(false);
+			te.setLayerBuild(true);
+			te.setLayerConfigs(Arrays.asList(configs));
 		}
 		return te;
 	}
@@ -230,7 +238,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 				tcb.setNodeOrDict(editor.getTreeNodeAttr());
 				tcb.setPerformanceFirst(editor.isPerformanceFirst());
 			}
-		}
+		}else {
+            LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
+            tcb.setAutoBuild(false);
+            tcb.setLayerBuild(true);
+            tcb.setLayerConfigs(Arrays.asList(configs));
+        }
 		return tcb;
 	}
 

From 53726119e4913ff3d829dfa0b39f0d66d5d3b4ea Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Mon, 14 Nov 2016 11:56:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9E=81=E9=80=9F=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A0=91=E6=9E=84=E5=BB=BA=E4=B8=AD=EF=BC=8C=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/frpane/TreeSettingPane.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
index 70b0d2a402..21e0caf3f9 100644
--- a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
@@ -214,15 +214,17 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			tcb.setAutoBuild(true);
-			tcb.setDictionary(dictionary);
-			tcb.setNodeOrDict(dictionary);
-		} else if (buildBox.getSelectedIndex() == 2) {
-			tcb.setAutoBuild(false);
-			NameObject no = this.controlPane.update();
-			if (no != null) {
-				if (no.getObject() instanceof TreeComboBoxEditor) {
-					return (TreeComboBoxEditor) no.getObject();
-				}
+            tcb.setLayerBuild(false);
+            tcb.setDictionary(dictionary);
+            tcb.setNodeOrDict(dictionary);
+        } else if (buildBox.getSelectedIndex() == 2) {
+            tcb.setAutoBuild(false);
+            tcb.setLayerBuild(false);
+            NameObject no = this.controlPane.update();
+            if (no != null) {
+                if (no.getObject() instanceof TreeComboBoxEditor) {
+                    return (TreeComboBoxEditor) no.getObject();
+                }
 
 				TreeEditor editor = (TreeEditor) no.getObject();
 				tcb.setAllowBlank(editor.isAllowBlank());

From 397ac90901939cd352f3bde240e47ac166b0b4a3 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Mon, 14 Nov 2016 16:23:26 +0800
Subject: [PATCH 3/3] New changelist

---
 designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
index 21e0caf3f9..a8a72fc1e3 100644
--- a/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
+++ b/designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
@@ -18,12 +18,12 @@ import com.fr.form.ui.TreeEditor;
 import com.fr.form.ui.tree.LayerConfig;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.Arrays;
 
 public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	private JTreeControlPane controlPane;