Changeset 8708

Timestamp:

09/28/12 18:36:11 (12 years ago)

Author:

ascheibe

Message:

#1959 implemented reviewing comments

Location:

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

Files:

• HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)
• ListViewItemComparer.cs (moved) (moved from trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewDateComparer.cs) (2 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="ListViewDateComparer.cs" />
+    <Compile Include="ListViewItemComparer.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\HiveJobManagerView.cs">

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

@@ -29 +29 @@
   /// See: http://msdn.microsoft.com/en-us/library/ms996467.aspx
   /// </summary>
-  public class ListViewDateComparer : IComparer {
+  public class ListViewItemComparer : IComparer {
     private int col;
     private SortOrder order;
 
-    public ListViewDateComparer() {
+    public ListViewItemComparer() {
       col = 0;
       order = SortOrder.Ascending;
     }
 
-    public ListViewDateComparer(int column, SortOrder order) {
+    public ListViewItemComparer(int column, SortOrder order) {
       col = column;
       this.order = order;
@@ -45 +45 @@
     public int Compare(object x, object y) {
       int returnVal;
+      bool result;
+      DateTime firstDate, secondDate;
+      ListViewItem listViewItemX, listViewItemY;
+      listViewItemX = x as ListViewItem;
+      listViewItemY = y as ListViewItem;
 
-      if (!(x is ListViewItem) || !(y is ListViewItem)) {
-        throw new InvalidCastException(string.Format("The ListViewDateComparer expects ListViewItems but received {0} and {1}.",
+      if (listViewItemX == null || listViewItemY == null) {
+        throw new ArgumentException(string.Format("The ListViewItemComparer expects ListViewItems but received {0} and {1}.",
           x.GetType().ToString(), y.GetType().ToString()));
       }
 
-      try {
-        DateTime firstDate = DateTime.Parse(((ListViewItem)x).SubItems[col].Text);
-        DateTime secondDate = DateTime.Parse(((ListViewItem)y).SubItems[col].Text);
+      result = DateTime.TryParse(listViewItemX.SubItems[col].Text, out firstDate);
+      result = DateTime.TryParse(listViewItemY.SubItems[col].Text, out secondDate) && result;
+
+      if (result) {
         returnVal = DateTime.Compare(firstDate, secondDate);
-      }
-      // if neither compared object has a valid date format, compare as a string
-      catch {
-        returnVal = String.Compare(((ListViewItem)x).SubItems[col].Text, ((ListViewItem)y).SubItems[col].Text);
+      } 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);
       }
 

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

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