Changeset 12148 for trunk/sources

Timestamp:

03/06/15 12:54:17 (10 years ago)

Author:

mkommend

Message:

#2327: Changed behavior of enumvalue to avoid subclassing.

File:

• trunk/sources/HeuristicLab.Data/3.3/EnumValue.cs (modified) (2 diffs)

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

@@ -29 +29 @@
   [Item("EnumValue", "An abstract base class for representing values of enum types.")]
   [StorableClass]
-  public abstract class EnumValue<T> : ValueTypeValue<T>, IComparable<EnumValue<T>> where T : struct, IComparable {
+  public sealed class EnumValue<T> : ValueTypeValue<T>, IComparable<EnumValue<T>> where T : struct, IComparable {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Enum; }
@@ -39 +39 @@
     }
 
+    public EnumValue() {
+      this.value = default(T);
+      this.readOnly = false;
+    }
+    public EnumValue(T value) {
+      this.value = value;
+      this.readOnly = false;
+    }
+
     [StorableConstructor]
-    protected EnumValue(bool deserializing) : base(deserializing) { }
-    protected EnumValue(EnumValue<T> original, Cloner cloner)
+    private EnumValue(bool deserializing) : base(deserializing) { }
+    private EnumValue(EnumValue<T> original, Cloner cloner)
       : base(original, cloner) {
       this.value = original.value;
       this.readOnly = original.readOnly;
     }
-    protected EnumValue() {
-      this.value = default(T);
-      this.readOnly = false;
-    }
-    protected EnumValue(T value) {
-      this.value = value;
-      this.readOnly = false;
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EnumValue<T>(this, cloner);
     }
 
-    public virtual int CompareTo(EnumValue<T> other) {
+    public int CompareTo(EnumValue<T> other) {
       return Value.CompareTo(other.Value);
     }