Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/Constraints/Constraint.cs

Timestamp:

10/29/10 17:38:42 (14 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.Common, HeuristicLab.Collections and HeuristicLab.Core (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Core/3.3/Constraints/Constraint.cs (modified) (6 diffs)

branches/CloningRefactoring/HeuristicLab.Core/3.3/Constraints/Constraint.cs

@@ -31 +31 @@
     [StorableConstructor]
     protected Constraint(bool deserializing) : base(deserializing) { }
+    protected Constraint(Constraint original, Cloner cloner)
+      : base(original, cloner) {
+      constrainedValue = null;  //mkommend: intentionally set to null;
 
+      IItem constraintDataItem = original.constraintData as IItem;
+      ICloneable constraintDataCloneable = original.constraintData as ICloneable;
+      if (constraintDataItem != null)
+        constraintData = cloner.Clone(constraintDataItem);
+      else if (constraintDataCloneable != null)
+        constraintData = constraintDataCloneable.Clone();
+      else
+        constraintData = original.constraintData;
+
+      constraintOperation = original.constraintOperation;
+    }
     protected Constraint() {
       this.Active = false;
@@ -138 +152 @@
     protected virtual void OnActiveChanged() {
       EventHandler handler = ActiveChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -145 +158 @@
     protected virtual void OnConstrainedValueChanged() {
       EventHandler handler = ConstrainedValueChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -152 +164 @@
     protected virtual void OnConstraintDataChanged() {
       EventHandler handler = ConstraintDataChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -159 +170 @@
     protected virtual void OnConstraintOperationChanged() {
       EventHandler handler = ConstraintOperationChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
     #endregion
@@ -182 +192 @@
       return s;
     }
-
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      Constraint clone = (Constraint)base.Clone(cloner);
-      clone.constrainedValue = null;  //mkommend: intentionally set to null;
-
-      IItem constraintDataItem = this.constraintData as IItem;
-      ICloneable constraintDataCloneable = this.constraintData as ICloneable;
-      if (constraintDataItem != null)
-        clone.constraintData = cloner.Clone(constraintDataItem);
-      else if (constraintDataCloneable != null)
-        clone.constraintData = constraintDataCloneable.Clone();
-      else
-        clone.constraintData = constraintData;
-
-      clone.constraintOperation = this.constraintOperation;
-
-      return clone;
-    }
     #endregion
   }