Optimized DataTree node resolution

GetFullPath didn't get much benefit, but more performance is always
welcome.

Author: Neverbirth

External/Plugins/FlashDebugger/Controls/DataTreeControl.cs

@@ -159,7 +159,7 @@ void NameNodeTextBox_LabelChanged(object sender, LabelEventArgs e)
             if (box.Parent.CurrentNode == null) return;
             DataNode node = box.Parent.CurrentNode.Tag as DataNode;
 
-            if (e.NewLabel.Trim() == "")
+            if (e.NewLabel.Trim() == "" || e.NewLabel.Trim() == TextHelper.GetString("Label.AddExpression"))
             {
                 node.Text = e.OldLabel != "" ? e.OldLabel : TextHelper.GetString("Label.AddExpression");
                 return;
@@ -522,7 +522,7 @@ private void RestoreExpanded(Collection<Node> nodes)
             if (nodes == null) return;
             foreach (Node node in nodes)
             {
-                if (state.Expanded.Contains(_model.GetFullPath(node)))
+                if (!node.IsLeaf && state.Expanded.Contains(_model.GetFullPath(node)))
                 {
                     Tree.FindNode(_model.GetPath(node)).Expand();
                     RestoreExpanded(node.Nodes);

External/Plugins/FlashDebugger/Controls/DataTreeModel.cs

@@ -1,4 +1,5 @@
-using Aga.Controls.Tree;
+using System.Text;
+using Aga.Controls.Tree;
 
 namespace FlashDebugger.Controls
 {
@@ -9,39 +10,41 @@ public class DataTreeModel : TreeModel
         public string GetFullPath(Node node)
         {
             if (node == Root) return string.Empty;
-            else
+
+            var path = new StringBuilder();
+            while (node != Root && node != null)
             {
-                string path = string.Empty;
-                while (node != Root && node != null)
-                {
-                    path = string.Format("{0}.{1}", node.Text, path);
-                    node = node.Parent;
-                }
-                return path.TrimEnd(chTrims);
+                path.Insert(0, node.Text).Insert(node.Text.Length, ".");
+                node = node.Parent;
             }
+            if (path.Length > 0) path.Length--;
+
+            return path.ToString();
         }
 
         public Node FindNode(string path)
         {
-            if (path == string.Empty) return Root;
-            else return FindNode(Root, path);
+            if (string.IsNullOrEmpty(path)) return Root;
+            return FindNode(Root, path, new StringBuilder());
         }
 
-        private Node FindNode(Node root, string path)
+        private Node FindNode(Node root, string path, StringBuilder nodePath)
         {
+            int initialLength = nodePath.Length;
             foreach (Node node in root.Nodes)
             {
-                // TODO: We could optimize some more here, we don't need to get the full path
-                string nodePath = GetFullPath(node);
-                if (path == nodePath) return node;
-                if (path.StartsWith(nodePath))
+                nodePath = nodePath.Append(node.Text);
+                if (path == nodePath.ToString()) return node;
+                nodePath.Append(".");
+                if (path.StartsWith(nodePath.ToString()))
                 {
                     if (node.Nodes.Count > 0)
                     {
-                        Node tmp = FindNode(node, path);
+                        Node tmp = FindNode(node, path, nodePath);
                         if (tmp != null) return tmp;
                     }
                 }
+                else nodePath.Length = initialLength;
             }
             return null;
         }

External/Plugins/FlashDebugger/Controls/WatchUI.cs

@@ -83,6 +83,7 @@ public void UpdateElements()
         {
             treeControl.Tree.BeginUpdate();
             treeControl.SaveState();
+
             treeControl.Nodes.Clear();
             foreach (String item in watches)
             {