Changeset 10647

Timestamp:

03/22/14 12:53:28 (11 years ago)

Author:

gkronber

Message:

#1972: merged r10497 from trunk to stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (3 diffs, 1 prop)

stable/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -112 +112 @@
         typesTreeView.Nodes.Clear();
         treeNodes.Clear();
+
         imageList.Images.Clear();
         imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Class);      // default icon
@@ -117 +118 @@
         imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Interface);  // interfaces
         imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Template);   // generic types
+        // additional dictionary for image indexes as imageList.ContainsKey and imageList.IndexOfKey are very slow!
+        var imageNames = new Dictionary<string, int>();
 
         var plugins = from p in ApplicationManager.Manager.Plugins
@@ -141 +144 @@
               if (type.IsInterface) typeNode.ImageIndex = 2;
               else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
-              else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+              else if (imageNames.ContainsKey(type.FullName)) typeNode.ImageIndex = imageNames[type.FullName];
               else {
                 var image = ItemAttribute.GetImage(type);
                 if (image != null) {
-                  imageList.Images.Add(type.FullName, image);
-                  typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+                  imageList.Images.Add(image);
+                  typeNode.ImageIndex = imageList.Images.Count - 1;
+                  imageNames.Add(type.FullName, imageList.Images.Count - 1);
                 }
               }