Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemArray.cs

Timestamp:

01/04/12 16:45:02 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Collections/ItemArray.cs (modified) (3 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemArray.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -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()); }
     }