X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FDefaultAlbum.java;h=3235f17f830b148cc8441cf52ed708b685374bb4;hp=6992a35552973f25d70282bf2c4150a275ad3b05;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hpb=f2432280c1dd7099e189d71662fa64892ac6a3b4

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
index 6992a35..3235f17 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
@@ -19,7 +19,6 @@ package net.pterodactylus.sone.data.impl;
 
 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 java.util.ArrayList;
 import java.util.HashMap;
@@ -30,6 +29,7 @@ import java.util.UUID;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.ImageBuilder;
 
 import com.google.common.base.Function;
@@ -60,8 +60,8 @@ public class DefaultAlbum extends AbstractAlbum {
 	private Album parent;
 
 	/** Creates a new album with a random ID. */
-	public DefaultAlbum() {
-		this(UUID.randomUUID().toString());
+	public DefaultAlbum(Sone sone) {
+		this(UUID.randomUUID().toString(), sone);
 	}
 
 	/**
@@ -70,8 +70,9 @@ public class DefaultAlbum extends AbstractAlbum {
 	 * @param id
 	 * 		The ID of the album
 	 */
-	public DefaultAlbum(String id) {
+	public DefaultAlbum(String id, Sone sone) {
 		super(id);
+		this.sone = sone;
 	}
 
 	//
@@ -84,29 +85,11 @@ public class DefaultAlbum extends AbstractAlbum {
 	}
 
 	@Override
-	public Album setSone(Sone sone) {
-		checkNotNull(sone, "sone must not be null");
-		checkState((this.sone == null) || (this.sone.equals(sone)), "album owner must not already be set to some other Sone");
-		this.sone = sone;
-		return this;
-	}
-
-	@Override
 	public List<Album> getAlbums() {
 		return new ArrayList<Album>(albums);
 	}
 
 	@Override
-	public void addAlbum(Album album) {
-		checkNotNull(album, "album must not be null");
-		checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album");
-		album.setParent(this);
-		if (!albums.contains(album)) {
-			albums.add(album);
-		}
-	}
-
-	@Override
 	public void removeAlbum(Album album) {
 		checkNotNull(album, "album must not be null");
 		checkArgument(album.getSone().equals(sone), "album must belong this album’s Sone");
@@ -227,6 +210,18 @@ public class DefaultAlbum extends AbstractAlbum {
 	}
 
 	@Override
+	public AlbumBuilder newAlbumBuilder() {
+		return new DefaultAlbumBuilder(sone) {
+			@Override
+			public Album build() throws IllegalStateException {
+				Album album = super.build();
+				albums.add(album);
+				return album;
+			}
+		};
+	}
+
+	@Override
 	public ImageBuilder newImageBuilder() throws IllegalStateException {
 		return new DefaultImageBuilder(sone, this) {
 			@Override