X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=e124387a9f3a37eadfdd6f582e406270fc4b5e5f;hb=38cb6c5ec82298ee351d0eb15ddd8331db273af2;hp=b8db269712c4ee3eac5bf165097b5a304c9cc45f;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index b8db269..e124387 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -681,6 +681,46 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
+	 * Moves the given album up in this album’s albums. If the album is already
+	 * the first album, nothing happens.
+	 *
+	 * @param album
+	 *            The album to move up
+	 * @return The album that the given album swapped the place with, or
+	 *         <code>null</code> if the album did not change its place
+	 */
+	public Album moveAlbumUp(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.getSone(), this).isNull("Album Parent", album.getParent()).check();
+		int oldIndex = albums.indexOf(album);
+		if (oldIndex <= 0) {
+			return null;
+		}
+		albums.remove(oldIndex);
+		albums.add(oldIndex - 1, album);
+		return albums.get(oldIndex);
+	}
+
+	/**
+	 * Moves the given album down in this album’s albums. If the album is
+	 * already the last album, nothing happens.
+	 *
+	 * @param album
+	 *            The album to move down
+	 * @return The album that the given album swapped the place with, or
+	 *         <code>null</code> if the album did not change its place
+	 */
+	public Album moveAlbumDown(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.getSone(), this).isNull("Album Parent", album.getParent()).check();
+		int oldIndex = albums.indexOf(album);
+		if ((oldIndex < 0) || (oldIndex >= (albums.size() - 1))) {
+			return null;
+		}
+		albums.remove(oldIndex);
+		albums.add(oldIndex + 1, album);
+		return albums.get(oldIndex);
+	}
+
+	/**
 	 * Returns Sone-specific options.
 	 *
 	 * @return The options of this Sone
@@ -707,7 +747,6 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(")");
 
-		@SuppressWarnings("hiding")
 		List<Reply> replies = new ArrayList<Reply>(getReplies());
 		Collections.sort(replies, Reply.TIME_COMPARATOR);
 		fingerprint.append("Replies(");
@@ -716,7 +755,6 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(')');
 
-		@SuppressWarnings("hiding")
 		List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
 		Collections.sort(likedPostIds);
 		fingerprint.append("LikedPosts(");
@@ -725,7 +763,6 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		}
 		fingerprint.append(')');
 
-		@SuppressWarnings("hiding")
 		List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
 		Collections.sort(likedReplyIds);
 		fingerprint.append("LikedReplies(");