Context Navigation

Changeset 2676 for trunk/sources/HeuristicLab.Data/3.3

Timestamp:

01/25/10 02:34:23 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

continued work on adapting and refactoring HeuristicLab.Data according to the changes in HeuristicLab.Core
unified visual appearance of views

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

r2669	r2676
41	41	}
42	42
	43	#region IStringConvertibleData Members
	44	bool IStringConvertibleData.Validate(string value) {
	45	bool b;
	46	return bool.TryParse(value, out b);
	47	}
43	48	string IStringConvertibleData.GetValue() {
44	49	return Value.ToString();
…	…
53	58	}
54	59	}
	60	#endregion
55	61	}
56	62	}

r2669	r2676
45	45	}
46	46
	47	#region IStringConvertibleData Members
	48	bool IStringConvertibleData.Validate(string value) {
	49	DateTime d;
	50	return DateTime.TryParse(value, out d);
	51	}
47	52	string IStringConvertibleData.GetValue() {
48	53	return Value.ToString("o"); // round-trip format
…	…
57	62	}
58	63	}
	64	#endregion
59	65	}
60	66	}

r2669	r2676
45	45	}
46	46
	47	#region IStringConvertibleData Members
	48	bool IStringConvertibleData.Validate(string value) {
	49	double d;
	50	return double.TryParse(value, out d);
	51	}
47	52	string IStringConvertibleData.GetValue() {
48	53	return Value.ToString("r"); // round-trip format
…	…
57	62	}
58	63	}
	64	#endregion
59	65	}
60	66	}

r2669	r2676
103	103	<SubType>Code</SubType>
104	104	</Compile>
	105	<Compile Include="BoolArrayData.cs" />
105	106	<Compile Include="IStringConvertibleArrayData.cs" />
106	107	<Compile Include="ValueTypeArrayData.cs" />

-                      r2669
+                      r2676
     int Length { get; set; }
+    bool Validate(string value);
     string GetValue(int index);
     bool SetValue(string value, int index);
-    event ChangedEventHandler Changed;
     event EventHandler<EventArgs<int>> ItemChanged;
+    event EventHandler Reset;
+  }
+}

r2669	r2676
28	28	namespace HeuristicLab.Data {
29	29	public interface IStringConvertibleData {
	30	bool Validate(string value);
30	31	string GetValue();
31	32	bool SetValue(string value);

-                      r2669
+                      r2676
 using System.Text;
 using System.Xml;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 …
     public IntArrayData() : base() { }
     public IntArrayData(int length) : base(length) { }
-    public IntArrayData(IntArrayData elements) : base(elements) { }
     public IntArrayData(int[] elements) : base(elements) { }
+    protected IntArrayData(IntArrayData elements) : base(elements) { }
     public override IDeepCloneable Clone(Cloner cloner) {
 …
+    }
+    #region IStringConvertibleArrayData Members
     int IStringConvertibleArrayData.Length {
       get { return Length; }
       set { Length = value; }
+    }
+    bool IStringConvertibleArrayData.Validate(string value) {
+      int i;
+      return int.TryParse(value, out i);
+    }
     string IStringConvertibleArrayData.GetValue(int index) {
 …
+      }
+    }
+    event EventHandler<EventArgs<int>> IStringConvertibleArrayData.ItemChanged {
+      add { base.ItemChanged += value; }
+      remove { base.ItemChanged -= value; }
+    }
+    event EventHandler IStringConvertibleArrayData.Reset {
+      add { base.Reset += value; }
+      remove { base.Reset -= value; }
+    }
+    #endregion
+  }
+}

r2669	r2676
41	41	}
42	42
	43	#region IStringConvertibleData Members
	44	bool IStringConvertibleData.Validate(string value) {
	45	int i;
	46	return int.TryParse(value, out i);
	47	}
43	48	string IStringConvertibleData.GetValue() {
44	49	return Value.ToString();
…	…
53	58	}
54	59	}
	60	#endregion
55	61	}
56	62	}

r2669	r2676
63	63	}
64	64
	65	#region IStringConvertibleData Members
	66	bool IStringConvertibleData.Validate(string value) {
	67	return true;
	68	}
65	69	string IStringConvertibleData.GetValue() {
66	70	return Value;
…	…
70	74	return true;
71	75	}
	76	#endregion
72	77	}
73	78	}

r2669	r2676
41	41	}
42	42
	43	#region IStringConvertibleData Members
	44	bool IStringConvertibleData.Validate(string value) {
	45	TimeSpan t;
	46	return TimeSpan.TryParse(value, out t);
	47	}
43	48	string IStringConvertibleData.GetValue() {
44	49	return Value.ToString();
…	…
53	58	}
54	59	}
	60	#endregion
55	61	}
56	62	}

-                      r2669
+                      r2676
         Array.Copy(array, newArray, Math.Min(value, array.Length));
         array = newArray;
         OnChanged();
+        OnReset();
+      }
+    }
 …
       array = new T[length];
+    }
-    public ValueTypeArrayData(ValueTypeArrayData<T> elements) {
-      if (elements == null) throw new ArgumentNullException();
-      array = (T[])elements.array.Clone();
+    }
     public ValueTypeArrayData(T[] elements) {
       if (elements == null) throw new ArgumentNullException();
       array = (T[])elements.Clone();
+    }
+    protected ValueTypeArrayData(ValueTypeArrayData<T> elements) {
+      if (elements == null) throw new ArgumentNullException();
+      array = (T[])elements.array.Clone();
+    }
 …
+    }
     public event EventHandler<EventArgs<int>> ItemChanged;
     protected virtual void OnItemChanged(int index) {
+    protected event EventHandler<EventArgs<int>> ItemChanged;
+    private void OnItemChanged(int index) {
       if (ItemChanged != null)
         ItemChanged(this, new EventArgs<int>(index));
       OnChanged();
+    }
+    protected event EventHandler Reset;
+    private void OnReset() {
+      if (Reset != null)
+        Reset(this, EventArgs.Empty);
+      OnChanged();
+    }
+  }
+}

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