Context Navigation

Collections

Timestamp:

11/03/10 01:32:32 (14 years ago)

Author:

mkommend

Message:

Corrected some cloning errors in the Core plugin (ticket #922).

Location:

Files:

r4668	r4711
31	31	protected ConstraintCollection(bool deserializing) : base(deserializing) { }
32	32	protected ConstraintCollection(ConstraintCollection original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new ConstraintCollection(this, cloner); }
33	34	public ConstraintCollection() : base() { }
34	35	public ConstraintCollection(int capacity) : base(capacity) { }

r4668	r4711
31	31	protected OperatorCollection(bool deserializing) : base(deserializing) { }
32	32	protected OperatorCollection(OperatorCollection original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new OperatorCollection(this, cloner); }
33	34	public OperatorCollection() : base() { }
34	35	public OperatorCollection(IEnumerable<IOperator> collection) : base(collection) { }

r4668	r4711
31	31	protected OperatorList(bool deserializing) : base(deserializing) { }
32	32	protected OperatorList(OperatorList original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new OperatorList(this, cloner); }
33	34	public OperatorList() : base() { }
34	35	public OperatorList(int capacity) : base(capacity) { }

r4668	r4711
31	31	protected OperatorSet(bool deserializing) : base(deserializing) { }
32	32	protected OperatorSet(OperatorSet original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new OperatorSet(this, cloner); }
33	34	public OperatorSet() : base() { }
34	35	public OperatorSet(IEnumerable<IOperator> collection) : base(collection) { }

r4668	r4711
31	31	protected ParameterCollection(bool deserializing) : base(deserializing) { }
32	32	protected ParameterCollection(ParameterCollection original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new ParameterCollection(this, cloner); }
	34
33	35	public ParameterCollection() : base() { }
34	36	public ParameterCollection(int capacity) : base(capacity) { }

r4668	r4711
31	31	protected ValueParameterCollection(bool deserializing) : base(deserializing) { }
32	32	protected ValueParameterCollection(ValueParameterCollection original, Cloner cloner) : base(original, cloner) { }
	33	public override IDeepCloneable Clone(Cloner cloner) { return new ValueParameterCollection(this, cloner); }
	34
33	35	public ValueParameterCollection() : base() { }
34	36	public ValueParameterCollection(int capacity) : base(capacity) { }

-                      r4668
+                      r4711
     [StorableConstructor]
     private VariableCollection(bool deserializing) : base(deserializing) { }
+    private VariableCollection(VariableCollection original, Cloner cloner)
+      : base(original, cloner) {
+      foreach (string key in original.dict.Keys)
+        dict.Add(key, cloner.Clone(original.dict[key]));
+      RegisterItemEvents(this);
+    }
+    private VariableCollection(VariableCollection original, Cloner cloner) : base(original, cloner) { }
     public VariableCollection() : base() { }
     public VariableCollection(int capacity) : base(capacity) { }

Note: See TracChangeset for help on using the changeset viewer.