Changeset 4722 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

@@ -30 +30 @@
   [StorableClass]
   public class GraphVisualizationInfo : DeepCloneable, IGraphVisualizationInfo {
-    public GraphVisualizationInfo() {
+    [StorableConstructor]
+    protected GraphVisualizationInfo(bool deserializing) : base() { }
+    protected GraphVisualizationInfo(GraphVisualizationInfo original, Cloner cloner)
+      : base(original, cloner) {
+      shapeInfos = new ObservableSet<IShapeInfo>(original.shapeInfos.Select(x => cloner.Clone(x)));
+      connectionInfos = new ObservableSet<IConnectionInfo>(original.connectionInfos.Select(x => cloner.Clone(x)));
+      initialShape = cloner.Clone(original.initialShape);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GraphVisualizationInfo(this, cloner);
+    }
+    public GraphVisualizationInfo()
+      : base() {
       this.shapeInfos = new ObservableSet<IShapeInfo>();
       this.connectionInfos = new ObservableSet<IConnectionInfo>();
@@ -96 +108 @@
     }
     #endregion
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      GraphVisualizationInfo clone = (GraphVisualizationInfo)base.Clone(cloner);
-      clone.shapeInfos = new ObservableSet<IShapeInfo>(this.shapeInfos.Select(x => (IShapeInfo)cloner.Clone(x)));
-      clone.connectionInfos = new ObservableSet<IConnectionInfo>(this.connectionInfos.Select(x => (IConnectionInfo)cloner.Clone(x)));
-      if (this.initialShape != null)
-        clone.initialShape = (IShapeInfo)this.initialShape.Clone(cloner);
-      return clone;
-    }
   }
 }