Changeset 12217

Timestamp:

03/17/15 16:33:01 (10 years ago)

Author:

pfleck

Message:

#2025 Adapted search and node restoration to hierarchy structure.

File:

• branches/NewItemDialog/HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (8 diffs)

branches/NewItemDialog/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -31 +31 @@
 namespace HeuristicLab.Optimizer {
   internal partial class NewItemDialog : Form {
-    private const string RootMarker = "<ROOT>";
-
     private bool isInitialized;
 
@@ -93 +91 @@
       imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Namespace);  // plugins
 
-      var rootNode = new TreeNode(RootMarker) { Name = RootMarker, Tag = RootMarker };
+      var rootNode = new TreeNode();
 
       foreach (var category in categories) {
-        var categoryFullName = category.Key;
-        var categoryTokens = categoryFullName.Split('#');
-        var categoryName = categoryTokens.Last();
-        var parentCategories = categoryTokens.Take(categoryTokens.Length - 1);
-
-        var categoryNode = new TreeNode(categoryName, 1, 1) {
-          Name = categoryName,
-          Tag = categoryName
+        var fullName = category.Key;
+        var tokens = fullName.Split('#');
+        var name = tokens.Last();
+        var parents = tokens.Take(tokens.Length - 1);
+
+        var categoryNode = new TreeNode(name, 1, 1) {
+          Name = fullName,
+          Tag = fullName
         };
 
-        var parentNode = FindOrCreateParentNode(rootNode, parentCategories);
+        var parentNode = FindOrCreateParentNode(rootNode, parents);
         if (parentNode != null)
           parentNode.Nodes.Add(categoryNode);
@@ -117 +115 @@
     private TreeNode FindOrCreateParentNode(TreeNode node, IEnumerable<string> parentCategories) {
       TreeNode parentNode = null;
+      string fullName = null;
       foreach (string parentCategory in parentCategories) {
-        parentNode = node.Nodes.Find(parentCategory, searchAllChildren: false).SingleOrDefault();
+        fullName = fullName == null ? parentCategory : fullName + "#" + parentCategory;
+        parentNode = node.Nodes.Find(fullName, searchAllChildren: false).SingleOrDefault();
         if (parentNode == null) {
           parentNode = new TreeNode(parentCategory, 1, 1) {
-            Name = parentCategory,
-            Tag = parentCategory
+            Name = fullName,
+            Tag = fullName
           };
           node.Nodes.Add(parentNode);
@@ -133 +133 @@
     private void CreateItemNodes(TreeNode node, IEnumerable<IGrouping<string, Type>> categories) {
       foreach (var category in categories) {
-        var categoryNode = FindCategoryNode(node, category.Key);
+        var categoryNode = node.Nodes.Find(category.Key, searchAllChildren: true).Single();
         foreach (var creatable in category) {
           var itemNode = CreateItemNode(creatable);
+          itemNode.Name = itemNode.Name + ":" + category.Key;
           categoryNode.Nodes.Add(itemNode);
         }
       }
-    }
-    private TreeNode FindCategoryNode(TreeNode node, string fullCategoryName) {
-      var categories = fullCategoryName.Split('#');
-      foreach (string category in categories)
-        node = node.Nodes.Find(category, searchAllChildren: false).Single();
-      return node;
     }
 
@@ -152 +147 @@
       var itemNode = new TreeNode(name) {
         ImageIndex = 0,
-        Tag = creatable
+        Tag = creatable,
+        Name = name
       };
 
@@ -189 +185 @@
         // remove nodes
         typesTreeView.BeginUpdate();
+        var searchTokens = searchString.Split(' ');
+
         int i = 0;
-        var searchTokens = searchString.Split(' ');
         while (i < typesTreeView.Nodes.Count) {
-          int j = 0;
-          while (j < typesTreeView.Nodes[i].Nodes.Count) {
-            if (searchTokens.Any(searchToken => !typesTreeView.Nodes[i].Nodes[j].Text.ToLower().Contains(searchToken))) {
-              var node = typesTreeView.Nodes[i].Nodes[j];
-              if (node != null && node.Tag is Type && (node.Tag as Type).Equals(SelectedType))
-                SelectedType = null;
-              typesTreeView.Nodes[i].Nodes[j].Remove();
-            } else
-              j++;
-          }
-          if (typesTreeView.Nodes[i].Nodes.Count == 0)
-            typesTreeView.Nodes[i].Remove();
-          else
-            i++;
+          var categoryNode = typesTreeView.Nodes[i];
+          bool remove = FilterNode(categoryNode, searchTokens);
+          if (remove)
+            typesTreeView.Nodes.RemoveAt(i);
+          else i++;
         }
         typesTreeView.EndUpdate();
@@ -225 +213 @@
         }
         UpdateDescription();
+      }
+    }
+
+    private bool FilterNode(TreeNode node, string[] searchTokens) {
+      if (node.Tag is string) {
+        int i = 0;
+        while (i < node.Nodes.Count) {
+          bool remove = FilterNode(node.Nodes[i], searchTokens);
+          if (remove)
+            node.Nodes.RemoveAt(i);
+          else i++;
+        }
+        return node.Nodes.Count == 0;
+      } else if (node.Tag is Type) {
+        var text = node.Text;
+        if (searchTokens.Any(searchToken => !text.ToLower().Contains(searchToken))) {
+          var typeTag = (Type)node.Tag;
+          if (typeTag.Equals(SelectedType))
+            SelectedType = null;
+          return true;
+        }
+        return false;
+      } else {
+        return true;
       }
     }
@@ -284 +296 @@
     private void RestoreSelectedNode(TreeNode selectedNode) {
       if (selectedNode != null) {
-        foreach (TreeNode node in typesTreeView.Nodes) {
-          if (node.Text.Equals(selectedNode.Text)) typesTreeView.SelectedNode = node;
-          foreach (TreeNode child in node.Nodes) {
-            if ((child.Text.Equals(selectedNode.Text)) && (child.Tag == selectedNode.Tag))
-              typesTreeView.SelectedNode = child;
-          }
-        }
+        var node = typesTreeView.Nodes.Find(selectedNode.Name, searchAllChildren: true).SingleOrDefault();
+        typesTreeView.SelectedNode = node;
         if (typesTreeView.SelectedNode == null) SelectedType = null;
       }