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

Timestamp:

01/04/12 16:45:02 (12 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/CheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/CheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ItemArray.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ItemCollection.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ItemDictionary.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ItemList.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ItemSet.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperationCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/OperatorSet.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ParameterCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ScopeList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/VariableCollection.cs (modified) (1 diff)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/CheckedItemList.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ConstraintCollection.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.

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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemCollection.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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemDictionary.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemList.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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ItemSet.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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/NamedItemCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/OperationCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/OperatorCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/OperatorList.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/OperatorSet.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ParameterCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.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.
@@ -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()); }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ScopeList.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.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.

branches/HeuristicLab.Hive.Azure/HeuristicLab.Core/3.3/Collections/VariableCollection.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.