Changeset 2833

Timestamp:

02/19/10 03:03:41 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• added missing null checks in constructors of item collections and Variable
• set AllowDrop property to true in VariableView

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/VariableView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ItemArray.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ItemList.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/ItemSet.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/NamedItemCollection.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Variable.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.Designer.cs

@@ -108 +108 @@
       // valuePanel
       // 
+      this.valuePanel.AllowDrop = true;
       this.valuePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)

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

@@ -58 +58 @@
     public ItemArray(T[] array) : base(array) {
       foreach (T item in this)
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) item.Changed += new ChangedEventHandler(Item_Changed);
     }
     public ItemArray(IEnumerable<T> collection) : base(collection) {
       foreach (T item in this)
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) item.Changed += new ChangedEventHandler(Item_Changed);
     }
 

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

@@ -59 +59 @@
     public ItemCollection(IEnumerable<T> collection) : base(collection) {
       foreach (T item in this)
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) item.Changed += new ChangedEventHandler(Item_Changed);
     }
 

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

@@ -59 +59 @@
     public ItemList(IEnumerable<T> collection) : base(collection) {
       foreach (T item in this)
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) item.Changed += new ChangedEventHandler(Item_Changed);
     }
 

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

@@ -58 +58 @@
     public ItemSet(IEnumerable<T> collection) : base(collection) {
       foreach (T item in this)
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) item.Changed += new ChangedEventHandler(Item_Changed);
     }
 

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

@@ -105 +105 @@
     private void RegisterItemEvents(IEnumerable<T> items) {
       foreach (T item in items) {
-        item.NameChanging += new EventHandler<CancelEventArgs<string>>(Item_NameChanging);
-        item.NameChanged += new EventHandler(Item_NameChanged);
-        item.Changed += new ChangedEventHandler(Item_Changed);
+        if (item != null) {
+          item.NameChanging += new EventHandler<CancelEventArgs<string>>(Item_NameChanging);
+          item.NameChanged += new EventHandler(Item_NameChanged);
+          item.Changed += new ChangedEventHandler(Item_Changed);
+        }
       }
     }
     private void DeregisterItemEvents(IEnumerable<T> items) {
       foreach (T item in items) {
-        item.NameChanging -= new EventHandler<CancelEventArgs<string>>(Item_NameChanging);
-        item.NameChanged -= new EventHandler(Item_NameChanged);
-        item.Changed -= new ChangedEventHandler(Item_Changed);
+        if (item != null) {
+          item.NameChanging -= new EventHandler<CancelEventArgs<string>>(Item_NameChanging);
+          item.NameChanged -= new EventHandler(Item_NameChanged);
+          item.Changed -= new ChangedEventHandler(Item_Changed);
+        }
       }
     }

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

@@ -72 +72 @@
       : base(name) {
       this.value = value;
-      this.value.Changed += new ChangedEventHandler(Value_Changed);
+      if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
     }
     public Variable(string name, string description, IItem value)
       : base(name, description) {
       this.value = value;
-      this.value.Changed += new ChangedEventHandler(Value_Changed);
+      if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
     }