Fixed duplicate entries in conflict string

SS111 · Oct 27, 2013 · 6c6d0d6 · 6c6d0d6
1 parent ddcc528
commit 6c6d0d6
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/com/github/ss111/ConflictHelper.java b/src/com/github/ss111/ConflictHelper.java
@@ -155,24 +155,23 @@ public static String getConflictString(MultiValueMap map, Integer key) {
 			namesArray.add(combo.toArray()[0].toString());
 		}
 
-		for (int i = 0; i <= names.size(); i++) {
+		for (int i = 0; i <= names.size() - 1; i++) {
 
 			if (i == 0) {
 
-				conflictString = conflictString + namesArray.toArray()[i] + " conflicts with ";
+				conflictString += namesArray.toArray()[i] + " conflicts with ";
 
 			} else if (i == names.size() - 1) {
 
-				conflictString = conflictString + namesArray.toArray()[i] + ", and ";
+				conflictString += namesArray.toArray()[i] + ".";
 
-			} else if (i == names.size()) {
-
-				conflictString = conflictString + namesArray.toArray()[i - 1] + ".";
+			} else if (i == names.size() - 2) {
 
+				conflictString += namesArray.toArray()[i] + ", and ";
 
 			} else {
-				
-				conflictString = conflictString + namesArray.toArray()[i] + ", ";
+
+				conflictString += namesArray.toArray()[i] + ", ";
 			}
 		}
 
@@ -206,20 +205,19 @@ public static String getConfigConflictString(MultiValueMap map, Integer key) {
 			namesArray.add(combo.toArray()[1].toString());
 		}
 
-		for (int i = 0; i <= names.size(); i++) {
+		for (int i = 0; i <= names.size() - 1; i++) {
 
 			if (i == names.size() - 1) {
 
-				conflictString = conflictString + namesArray.toArray()[i] + ", and ";
-
-			} else if (i == names.size()) {
+				conflictString += namesArray.toArray()[i] + ".";
 
-				conflictString = conflictString + namesArray.toArray()[i - 1];
+			} else if (i == names.size() - 2) {
 
+				conflictString += namesArray.toArray()[i] + ", and ";
 
 			} else {
 
-				conflictString = conflictString + namesArray.toArray()[i] + ", ";
+				conflictString += namesArray.toArray()[i] + ", ";
 			}
 		}