X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FDefaultImage.java;h=26f635522ba1181de5013ed45f1e91a9d60b4781;hb=31a732a2e18008ea65a31a4e8180c337458b2df9;hp=13af2874868f0d9946551ef6c946bd018a055a0e;hpb=fc2165a3e44887c18d6faca054cc4efa384ca797;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
index 13af287..26f6355 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
@@ -17,49 +17,26 @@
 
 package net.pterodactylus.sone.data.impl;
 
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.fromNullable;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.FluentIterable.from;
 
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 
-import com.google.common.base.Optional;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
-
 /**
  * Dumb, store-everything-in-memory implementation of an {@link Image}.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class DefaultImage implements Image {
+public class DefaultImage extends AbstractImage {
 
-	private final String id;
 	private final Sone sone;
-	private final Album album;
-	private final long creationTime;
-	private final int width;
-	private final int height;
-	private String key;
-	private String title;
-	private String description;
+	private final DefaultAlbum album;
 
-	public DefaultImage(String id, Sone sone, Album album, String key, long creationTime, int width, int height) {
-		this.id = checkNotNull(id, "id must not be null");
+	public DefaultImage(String id, Sone sone, DefaultAlbum album, String key, long creationTime, int width, int height) {
+		super(id, key, creationTime, width, height);
 		this.sone = sone;
 		this.album = album;
-		this.key = key;
-		this.creationTime = creationTime;
-		this.width = width;
-		this.height = height;
-	}
-
-	@Override
-	public String getId() {
-		return id;
 	}
 
 	@Override
@@ -73,107 +50,28 @@ public class DefaultImage implements Image {
 	}
 
 	@Override
-	public String getKey() {
-		return key;
-	}
-
-	@Override
-	public boolean isInserted() {
-		return key != null;
-	}
-
-	@Override
-	public long getCreationTime() {
-		return creationTime;
-	}
-
-	@Override
-	public int getWidth() {
-		return width;
-	}
-
-	@Override
-	public int getHeight() {
-		return height;
-	}
-
-	@Override
-	public String getTitle() {
-		return title;
+	public void moveUp() throws IllegalStateException {
+		int oldIndex = album.imageIds.indexOf(getId());
+		album.imageIds.remove(getId());
+		album.imageIds.add(Math.max(0, oldIndex - 1), getId());
 	}
 
 	@Override
-	public String getDescription() {
-		return description;
+	public void moveDown() throws IllegalStateException {
+		int oldIndex = album.imageIds.indexOf(getId());
+		album.imageIds.remove(getId());
+		album.imageIds.add(Math.min(album.imageIds.size(), oldIndex + 1), getId());
 	}
 
 	@Override
-	public Modifier modify() throws IllegalStateException {
-		// TODO: reenable check for local images
-		return new Modifier() {
-			private Optional<String> key = absent();
-			private Optional<String> title = absent();
-			private Optional<String> description = absent();
-
-			@Override
-			public Modifier setKey(String key) {
-				this.key = fromNullable(key);
-				return this;
-			}
-
-			@Override
-			public Modifier setTitle(String title) {
-				this.title = fromNullable(title);
-				return this;
-			}
-
-			@Override
-			public Modifier setDescription(String description) {
-				this.description = fromNullable(description);
-				return this;
-			}
-
-			@Override
-			public Image update() throws IllegalStateException {
-				checkState(!key.isPresent() || (DefaultImage.this.key == null), "key can not be changed");
-
-				if (key.isPresent()) {
-					DefaultImage.this.key = key.get();
-				}
-				if (title.isPresent()) {
-					DefaultImage.this.title = title.get();
-				}
-				if (description.isPresent()) {
-					DefaultImage.this.description = description.get();
-				}
-
-				return DefaultImage.this;
+	public void remove() throws IllegalStateException {
+		synchronized (album) {
+			album.images.remove(getId());
+			album.imageIds.remove(getId());
+			if (getId().equals(album.albumImage)) {
+				album.albumImage = from(album.images.values()).transform(GET_ID).first().orNull();
 			}
-		};
-	}
-
-	@Override
-	public String getFingerprint() {
-		Hasher hash = Hashing.sha256().newHasher();
-		hash.putString("Image(");
-		hash.putString("ID(").putString(id).putString(")");
-		hash.putString("Title(").putString(title).putString(")");
-		hash.putString("Description(").putString(description).putString(")");
-		hash.putString(")");
-		return hash.hash().toString();
-	}
-
-	@Override
-	public int hashCode() {
-		return id.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		if (!(object instanceof DefaultImage)) {
-			return false;
 		}
-		return ((DefaultImage) object).id.equals(id);
 	}
 
 }