[freenet-cvs] r16021 - trunk/freenet/src/freenet/pluginmanager

[sa...@freenetproject.org]

Author: saces
Date: 2007-11-28 15:35:43 +0000 (Wed, 28 Nov 2007)
New Revision: 16021

Modified:
   trunk/freenet/src/freenet/pluginmanager/FredPluginFCP.java
   trunk/freenet/src/freenet/pluginmanager/PluginTalker.java
Log:
FredPluginFCP: change access flag type to int

Modified: trunk/freenet/src/freenet/pluginmanager/FredPluginFCP.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/FredPluginFCP.java  2007-11-28 
15:35:17 UTC (rev 16020)
+++ trunk/freenet/src/freenet/pluginmanager/FredPluginFCP.java  2007-11-28 
15:35:43 UTC (rev 16021)
@@ -17,12 +17,16 @@
  */
 public interface FredPluginFCP {

+       public static final int ACCESS_DIRECT = 0;
+       public static final int ACCESS_FCP_RESTRICTED = 1;
+       public static final int ACCESS_FCP_FULL = 2;
+       
        /**
         * @param replysender interface to send a reply
         * @param params parameters passed in
         * @param data a bucket of data passed in, can be null
-        * @param access null - direct call (plugin to plugin), if set: FCP 
full access 
+        * @param access 0: direct call (plugin to plugin), 1: FCP restricted 
access,  2: FCP full access  
         */
-       void handle(PluginReplySender replysender, SimpleFieldSet params, 
Bucket data, Boolean access);
+       void handle(PluginReplySender replysender, SimpleFieldSet params, 
Bucket data, int accesstype);

 }

Modified: trunk/freenet/src/freenet/pluginmanager/PluginTalker.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginTalker.java   2007-11-28 
15:35:17 UTC (rev 16020)
+++ trunk/freenet/src/freenet/pluginmanager/PluginTalker.java   2007-11-28 
15:35:43 UTC (rev 16021)
@@ -18,21 +18,21 @@
        Node node;
        private PluginReplySender replysender;

-       private Boolean access;
+       private int access;

        FredPluginFCP plugin;

        PluginTalker(FredPluginTalker fpt, Node node2, String pluginname2, 
String identifier2) throws PluginNotFoundException {
                node = node2;
                plugin = findPlugin(pluginname2);
-               access = null;
+               access = FredPluginFCP.ACCESS_DIRECT;
                replysender = new PluginReplySenderDirect(node2, fpt, 
pluginname2, identifier2);
        }

        public PluginTalker(Node node2, FCPConnectionHandler handler, String 
pluginname2, String identifier2, boolean access2) throws 
PluginNotFoundException {
                node = node2;
                plugin = findPlugin(pluginname2);
-               access = new Boolean(access2);
+               access = access2 ? FredPluginFCP.ACCESS_FCP_FULL : 
FredPluginFCP.ACCESS_FCP_RESTRICTED;
                replysender = new PluginReplySenderFCP(handler, pluginname2, 
identifier2);
        }