X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=a0e3c40371a041deddc4b56757c7a6446eb63454;hb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;hp=65d0d87bc899bade6e2fca3e31ce4fea6087c400;hpb=ccf2a279d0c8261508968c9fb38dfec9c1c8bcc1;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 65d0d87..a0e3c40 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2012 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
@@ -27,9 +27,11 @@ import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
-import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.validation.Validation;
+
+import com.google.inject.Inject;
+
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
 import freenet.pluginmanager.PluginReplySender;
@@ -80,6 +82,7 @@ public class FcpInterface {
 	 * @param core
 	 *            The core
 	 */
+	@Inject
 	public FcpInterface(Core core) {
 		commands.put("Version", new VersionCommand(core));
 		commands.put("GetLocalSones", new GetLocalSonesCommand(core));
@@ -172,9 +175,9 @@ public class FcpInterface {
 			try {
 				Response response = command.execute(parameters, data, AccessType.values()[accessType]);
 				sendReply(pluginReplySender, identifier, response);
-			} catch (FcpException fe1) {
+			} catch (Exception e1) {
 				logger.log(Level.WARNING, "Could not process FCP command “%s”.", command);
-				sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+				sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + e1.getMessage()));
 			}
 		} catch (PluginNotFoundException pnfe1) {
 			logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);
@@ -197,7 +200,7 @@ public class FcpInterface {
 	 * @throws PluginNotFoundException
 	 *             if the plugin can not be found
 	 */
-	private void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
+	private static void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
 		SimpleFieldSet replyParameters = response.getReplyParameters();
 		if (identifier != null) {
 			replyParameters.putOverwrite("Identifier", identifier);