From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 8 Aug 2013 00:08:49 +0000 (+0200)
Subject: Compare results, not the bot names.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=627395d1991e2a172ec851247ceb9ef643cb721b;p=xudocci.git

Compare results, not the bot names.
---

diff --git a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
index abef80e..d3821aa 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -351,7 +351,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 		 * one name pattern is preferred (and thus listed first), one pattern is
 		 * disliked (and thus listed last), the rest is sorted alphabetically.
 		 */
-		private static final Comparator<String> botNameComparator = new Comparator<String>() {
+		private static final Comparator<Result> botNameComparator = new Comparator<Result>() {
 
 			/** Regular expression pattern for preferred names. */
 			private final Pattern preferredNames = Pattern.compile("(?i)[^\\w]EUR?[^\\w]");
@@ -360,7 +360,9 @@ public class CommandReader extends AbstractExecutionThreadService {
 			private final Pattern dislikedNames = Pattern.compile("(?i)[^\\w]USA?[^\\w]");
 
 			@Override
-			public int compare(String leftBotName, String rightBotName) {
+			public int compare(Result leftResult, Result rightResult) {
+				String leftBotName = leftResult.bot().name();
+				String rightBotName = rightResult.bot().name();
 				/* preferred names to the front! */
 				if (preferredNames.matcher(leftBotName).find() && !preferredNames.matcher(rightBotName).find()) {
 					return -1;
@@ -375,8 +377,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 				if (dislikedNames.matcher(rightBotName).find() && !dislikedNames.matcher(leftBotName).find()) {
 					return -1;
 				}
-				/* rest is sorted by name. */
-				return leftBotName.compareToIgnoreCase(rightBotName);
+				return 0;
 			}
 		};