Changeset 8718

Timestamp:

10/02/12 12:50:39 (12 years ago)

Author:

ascheibe

Message:

#1959 removed string comparison

Location:

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3

Files:

• HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)
• ListViewItemDateComparer.cs (moved) (moved from trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemComparer.cs) (3 diffs)
• Views/RefreshableHiveJobListView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -97 +97 @@
   <ItemGroup>
     <Compile Include="ExtensionMethods\TreeNodeExtensions.cs" />
-    <Compile Include="ListViewItemComparer.cs" />
+    <Compile Include="ListViewItemDateComparer.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\HiveJobManagerView.cs">

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs

@@ -29 +29 @@
   /// See: http://msdn.microsoft.com/en-us/library/ms996467.aspx
   /// </summary>
-  public class ListViewItemComparer : IComparer {
+  public class ListViewItemDateComparer : IComparer {
     private int col;
     private SortOrder order;
 
-    public ListViewItemComparer() {
+    public ListViewItemDateComparer() {
       col = 0;
       order = SortOrder.Ascending;
     }
 
-    public ListViewItemComparer(int column, SortOrder order) {
+    public ListViewItemDateComparer(int column, SortOrder order) {
       col = column;
       this.order = order;
@@ -52 +52 @@
 
       if (listViewItemX == null || listViewItemY == null) {
-        throw new ArgumentException(string.Format("The ListViewItemComparer expects ListViewItems but received {0} and {1}.",
+        throw new ArgumentException(string.Format("The ListViewItemDateComparer expects ListViewItems but received {0} and {1}.",
           x.GetType().ToString(), y.GetType().ToString()));
       }
@@ -62 +62 @@
         returnVal = DateTime.Compare(firstDate, secondDate);
       } else {
-        // if neither compared object has a valid date format, compare as a string
-        returnVal = String.Compare(listViewItemX.SubItems[col].Text, listViewItemY.SubItems[col].Text);
+        throw new ArgumentException(string.Format("The ListViewItemDateComparer expects DateTimes. Can't parse {0} and {1}.",
+           listViewItemX.SubItems[col].Text, listViewItemY.SubItems[col].Text));
       }
 

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -44 +44 @@
       this.itemsListView.FullRowSelect = true;
 
-      this.itemsListView.ListViewItemSorter = new ListViewItemComparer(0, SortOrder.Ascending);
+      this.itemsListView.ListViewItemSorter = new ListViewItemDateComparer(0, SortOrder.Ascending);
       this.itemsListView.Sorting = SortOrder.Ascending;
       this.itemsListView.Sort();