X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FImageInserter.java;h=791663f2c6936a6ab60989bf49655513919d37f1;hp=b4421ce6514e2919fafdb4da1a8623958b490719;hb=7cd3aec944cf84236a2fa4991915608d4c905182;hpb=a23c4f218c3adf236d89d5927cae37d6e6e4feda

diff --git a/src/main/java/net/pterodactylus/sone/core/ImageInserter.java b/src/main/java/net/pterodactylus/sone/core/ImageInserter.java
index b4421ce..791663f 100644
--- a/src/main/java/net/pterodactylus/sone/core/ImageInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/ImageInserter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ImageInserter.java - Copyright © 2011 David Roden
+ * Sone - ImageInserter.java - Copyright © 2011–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,6 +17,9 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +30,6 @@ import net.pterodactylus.sone.core.FreenetInterface.InsertToken;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.validation.Validation;
 
 /**
  * The image inserter is responsible for inserting images using
@@ -42,9 +44,6 @@ public class ImageInserter {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(ImageInserter.class);
 
-	/** The core. */
-	private final Core core;
-
 	/** The freenet interface. */
 	private final FreenetInterface freenetInterface;
 
@@ -54,19 +53,15 @@ public class ImageInserter {
 	/**
 	 * Creates a new image inserter.
 	 *
-	 * @param core
-	 *            The Sone core
 	 * @param freenetInterface
 	 *            The freenet interface
 	 */
-	public ImageInserter(Core core, FreenetInterface freenetInterface) {
-		this.core = core;
+	public ImageInserter(FreenetInterface freenetInterface) {
 		this.freenetInterface = freenetInterface;
 	}
 
 	/**
-	 * Inserts the given image. The {@link #core} will automatically added as
-	 * {@link ImageInsertListener} to the created {@link InsertToken}.
+	 * Inserts the given image.
 	 *
 	 * @param temporaryImage
 	 *            The temporary image data
@@ -74,11 +69,12 @@ public class ImageInserter {
 	 *            The image
 	 */
 	public void insertImage(TemporaryImage temporaryImage, Image image) {
-		Validation.begin().isNotNull("Temporary Image", temporaryImage).isNotNull("Image", image).check().isEqual("Image IDs", image.getId(), temporaryImage.getId()).check();
+		checkNotNull(temporaryImage, "temporaryImage must not be null");
+		checkNotNull(image, "image must not be null");
+		checkArgument(image.getId().equals(temporaryImage.getId()), "image IDs must match");
 		try {
 			InsertToken insertToken = freenetInterface.new InsertToken(image);
 			insertTokens.put(image.getId(), insertToken);
-			insertToken.addImageInsertListener(core);
 			freenetInterface.insertImage(temporaryImage, image, insertToken);
 		} catch (SoneException se1) {
 			logger.log(Level.WARNING, "Could not insert image!", se1);
@@ -98,7 +94,6 @@ public class ImageInserter {
 			return;
 		}
 		insertToken.cancel();
-		insertToken.removeImageInsertListener(core);
 	}
 
 }