Changeset 2931 for trunk/sources/HeuristicLab.Core/3.3/Attributes

Timestamp:

03/05/10 01:03:30 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on ItemAttribute and named items
• corrected version information in Optimizer

Location:

trunk/sources/HeuristicLab.Core/3.3/Attributes

Files:

• CreatableAttribute.cs (modified) (1 diff)
• ItemAttribute.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace HeuristicLab.Core {

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Resources;
-using System.Drawing;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
   [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
   public sealed class ItemAttribute : Attribute {
-    public string Name { get; set; }
-    public string Description { get; set; }
+    private string name;
+    public string Name {
+      get { return name; }
+      set { name = value == null ? string.Empty : value; }
+    }
+    private string description;
+    public string Description {
+      get { return description; }
+      set { description = value == null ? string.Empty : value; }
+    }
 
     public ItemAttribute() {
-      Name = null;
-      Description = null;
+      Name = string.Empty;
+      Description = string.Empty;
     }
     public ItemAttribute(string name, string description) {
@@ -42 +47 @@
 
     public static string GetName(Type type) {
-      object[] attribs = type.GetCustomAttributes(typeof(ItemAttribute), true);
+      object[] attribs = type.GetCustomAttributes(typeof(ItemAttribute), false);
       if (attribs.Length > 0) return ((ItemAttribute)attribs[0]).Name;
-      else return null;
+      else return type.GetPrettyName();
     }
     public static string GetDescription(Type type) {
-      object[] attribs = type.GetCustomAttributes(typeof(ItemAttribute), true);
+      object[] attribs = type.GetCustomAttributes(typeof(ItemAttribute), false);
       if (attribs.Length > 0) return ((ItemAttribute)attribs[0]).Description;
-      else return null;
+      else return string.Empty;
     }
   }