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

diff --git a/src/main/java/net/pterodactylus/sone/core/ImageInserter.java b/src/main/java/net/pterodactylus/sone/core/ImageInserter.java
index 4655c33..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–2012 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
@@ -67,7 +69,9 @@ 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);