X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FAlbumImpl.java;h=41668abe0ad45411b95e483320f44cd401db6f9b;hp=c569e0a6a95f6ca602dc4774ef4186ab8b5fe2e5;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=18812e32e51ebdd3348575307d03c4d9025ba284

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
index c569e0a..41668ab 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Album.java - Copyright © 2011–2013 David Roden
+ * Sone - AlbumImpl.java - Copyright © 2011–2015 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ public class AlbumImpl implements Album {
 		checkArgument(equals(album.getParent()), "album must belong to this album");
 		int oldIndex = albums.indexOf(album);
 		if (oldIndex <= 0) {
-			return null;
+			return album;
 		}
 		albums.remove(oldIndex);
 		albums.add(oldIndex - 1, album);
@@ -148,7 +148,7 @@ public class AlbumImpl implements Album {
 		checkArgument(equals(album.getParent()), "album must belong to this album");
 		int oldIndex = albums.indexOf(album);
 		if ((oldIndex < 0) || (oldIndex >= (albums.size() - 1))) {
-			return null;
+			return album;
 		}
 		albums.remove(oldIndex);
 		albums.add(oldIndex + 1, album);
@@ -209,7 +209,7 @@ public class AlbumImpl implements Album {
 		checkArgument(image.getAlbum().equals(this), "image must belong to this album");
 		int oldIndex = imageIds.indexOf(image.getId());
 		if (oldIndex <= 0) {
-			return null;
+			return image;
 		}
 		imageIds.remove(image.getId());
 		imageIds.add(oldIndex - 1, image.getId());
@@ -224,7 +224,7 @@ public class AlbumImpl implements Album {
 		checkArgument(image.getAlbum().equals(this), "image must belong to this album");
 		int oldIndex = imageIds.indexOf(image.getId());
 		if ((oldIndex == -1) || (oldIndex >= (imageIds.size() - 1))) {
-			return null;
+			return image;
 		}
 		imageIds.remove(image.getId());
 		imageIds.add(oldIndex + 1, image.getId());