Changeset 9961 for stable/HeuristicLab.Data/3.3/Path Types

Timestamp:

09/13/13 13:49:03 (11 years ago)

Author:

mkommend

Message:

#2081: Merged path data types into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/Path Types (copied) (copied from trunk/sources/HeuristicLab.Data/3.3/Path Types)
• HeuristicLab.Data/3.3/Path Types/DirectoryValue.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/Path Types/FileValue.cs (modified) (3 diffs)
• HeuristicLab.Data/3.3/Path Types/PathValue.cs (modified) (3 diffs)

stable/HeuristicLab.Data/3.3/Path Types/DirectoryValue.cs

@@ -39 +39 @@
 
     public override bool Exists() {
-      return Directory.Exists(value);
+      return Directory.Exists(Value);
     }
   }

stable/HeuristicLab.Data/3.3/Path Types/FileValue.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.IO;
 using HeuristicLab.Common;
@@ -37 +36 @@
         if (fileDialogFilter != value) {
           fileDialogFilter = value;
-          OnFileOpenDialogFilterChanged();
         }
       }
@@ -58 +56 @@
 
     public override bool Exists() {
-      return File.Exists(value);
-    }
-
-    public event EventHandler FileOpenDialogFilterChanged;
-    protected virtual void OnFileOpenDialogFilterChanged() {
-      var handler = FileOpenDialogFilterChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      return File.Exists(Value);
     }
   }

stable/HeuristicLab.Data/3.3/Path Types/PathValue.cs

@@ -20 +20 @@
 #endregion
 
-
 using System.IO;
 using HeuristicLab.Common;
@@ -29 +28 @@
   [Item("PathValue", "Represents a path.")]
   [StorableClass]
-  public abstract class PathValue : StringValue {
-    public override string Value {
-      get { return base.Value; }
+  public abstract class PathValue : Item {
+
+    [Storable]
+    private readonly StringValue stringValue = new StringValue();
+    public StringValue StringValue {
+      get { return stringValue; }
+    }
+
+    public string Value {
+      get { return stringValue.Value; }
       set {
         if (value == null) value = string.Empty;
         value = value.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-        base.Value = value;
+        stringValue.Value = value;
       }
     }
@@ -41 +47 @@
     [StorableConstructor]
     protected PathValue(bool deserializing) : base(deserializing) { }
-    protected PathValue(PathValue original, Cloner cloner) : base(original, cloner) { }
+    protected PathValue(PathValue original, Cloner cloner)
+      : base(original, cloner) {
+      stringValue = cloner.Clone(original.stringValue);
+    }
 
-    protected PathValue()
-      : base(string.Empty) { }
+    protected PathValue() : base() { }
 
     public abstract bool Exists();