From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 24 Oct 2013 04:54:30 +0000 (+0200)
Subject: Don’t throw exceptions when moving up/down the first/last profile field.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2b438203e37c5b5a886dceb4cd061c27de09d8db;p=Sone.git

Don’t throw exceptions when moving up/down the first/last profile field.
---

diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java
index 03e9a91..d091b89 100644
--- a/src/main/java/net/pterodactylus/sone/data/Profile.java
+++ b/src/main/java/net/pterodactylus/sone/data/Profile.java
@@ -23,6 +23,8 @@ import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 import static java.util.UUID.randomUUID;
 
 import java.util.ArrayList;
@@ -240,38 +242,20 @@ public class Profile implements Fingerprintable {
 		fields.set(indexOfField, new Field(field.getId(), field.getName(), newValue));
 	}
 
-	/**
-	 * Moves the given field up one position in the field list. The index of the
-	 * field to move must be greater than {@code 0} (because you obviously can
-	 * not move the first field further up).
-	 *
-	 * @param field
-	 *            The field to move up
-	 */
 	public void moveFieldUp(Field field) {
 		checkNotNull(field, "field must not be null");
 		checkArgument(hasField(field), "field must belong to this profile");
-		checkArgument(getFieldIndex(field) > 0, "field index must be > 0");
 		int fieldIndex = getFieldIndex(field);
 		fields.remove(field);
-		fields.add(fieldIndex - 1, field);
+		fields.add(max(fieldIndex - 1, 0), field);
 	}
 
-	/**
-	 * Moves the given field down one position in the field list. The index of
-	 * the field to move must be less than the index of the last field (because
-	 * you obviously can not move the last field further down).
-	 *
-	 * @param field
-	 *            The field to move down
-	 */
 	public void moveFieldDown(Field field) {
 		checkNotNull(field, "field must not be null");
 		checkArgument(hasField(field), "field must belong to this profile");
-		checkArgument(getFieldIndex(field) < fields.size() - 1, "field index must be < " + (fields.size() - 1));
 		int fieldIndex = getFieldIndex(field);
 		fields.remove(field);
-		fields.add(fieldIndex + 1, field);
+		fields.add(min(fieldIndex + 1, fields.size()), field);
 	}
 
 	/**