Changeset 3822 for trunk/sources/HeuristicLab.Core

Timestamp:

05/17/10 02:38:32 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#863)

• adapted item names of generic items to reflect the type of their generic parameters

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• Attributes/ItemAttribute.cs (modified) (1 diff)
• Collections/CheckedItemCollection.cs (modified) (1 diff)
• Collections/CheckedItemList.cs (modified) (1 diff)
• Collections/ItemArray.cs (modified) (1 diff)
• Collections/ItemCollection.cs (modified) (1 diff)
• Collections/ItemDictionary.cs (modified) (1 diff)
• Collections/ItemList.cs (modified) (1 diff)
• Collections/ItemSet.cs (modified) (1 diff)
• Collections/KeyedItemCollection.cs (modified) (1 diff)
• Collections/NamedItemCollection.cs (modified) (1 diff)
• Collections/ReadOnlyCheckedItemCollection.cs (modified) (1 diff)
• Collections/ReadOnlyCheckedItemList.cs (modified) (1 diff)
• Collections/ReadOnlyItemArray.cs (modified) (1 diff)
• Collections/ReadOnlyItemCollection.cs (modified) (1 diff)
• Collections/ReadOnlyItemDictionary.cs (modified) (1 diff)
• Collections/ReadOnlyItemList.cs (modified) (1 diff)
• Collections/ReadOnlyItemSet.cs (modified) (1 diff)
• Collections/ReadOnlyKeyedItemCollection.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs

@@ -50 +50 @@
     public static string GetName(Type type) {
       object[] attribs = type.GetCustomAttributes(typeof(ItemAttribute), false);
-      if (attribs.Length > 0) return ((ItemAttribute)attribs[0]).Name;
-      else return type.GetPrettyName();
+      if (attribs.Length > 0) {
+        string name = ((ItemAttribute)attribs[0]).Name;
+        if (type.IsGenericType) {
+          name += "<";
+          Type[] typeParams = type.GetGenericArguments();
+          if (typeParams.Length > 0) {
+            name += GetName(typeParams[0]);
+            for (int i = 1; i < typeParams.Length; i++)
+              name += ", " + GetName(typeParams[i]);
+          }
+          name += ">";
+        }
+        return name;
+      } else {
+        return type.GetPrettyName();
+      }
     }
     public static string GetDescription(Type type) {

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

@@ -35 +35 @@
   /// <typeparam name="T">The element type (base type IItem)</typeparam>
   [StorableClass]
-  [Item("CheckedItemCollection<T>", "Represents a collection of items that can be checked or unchecked.")]
+  [Item("CheckedItemCollection", "Represents a collection of items that can be checked or unchecked.")]
   public class CheckedItemCollection<T> : ItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
     [Storable]

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

@@ -38 +38 @@
   /// <typeparam name="T">The element type (base type is IItem)</typeparam>
   [StorableClass]
-  [Item("CheckedItemList<T>", "Represents a list of items that can be checked or unchecked.")]
+  [Item("CheckedItemList", "Represents a list of items that can be checked or unchecked.")]
   public class CheckedItemList<T> : ItemList<T>, ICheckedItemList<T> where T : class, IItem {
     [Storable]

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

@@ -34 +34 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ItemArray<T>", "Represents an array of items.")]
+  [Item("ItemArray", "Represents an array of items.")]
   public class ItemArray<T> : ObservableArray<T>, IItemArray<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ItemCollection<T>", "Represents a collection of items.")]
+  [Item("ItemCollection", "Represents a collection of items.")]
   public class ItemCollection<T> : ObservableCollection<T>, IItemCollection<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ItemDictionary<TKey, TValue>", "Represents a dictionary of items.")]
+  [Item("ItemDictionary", "Represents a dictionary of items.")]
   public class ItemDictionary<TKey, TValue> : ObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue> where TKey : class, IItem where TValue : class, IItem {
     private string filename;

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

@@ -34 +34 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ItemList<T>", "Represents a list of items.")]
+  [Item("ItemList", "Represents a list of items.")]
   public class ItemList<T> : ObservableList<T>, IItemList<T> where T : class, IItem {
     private string filename;

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

@@ -34 +34 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ItemSet<T>", "Represents a set of items.")]
+  [Item("ItemSet", "Represents a set of items.")]
   public class ItemSet<T> : ObservableSet<T>, IItemSet<T> where T : class, IItem {
     private string filename;

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [Item("KeyedItemCollection<TKey, TItem>", "Represents a keyed collection of items.")]
+  [Item("KeyedItemCollection", "Represents a keyed collection of items.")]
   [StorableClass]
   public abstract class KeyedItemCollection<TKey, TItem> : ObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Core {
-  [Item("NamedItemCollection<T>", "Represents a collection of named items.")]
+  [Item("NamedItemCollection", "Represents a collection of named items.")]
   [StorableClass]
   public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyCheckedItemCollection<T>", "Represents a read-only collection of checked items.")]
+  [Item("ReadOnlyCheckedItemCollection", "Represents a read-only collection of checked items.")]
   public class ReadOnlyCheckedItemCollection<T> : ReadOnlyItemCollection<T>, ICheckedItemCollection<T> where T : class, IItem {
     private CheckedItemCollection<T> CheckedItemCollection {

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyCheckedItemList<T>", "Represents a read-only list of checked items.")]
+  [Item("ReadOnlyCheckedItemList", "Represents a read-only list of checked items.")]
   public class ReadOnlyCheckedItemList<T> : ReadOnlyItemList<T>, ICheckedItemList<T> where T : class, IItem {
     private CheckedItemList<T> CheckedItemList {

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyItemArray<T>", "Represents a read-only array of items.")]
+  [Item("ReadOnlyItemArray", "Represents a read-only array of items.")]
   public class ReadOnlyItemArray<T> : ReadOnlyObservableArray<T>, IItemArray<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyItemCollection<T>", "Represents a read-only collection of items.")]
+  [Item("ReadOnlyItemCollection", "Represents a read-only collection of items.")]
   public class ReadOnlyItemCollection<T> : ReadOnlyObservableCollection<T>, IItemCollection<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyItemDictionary<TKey, TValue>", "Represents a read-only dictionary of items.")]
+  [Item("ReadOnlyItemDictionary", "Represents a read-only dictionary of items.")]
   public class ReadOnlyItemDictionary<TKey, TValue> : ReadOnlyObservableDictionary<TKey, TValue>, IItemDictionary<TKey, TValue> where TKey : class, IItem where TValue : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyItemList<T>", "Represents a read-only list of items.")]
+  [Item("ReadOnlyItemList", "Represents a read-only list of items.")]
   public class ReadOnlyItemList<T> : ReadOnlyObservableList<T>, IItemList<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyItemSet<T>", "Represents a read-only set of items.")]
+  [Item("ReadOnlyItemSet", "Represents a read-only set of items.")]
   public class ReadOnlyItemSet<T> : ReadOnlyObservableSet<T>, IItemSet<T> where T : class, IItem {
     private string filename;

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

@@ -31 +31 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  [Item("ReadOnlyKeyedItemCollection<TKey, TItem>", "Represents a read-only keyed collection of items.")]
+  [Item("ReadOnlyKeyedItemCollection", "Represents a read-only keyed collection of items.")]
   public class ReadOnlyKeyedItemCollection<TKey, TItem> : ReadOnlyObservableKeyedCollection<TKey, TItem>, IKeyedItemCollection<TKey, TItem> where TItem : class, IItem {
     private string filename;