Changeset 4722 for trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

Timestamp:

11/06/10 01:56:04 (13 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -160 +160 @@
 
     #region Construction & Initialization
+    [StorableConstructor]
+    protected ProgrammableOperator(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
+    }
+
+    protected ProgrammableOperator(ProgrammableOperator original, Cloner cloner)
+      : base(original, cloner) {
+      code = original.Code;
+      executeMethod = original.executeMethod;
+      Assemblies = original.Assemblies.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+      namespaces = original.namespaces;
+      CompilationUnitCode = original.CompilationUnitCode;
+      CompileErrors = original.CompileErrors;
+      RegisterEvents();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ProgrammableOperator(this, cloner);
+    }
 
     public ProgrammableOperator() {
@@ -171 +191 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
+
     private void RegisterEvents() {
       Parameters.ItemsAdded += Parameters_Changed;
@@ -185 +205 @@
     protected void OnSignatureChanged() {
       EventHandler handler = SignatureChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
@@ -426 +445 @@
     public event EventHandler CodeChanged;
     protected virtual void OnCodeChanged() {
-      if (CodeChanged != null)
-        CodeChanged(this, new EventArgs());
+      EventHandler handler = CodeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
 
     #endregion
-
-    #region Cloning
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      ProgrammableOperator clone = (ProgrammableOperator)base.Clone(cloner);
-      clone.code = Code;
-      clone.executeMethod = executeMethod;
-      clone.Assemblies = Assemblies.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-      clone.namespaces = namespaces;
-      clone.CompilationUnitCode = CompilationUnitCode;
-      clone.CompileErrors = CompileErrors;
-      clone.RegisterEvents();
-      return clone;
-    }
-
-    #endregion
-
   }
 }