[tasque/viewmodel: 53/78] Simplified TaskComparer



commit 0daea51c6260dc6a6ba65ea1ac2d8e7de48ba483
Author: Antonius Riha <antoniusriha gmail com>
Date:   Mon Aug 6 23:06:32 2012 +0200

    Simplified TaskComparer

 src/libtasqueui/Legacy/MainWindowModel.cs |    2 +-
 src/libtasqueui/Legacy/TaskComparer.cs    |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/libtasqueui/Legacy/MainWindowModel.cs b/src/libtasqueui/Legacy/MainWindowModel.cs
index 84769ce..21dc9de 100644
--- a/src/libtasqueui/Legacy/MainWindowModel.cs
+++ b/src/libtasqueui/Legacy/MainWindowModel.cs
@@ -46,7 +46,7 @@ namespace Tasque.UIModel.Legacy
 			Tasks = new ListCollectionView<Task> (Backend.Tasks);
 			Tasks.Filter = Filter;
 			Tasks.GroupDescriptions.Add (new PropertyGroupDescription (null, new TaskGroupConverter ()));
-			Tasks.CustomSort = new TaskComparer (new TaskCompletionDateComparer());
+			Tasks.CustomSort = new TaskComparer ();
 			
 			topPanel = new MainWindowTopPanelModel (this);
 		}
diff --git a/src/libtasqueui/Legacy/TaskComparer.cs b/src/libtasqueui/Legacy/TaskComparer.cs
index e8a0154..9496a1d 100644
--- a/src/libtasqueui/Legacy/TaskComparer.cs
+++ b/src/libtasqueui/Legacy/TaskComparer.cs
@@ -30,22 +30,18 @@ namespace Tasque.UIModel.Legacy
 {
     public class TaskComparer : Comparer<Task>
     {
-        public TaskComparer(TaskCompletionDateComparer completedComparer)
+        public TaskComparer()
         {
-            this.completedComparer = completedComparer;
+			completedComparer = new TaskCompletionDateComparer ();
         }
 
         public override int Compare(Task x, Task y)
         {
             var result = x.IsComplete.CompareTo(y.IsComplete);
-
             if (result != 0)
                 return result;
 
-            if (x.IsComplete)
-                return -completedComparer.Compare(x, y);
-            else
-                return x.CompareTo(y);
+			return x.IsComplete ? -completedComparer.Compare (x, y) : x.CompareTo (y);
         }
 
         TaskCompletionDateComparer completedComparer;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]