Changeset 12678 for branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

Timestamp:

07/08/15 13:00:48 (9 years ago)

Author:

abeham

Message:

#2366: merged trunk changes

Location:

branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer

Files:

• . (modified) (1 prop)
• 3.3/NewItemDialog.cs (modified) (9 diffs)

branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -27 +27 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
@@ -93 +94 @@
 
     private TreeNode CreateCategoryTree(IEnumerable<IGrouping<string, Type>> categories) {
-      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Class);      // default icon
-      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Namespace);  // plugins
+      imageList.Images.Add(VSImageLibrary.Class);      // default icon
+      imageList.Images.Add(VSImageLibrary.Namespace);  // plugins
 
       var rootNode = new TreeNode();
@@ -109 +110 @@
 
         // Skip categories with same full name because the raw name can still be different (missing order)
-        if (rootNode.Nodes.Find(fullName, searchAllChildren: true).Length > 0)
+        if (rootNode.Nodes.Find(fullName, true).Length > 0)
           continue;
 
-        var categoryNode = new TreeNode(name, imageIndex: 1, selectedImageIndex: 1) {
+        var categoryNode = new TreeNode(name, 1, 1) {
           Name = fullName,
           Tag = rawName
@@ -133 +134 @@
         rawName = rawName == null ? rawParentName : rawName + CreatableAttribute.Categories.SplitToken + rawParentName;
         var fullName = CreatableAttribute.Categories.GetFullName(rawName);
-        parentNode = node.Nodes.Find(fullName, searchAllChildren: false).SingleOrDefault();
+        parentNode = node.Nodes.Find(fullName, false).SingleOrDefault();
         if (parentNode == null) {
           var name = CreatableAttribute.Categories.GetName(rawName);
-          parentNode = new TreeNode(name, imageIndex: 1, selectedImageIndex: 1) {
+          parentNode = new TreeNode(name, 1, 1) {
             Name = fullName,
             Tag = rawName
@@ -149 +150 @@
       foreach (var category in categories) {
         var fullName = CreatableAttribute.Categories.GetFullName(category.Key);
-        var categoryNode = node.Nodes.Find(fullName, searchAllChildren: true).Single();
+        var categoryNode = node.Nodes.Find(fullName, true).Single();
         foreach (var creatable in category) {
           var itemNode = CreateItemNode(creatable);
@@ -323 +324 @@
     private void RestoreSelectedNode(TreeNode selectedNode) {
       if (selectedNode != null) {
-        var node = typesTreeView.Nodes.Find(selectedNode.Name, searchAllChildren: true).SingleOrDefault();
+        var node = typesTreeView.Nodes.Find(selectedNode.Name, true).SingleOrDefault();
         if (node != null)
           typesTreeView.SelectedNode = node;
@@ -360 +361 @@
     }
 
-    private TreeNode toolStripMenuNode = null;
+    private TreeNode toolStripMenuNode;
     private void typesTreeView_MouseDown(object sender, MouseEventArgs e) {
       if (e.Button == MouseButtons.Right) {
@@ -440 +441 @@
       }
     }
-    private TreeNode LastVisibleNode {
-      get {
-        var node = FirstVisibleNode;
-        while (node != null && node.NextVisibleNode != null) node = node.NextVisibleNode;
-        return node;
-      }
-    }
 
     private class ItemTreeNodeComparer : IComparer {
@@ -456 +450 @@
         if (lhs.Tag is string && rhs.Tag is string) {
           return Comparer.Compare((string)lhs.Tag, (string)rhs.Tag);
-        } else if (lhs.Tag is string) {
+        }
+        if (lhs.Tag is string) {
           return -1;
-        } else
-          return 1;
+        }
+        return 1;
       }
     }