Changeset 7201 for trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

Timestamp:

12/19/11 03:17:35 (12 years ago)

Author:

swagner

Message:

Implemented static item image properties to avoid instance creation in TypeSelector and NewItemDialog (#1651)

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -142 +142 @@
               else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
               else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
-              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract && type.GetConstructor(Type.EmptyTypes) != null) {
-                IItem item = (IItem)Activator.CreateInstance(type);
-                imageList.Images.Add(type.FullName, item.ItemImage);
-                typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+              else {
+                var image = ItemAttribute.GetImage(type);
+                if (image != null) {
+                  imageList.Images.Add(type.FullName, image);
+                  typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+                }
               }
               typeNode.SelectedImageIndex = typeNode.ImageIndex;