Changeset 2931 for trunk/sources/HeuristicLab.Core/3.3/NamedItem.cs

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

File:

• trunk/sources/HeuristicLab.Core/3.3/NamedItem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core/3.3/NamedItem.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -38 +35 @@
       get { return name; }
       set {
-        if (!CanChangeName) throw new NotSupportedException("Name of NamedItem cannot be changed.");
-        if (value == null) throw new ArgumentNullException();
-        if (!name.Equals(value)) {
-          CancelEventArgs<string> e = new CancelEventArgs<string>(value);
+        if (!CanChangeName) throw new NotSupportedException("Name cannot be changed.");
+        if (!(name.Equals(value) || (value == null) && (name == string.Empty))) {
+          CancelEventArgs<string> e = value == null ? new CancelEventArgs<string>(string.Empty) : new CancelEventArgs<string>(value);
           OnNameChanging(e);
           if (!e.Cancel) {
-            name = value;
+            name = value == null ? string.Empty : value;
             OnNameChanged();
           }
@@ -58 +54 @@
       get { return description; }
       set {
-        if (!CanChangeDescription) throw new NotSupportedException("Description of NamedItem cannot be changed.");
-        if ((description == null) || (!description.Equals(value))) {
-          description = value;
+        if (!CanChangeDescription) throw new NotSupportedException("Description cannot be changed.");
+        if (!(description.Equals(value) || (value == null) && (description == string.Empty))) {
+          description = value == null ? string.Empty : value;
           OnDescriptionChanged();
         }
@@ -84 +80 @@
     /// <param name="value">The value of the current instance.</param>
     protected NamedItem(string name) {
-      if (name == null) throw new ArgumentNullException();
-      this.name = name;
+      if (name == null) this.name = string.Empty;
+      else this.name = name;
       description = string.Empty;
     }
     protected NamedItem(string name, string description) {
-      if (name == null) throw new ArgumentNullException();
-      this.name = name;
-      this.description = description;
+      if (name == null) this.name = string.Empty;
+      else this.name = name;
+      if (description == null) this.description = string.Empty;
+      else this.description = description;
     }