X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FAbstractSoneCommand.java;h=8afe7c4d4e3d8e535286ed0d046a31caa043e10b;hp=0b1e47bd62645add81cfc3a5d3dcd3a36050ddad;hb=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index 0b1e47b..8afe7c4 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011–2012 David Roden
+ * Sone - AbstractSoneCommand.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
@@ -33,6 +33,7 @@ import net.pterodactylus.sone.freenet.fcp.Command;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.sone.template.SoneAccessor;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 
 import freenet.node.FSParseException;
@@ -162,7 +163,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 		if (mandatory && (soneId == null)) {
 			throw new FcpException("Could not load Sone ID from “" + parameterName + "”.");
 		}
-		Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId, false);
+		Sone sone = localOnly ? core.getLocalSone(soneId, false) : core.getSone(soneId);
 		if (mandatory && (sone == null)) {
 			throw new FcpException("Could not load Sone from “" + soneId + "”.");
 		}
@@ -185,11 +186,11 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	protected Post getPost(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
 		try {
 			String postId = simpleFieldSet.getString(parameterName);
-			Post post = core.getPost(postId, false);
-			if (post == null) {
+			Optional<Post> post = core.getPost(postId);
+			if (!post.isPresent()) {
 				throw new FcpException("Could not load post from “" + postId + "”.");
 			}
-			return post;
+			return post.get();
 		} catch (FSParseException fspe1) {
 			throw new FcpException("Could not post ID from “" + parameterName + "”.", fspe1);
 		}
@@ -211,11 +212,11 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
 	protected PostReply getReply(SimpleFieldSet simpleFieldSet, String parameterName) throws FcpException {
 		try {
 			String replyId = simpleFieldSet.getString(parameterName);
-			PostReply reply = core.getPostReply(replyId, false);
-			if (reply == null) {
+			Optional<PostReply> reply = core.getPostReply(replyId);
+			if (!reply.isPresent()) {
 				throw new FcpException("Could not load reply from “" + replyId + "”.");
 			}
-			return reply;
+			return reply.get();
 		} catch (FSParseException fspe1) {
 			throw new FcpException("Could not reply ID from “" + parameterName + "”.", fspe1);
 		}