Changeset 11140 for stable

Timestamp:

07/08/14 18:53:42 (10 years ago)

Author:

mkommend

Message:

#2201: Merged r11034 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/Path Types/DirectoryValue.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/Path Types/FileValue.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/Path Types/PathValue.cs (modified) (1 diff)

stable/HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs

@@ -68 +68 @@
       if (Content != null && Content.Exists()) {
         fileSystemWatcher.Filter = Path.GetFileName(Content.Value);
-        fileSystemWatcher.Path = Path.GetDirectoryName(Content.Value);
+        var path = Path.GetDirectoryName(Content.Value);
+        if (string.IsNullOrEmpty(path)) path = Environment.CurrentDirectory;
+        fileSystemWatcher.Path = path;
       }
       fileSystemWatcher.EnableRaisingEvents = Content != null && File.Exists(Content.Value) && Visible;

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

@@ -39 +39 @@
 
     public override bool Exists() {
+      if (!Path.IsPathRooted(Value)) return false;
       return Directory.Exists(Value);
     }

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

@@ -56 +56 @@
 
     public override bool Exists() {
+      if (string.IsNullOrEmpty(Value)) return false;
+      if (string.IsNullOrEmpty(Path.GetDirectoryName(Value))) return false;
       return File.Exists(Value);
     }

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

@@ -52 +52 @@
     }
 
-    protected PathValue() : base() { }
+    protected PathValue()
+      : base() {
+      stringValue.ToStringChanged += (o, e) => OnToStringChanged();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      stringValue.ToStringChanged += (o, e) => OnToStringChanged();
+    }
 
     public abstract bool Exists();
+
+    public override string ToString() {
+      return stringValue.ToString();
+    }
+
   }
 }