[freenet-cvs] r15811 - in trunk/freenet/src/freenet: node/fcp pluginmanager

[saces at freenetproject.org]

Author: saces
Date: 2007-11-18 00:17:04 +0000 (Sun, 18 Nov 2007)
New Revision: 15811

Modified:
   trunk/freenet/src/freenet/node/fcp/GetPluginInfo.java
   trunk/freenet/src/freenet/node/fcp/PluginInfoMessage.java
   trunk/freenet/src/freenet/pluginmanager/PluginManager.java
Log:
GetPluginInfo:
 remove unneccessary info
 better naming
 detailed info only if full access

Modified: trunk/freenet/src/freenet/node/fcp/GetPluginInfo.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetPluginInfo.java	2007-11-18 00:05:12 UTC (rev 15810)
+++ trunk/freenet/src/freenet/node/fcp/GetPluginInfo.java	2007-11-18 00:17:04 UTC (rev 15811)
@@ -5,10 +5,13 @@
 
 import freenet.node.Node;
 import freenet.pluginmanager.PluginInfoWrapper;
-import freenet.pluginmanager.PluginManager;
 import freenet.support.Fields;
 import freenet.support.SimpleFieldSet;
 
+/**
+ * can find a plugin that implements FredPluginFCP
+ * 
+ */
 public class GetPluginInfo extends FCPMessage {
 
 	static final String NAME = "GetPluginInfo";
@@ -35,13 +38,13 @@
 	
 	public void run(FCPConnectionHandler handler, Node node)
 			throws MessageInvalidException {
-		if(!handler.hasFullAccess()) {
-			throw new MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "GetPluginInfo requires full access", identifier, false);
+		if(detailed && !handler.hasFullAccess()) {
+			throw new MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "GetPluginInfo detailed requires full access", identifier, false);
 		}
 
-		PluginInfoWrapper pi = node.pluginManager.getPluginInfo(plugname);
+		PluginInfoWrapper pi = node.pluginManager.getFCPPluginInfo(plugname);
 		if (pi == null) {
-			handler.outputHandler.queue(new ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_PLUGIN, false, "Plugin '"+ plugname + "' does not exist", identifier, false));
+			handler.outputHandler.queue(new ProtocolErrorMessage(ProtocolErrorMessage.NO_SUCH_PLUGIN, false, "Plugin '"+ plugname + "' does not exist or os not a FCP plugin", identifier, false));
 		} else {
 			handler.outputHandler.queue(new PluginInfoMessage(pi, identifier, detailed));
 		}

Modified: trunk/freenet/src/freenet/node/fcp/PluginInfoMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PluginInfoMessage.java	2007-11-18 00:05:12 UTC (rev 15810)
+++ trunk/freenet/src/freenet/node/fcp/PluginInfoMessage.java	2007-11-18 00:17:04 UTC (rev 15811)
@@ -20,20 +20,16 @@
 	private final boolean detailed;
 
 	private final String classname;
-	private final String filename;
+	private final String originuri;
+	private final long started;
 
-	private final boolean isHTTP;
-	private final boolean isFCP;
 	
 	PluginInfoMessage(PluginInfoWrapper pi, String identifier, boolean detail) {
 		this.identifier = identifier;
 		this.detailed = detail;
-		
 		classname = pi.getPluginClassName();
-		filename = pi.getFilename();
-		
-		isHTTP = pi.isPproxyPlugin();
-		isFCP = pi.isFCPPlugin();
+		originuri = pi.getFilename();
+		started = pi.getStarted();
 	}
 
 	public SimpleFieldSet getFieldSet() {
@@ -43,10 +39,9 @@
 		sfs.putSingle("PluginName", classname);
 		
 		if (detailed) {
-			sfs.putSingle("FileName", filename);
-			
-			sfs.put("IsHTTPPlugin", isHTTP);
-			sfs.put("IsFCPPlugin", isFCP);
+			sfs.putSingle("OriginUri", originuri);
+			sfs.put("Started", started);
+			//sfs.putSingle("TempFilename", tempfilename);
 		}
 		return sfs;
 	}

Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java	2007-11-18 00:05:12 UTC (rev 15810)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java	2007-11-18 00:17:04 UTC (rev 15811)
@@ -346,11 +346,11 @@
 	}
 	
 	/**
-	 * look for PluginInfo for a Plugin with given classname
+	 * look for PluginInfo for a FCPPlugin with given classname
 	 * @param plugname
 	 * @return the PluginInfo or null if not found
 	 */
-	public PluginInfoWrapper getPluginInfo(String plugname) {
+	public PluginInfoWrapper getFCPPluginInfo(String plugname) {
 		synchronized (pluginWrappers) {
 			for(int i=0;i<pluginWrappers.size();i++) {
 				PluginInfoWrapper pi = (PluginInfoWrapper) pluginWrappers.get(i);