Move comparator to sort change numbers in FetchGerritChangePage

Move compare() to class Change and use generic reverse sort order.

Change-Id: I5515e74198002e645d9881c0571fd424a668ee6f
Also-By: Jaxsun McCarthy Huggan <jaxsun.mccarthy@tasktop.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 12 insertions, 17 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
index 7fbe9b365e..640041f4e8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
@@ -18,7 +18,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -655,21 +654,7 @@ public class FetchGerritChangePage extends WizardPage {
 									changeRefs.add(change);
 							}
 							Collections.sort(changeRefs,
-									new Comparator<Change>() {
-										@Override
-										public int compare(Change o1, Change o2) {
-											// change number descending
-											int changeDiff = o2.changeNumber
-													.compareTo(o1.changeNumber);
-											if (changeDiff == 0)
-												// patch set number descending
-												changeDiff = o2
-														.getPatchSetNumber()
-														.compareTo(
-																o1.getPatchSetNumber());
-											return changeDiff;
-										}
-									});
+									Collections.reverseOrder());
 						}
 					});
 		}
@@ -939,7 +924,7 @@ public class FetchGerritChangePage extends WizardPage {
 		}
 	}
 
-	private final static class Change {
+	private final static class Change implements Comparable<Change> {
 		private final String refName;
 
 		private final Integer changeNumber;
@@ -998,6 +983,16 @@ public class FetchGerritChangePage extends WizardPage {
 		public String toString() {
 			return refName;
 		}
+
+		@Override
+		public int compareTo(Change o) {
+			int changeDiff = this.changeNumber.compareTo(o.changeNumber);
+			if (changeDiff == 0) {
+				changeDiff = this.getPatchSetNumber()
+						.compareTo(o.getPatchSetNumber());
+			}
+			return changeDiff;
+		}
 	}
 
 	private final static class ChangeContentProposal implements