X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FAlbumImpl.java;h=6a45187d06a0713427dd639eb049470e22113227;hb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;hp=fa1538d49fab3dd3642da388d09809e6786a568e;hpb=851d4fd51d44b92452aef92450022999a97a0483;p=Sone.git

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 fa1538d..6a45187 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/AlbumImpl.java
@@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.IdBuilder;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 
@@ -46,6 +47,8 @@ import com.google.common.hash.Hashing;
  */
 public class AlbumImpl implements Album {
 
+	private final IdBuilder idBuilder = new IdBuilder();
+
 	/** The ID of this album. */
 	private final String id;
 
@@ -95,6 +98,11 @@ public class AlbumImpl implements Album {
 
 	@Override
 	public String getId() {
+		return idBuilder.buildId(sone.getId(), id);
+	}
+
+	@Override
+	public String getInternalId() {
 		return id;
 	}
 
@@ -134,7 +142,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 +156,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);