Fix for missing directories

[pithos-ms-client] / trunk / Pithos.Client.WPF / FileProperties / ConflictsViewModel.cs

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index da7a840..611bf38 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text;
 using Caliburn.Micro;
 using Pithos.Client.WPF.Converters;
+using Pithos.Client.WPF.Utils;
 using Pithos.Core;
 using Pithos.Interfaces;
 
@@ -45,7 +46,10 @@ namespace Pithos.Client.WPF.FileProperties
         private string _reason;
         public string Reason
         {
-            get { return _reason; }
+            get
+            {
+                return _reason;
+            }
             set
             {
                 _reason = value;
@@ -91,6 +95,11 @@ namespace Pithos.Client.WPF.FileProperties
             get { return _conflicts; }
         }
 
+        public bool HasConflicts
+        {
+            get { return Conflicts!=null && Conflicts.Count > 0; }
+        }
+
         public string[]  Actions
         {
             get { return new[] {"Keep Local", "Keep Server", "Keep Both"}; }
@@ -105,7 +114,12 @@ namespace Pithos.Client.WPF.FileProperties
                          select state;
             var conflicts = from state in fileStates
                             let info=FileInfoExtensions.FromPath(state.FilePath)
-                            select new ConflictFile {FilePath = state.FilePath,Reason=state.ConflictReason,LocalModified = info.LastWriteTime};          
+                            select new ConflictFile
+                                       {
+                                           FilePath = state.FilePath,
+                                           Reason=state.ConflictReason??state.FileStatus.Name() ,
+                                           LocalModified = info.LastWriteTime
+                                       };          
             _conflicts = new ObservableCollection<ConflictFile>(conflicts.ToList());
             
         }