Changeset 4722 for trunk/sources/HeuristicLab.Data/3.3/StringMatrix.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.Data/3.3/StringMatrix.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Data/3.3/StringMatrix.cs

@@ -134 +134 @@
     }
 
+    [StorableConstructor]
+    protected StringMatrix(bool deserializing) : base(deserializing) { }
+    protected StringMatrix(StringMatrix original, Cloner cloner)
+      : base(original, cloner) {
+      this.matrix = (string[,])original.matrix.Clone();
+      this.columnNames = new List<string>(original.columnNames);
+      this.rowNames = new List<string>(original.rowNames);
+      this.sortableView = original.sortableView;
+      this.readOnly = original.readOnly;
+    }
     public StringMatrix() {
       matrix = new string[0, 0];
@@ -182 +192 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      StringMatrix clone = new StringMatrix();
-      cloner.RegisterClonedObject(this, clone);
-      clone.matrix = (string[,])matrix.Clone();
-      clone.columnNames = new List<string>(columnNames);
-      clone.rowNames = new List<string>(rowNames);
-      clone.sortableView = sortableView;
-      clone.readOnly = readOnly;
-      return clone;
+      return new StringMatrix(this, cloner);
     }