Changeset 7201 for trunk/sources/HeuristicLab.Core/3.3/Collections

Timestamp:

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

Author:

swagner

Message:

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

Location:

trunk/sources/HeuristicLab.Core/3.3/Collections

Files:

• ItemArray.cs (modified) (2 diffs)
• ItemCollection.cs (modified) (2 diffs)
• ItemDictionary.cs (modified) (2 diffs)
• ItemList.cs (modified) (2 diffs)
• ItemSet.cs (modified) (2 diffs)
• KeyedItemCollection.cs (modified) (1 diff)
• ReadOnlyItemArray.cs (modified) (2 diffs)
• ReadOnlyItemCollection.cs (modified) (2 diffs)
• ReadOnlyItemDictionary.cs (modified) (2 diffs)
• ReadOnlyItemList.cs (modified) (2 diffs)
• ReadOnlyItemSet.cs (modified) (2 diffs)
• ReadOnlyKeyedItemCollection.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core/3.3/Collections/ItemArray.cs

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -42 +41 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ItemCollection.cs

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -42 +41 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs

@@ -25 +25 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -44 +43 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ItemList.cs

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -42 +41 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ItemSet.cs

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -42 +41 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs

@@ -40 +40 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +39 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +39 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -43 +42 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +39 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +39 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }
 

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs

@@ -24 +24 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +39 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
     public virtual Image ItemImage {
-      get { return VSImageLibrary.Class; }
+      get { return ItemAttribute.GetImage(this.GetType()); }
     }