X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FProfile.java;h=2b6991a46a9da45e973903caba9e28172ffd299f;hb=54e40cf0c1c650e9eca2d50762a92b5d13ccfa85;hp=03e9a914c858dfc85b917fe83ab0c7ecf33685fb;hpb=47f4a6392781b4e48ee99bde32dcede99309f864;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java
index 03e9a91..2b6991a 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,49 +242,24 @@ 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);
 	}
 
-	/**
-	 * Removes the given field.
-	 *
-	 * @param field
-	 *            The field to remove
-	 */
 	public void removeField(Field field) {
 		checkNotNull(field, "field must not be null");
-		checkArgument(hasField(field), "field must belong to this profile");
 		fields.remove(field);
 	}
 
@@ -386,7 +363,9 @@ public class Profile implements Fingerprintable {
 		}
 		hash.putString("ContactInformation(");
 		for (Field field : fields) {
-			hash.putString(field.getName()).putString("(").putString(field.getValue()).putString(")");
+			if (field.getValue() != null) {
+				hash.putString(field.getName()).putString("(").putString(field.getValue()).putString(")");
+			}
 		}
 		hash.putString(")");
 		hash.putString(")");