Changeset 12284 for branches

Timestamp:

04/02/15 18:02:18 (10 years ago)

Author:

mkommend

Message:

#2025: Minor code improvements in new item dialog.

File:

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

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

@@ -33 +33 @@
     private bool isInitialized;
 
-    private List<TreeNode> treeNodes;
+    private readonly List<TreeNode> treeNodes;
     private string currentSearchString;
 
@@ -100 +100 @@
         var parents = tokens.Take(tokens.Length - 1);
 
-        var categoryNode = new TreeNode(name, 1, 1) {
+        var categoryNode = new TreeNode(name, imageIndex: 1, selectedImageIndex: 1) {
           Name = fullName,
           Tag = fullName
@@ -121 +121 @@
         parentNode = node.Nodes.Find(fullName, searchAllChildren: false).SingleOrDefault();
         if (parentNode == null) {
-          parentNode = new TreeNode(parentCategory, 1, 1) {
+          parentNode = new TreeNode(parentCategory, imageIndex: 1, selectedImageIndex: 1) {
             Name = fullName,
             Tag = fullName
@@ -229 +229 @@
         }
         return node.Nodes.Count == 0;
-      }
-      if (node.Tag is Type) { // Type node
+      } if (node.Tag is Type) { // Type node
         var text = node.Text;
         if (searchTokens.Any(searchToken => !text.ToLower().Contains(searchToken))) {
           var typeTag = (Type)node.Tag;
-          if (typeTag.Equals(SelectedType)) {
+          if (typeTag == SelectedType) {
             SelectedType = null;
             typesTreeView.SelectedNode = null;
@@ -242 +241 @@
         return false;
       }
-      return true;
+      throw new InvalidOperationException("Encountered neither a category nor a creatable node during tree traversal.");
     }