Changeset 12278

Timestamp:

04/01/15 15:57:37 (10 years ago)

Author:

mkommend

Message:

#2327: Merged r12037 and r12148 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs)
• HeuristicLab.Data.Views/3.3/EnumValueView.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.cs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/EnumValue.cs (copied) (copied from trunk/sources/HeuristicLab.Data/3.3/EnumValue.cs) (2 diffs)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (1 diff)

stable/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -133 +133 @@
       <DependentUpon>EnhancedStringConvertibleMatrixView.cs</DependentUpon>
     </Compile>
+    <Compile Include="EnumValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EnumValueView.Designer.cs">
+      <DependentUpon>EnumValueView.cs</DependentUpon>
+    </Compile>
     <Compile Include="IntRangeView.cs">
       <SubType>UserControl</SubType>

stable/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);
     }

stable/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -123 +123 @@
     <Compile Include="Comparison.cs" />
     <Compile Include="ComparisonType.cs" />
+    <Compile Include="EnumValue.cs" />
     <Compile Include="Path Types\DirectoryValue.cs" />
     <Compile Include="Path Types\FileValue.cs" />