X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FDefaultAlbum.java;h=295555d7645ae091bfa4ac6674b637c8783fffd5;hb=c4eb31ab64627adfdeed2a445d67883371203e99;hp=74b66e795e934ed4c7b23d6d5267c0deefa13c45;hpb=a77d4a36080bc90c8c09efb753eb9e46f4e677d9;p=Sone.git 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 74b66e7..295555d 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java @@ -1,5 +1,5 @@ /* - * Sone - Album.java - Copyright © 2011–2013 David Roden + * Sone - MemoryAlbum.java - Copyright © 2013 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 @@ -17,68 +17,35 @@ 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; import java.util.List; -import java.util.Map; -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.Database; import net.pterodactylus.sone.database.ImageBuilder; -import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.common.base.Predicates; -import com.google.common.collect.Collections2; /** - * Dumb, store-everything-in-memory implementation of an {@link Album}. + * TODO * * @author David ‘Bombe’ Roden */ public class DefaultAlbum extends AbstractAlbum { - /** The Sone this album belongs to. */ - private Sone sone; + private final Database database; + private final Sone sone; /* TODO - only store sone ID. */ - /** Nested albums. */ - private final List albums = new ArrayList(); - - /** The image IDs in order. */ - final List imageIds = new ArrayList(); - - /** The images in this album. */ - final Map images = new HashMap(); - - /** The parent album. */ - private Album parent; - - /** Creates a new album with a random ID. */ - public DefaultAlbum(Sone sone) { - this(UUID.randomUUID().toString(), sone); - } - - /** - * Creates a new album with the given ID. - * - * @param id - * The ID of the album - */ - public DefaultAlbum(String id, Sone sone) { - super(id); + protected DefaultAlbum(Database database, String id, Sone sone, String parentId) { + super(id, parentId); + this.database = database; this.sone = sone; } - // - // ACCESSORS - // - @Override public Sone getSone() { return sone; @@ -86,139 +53,73 @@ public class DefaultAlbum extends AbstractAlbum { @Override public List getAlbums() { - return new ArrayList(albums); - } - - @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"); - checkArgument(equals(album.getParent()), "album must belong to this album"); - albums.remove(album); - album.removeParent(); - } - - @Override - public Album moveAlbumUp(Album album) { - checkNotNull(album, "album must not be null"); - checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album"); - checkArgument(equals(album.getParent()), "album must belong to this album"); - int oldIndex = albums.indexOf(album); - if (oldIndex <= 0) { - return null; - } - albums.remove(oldIndex); - albums.add(oldIndex - 1, album); - return albums.get(oldIndex); - } - - @Override - public Album moveAlbumDown(Album album) { - checkNotNull(album, "album must not be null"); - checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this 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; - } - albums.remove(oldIndex); - albums.add(oldIndex + 1, album); - return albums.get(oldIndex); + return database.getAlbums(this); } @Override public List getImages() { - return new ArrayList(Collections2.filter(Collections2.transform(imageIds, new Function() { - - @Override - @SuppressWarnings("synthetic-access") - public Image apply(String imageId) { - return images.get(imageId); - } - }), Predicates.notNull())); + return database.getImages(this); } @Override - public Image moveImageUp(Image image) { - checkNotNull(image, "image must not be null"); - checkNotNull(image.getSone(), "image must have an owner"); - checkArgument(image.getSone().equals(sone), "image must belong to the same Sone as this album"); - checkArgument(image.getAlbum().equals(this), "image must belong to this album"); - int oldIndex = imageIds.indexOf(image.getId()); - if (oldIndex <= 0) { - return null; - } - imageIds.remove(image.getId()); - imageIds.add(oldIndex - 1, image.getId()); - return images.get(imageIds.get(oldIndex)); - } - - @Override - public Image moveImageDown(Image image) { - checkNotNull(image, "image must not be null"); - checkNotNull(image.getSone(), "image must have an owner"); - checkArgument(image.getSone().equals(sone), "image must belong to the same Sone as this 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; - } - imageIds.remove(image.getId()); - imageIds.add(oldIndex + 1, image.getId()); - return images.get(imageIds.get(oldIndex)); - } - - @Override - public Image getAlbumImage() { - if (albumImage == null) { - return null; - } - return Optional.fromNullable(images.get(albumImage)).or(images.values().iterator().next()); + public Optional getAlbumImage() { + return database.getImage(albumImage); } @Override public Album getParent() { - return parent; - } - - @Override - public Album setParent(Album parent) { - this.parent = checkNotNull(parent, "parent must not be null"); - return this; - } - - @Override - public Album removeParent() { - this.parent = null; - return this; + return database.getAlbum(parentId).get(); } @Override - public AlbumBuilder newAlbumBuilder() { - return new DefaultAlbumBuilder(sone) { + public AlbumBuilder newAlbumBuilder() throws IllegalStateException { + return new AbstractAlbumBuilder() { @Override public Album build() throws IllegalStateException { - Album album = super.build(); - albums.add(album); - return album; + validate(); + DefaultAlbum memoryAlbum = new DefaultAlbum(database, getId(), sone, DefaultAlbum.this.id); + database.storeAlbum(memoryAlbum); + return memoryAlbum; } }; } @Override public ImageBuilder newImageBuilder() throws IllegalStateException { - return new DefaultImageBuilder(sone, this) { + return new AbstractImageBuilder() { @Override - public Image build() throws IllegalStateException { - Image image = super.build(); - if (images.isEmpty() && (albumImage == null)) { - albumImage = image.getId(); + public Image build(Optional imageCreated) throws IllegalStateException { + validate(); + DefaultImage image = new DefaultImage(database, getId(), sone, DefaultAlbum.this.id, key, getCreationTime(), width, height); + database.storeImage(image); + if (imageCreated.isPresent()) { + imageCreated.get().imageCreated(image); } - images.put(image.getId(), image); - imageIds.add(image.getId()); return image; } }; } + @Override + public void moveUp() { + database.moveUp(this); + } + + @Override + public void moveDown() { + database.moveDown(this); + } + + @Override + public void remove() throws IllegalStateException { + checkState(!isRoot(), "can not remove root album"); + for (Album album : getAlbums()) { + album.remove(); + } + for (Image image : getImages()) { + image.remove(); + } + database.removeAlbum(this); + } + }