[freenet-cvs] r20391 - in branches/db4o/freenet/src/freenet: client/async node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-06-16 22:36:04 +0000 (Mon, 16 Jun 2008)
New Revision: 20391

Modified:
   branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
More compile fixes. Remove schedulers from SimpleManifestPutter() arguments.

Modified: 
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-06-16 22:33:07 UTC (rev 20390)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-06-16 22:36:04 UTC (rev 20391)
@@ -211,8 +211,8 @@
        private boolean fetchable;
        private final boolean earlyEncode;

-       public SimpleManifestPutter(ClientCallback cb, ClientRequestScheduler 
chkSched,
-                       ClientRequestScheduler sskSched, HashMap 
manifestElements, short prioClass, FreenetURI target, 
+       public SimpleManifestPutter(ClientCallback cb, 
+                       HashMap manifestElements, short prioClass, FreenetURI 
target, 
                        String defaultName, InsertContext ctx, boolean 
getCHKOnly, RequestClient clientContext, boolean earlyEncode) throws 
InsertException {
                super(prioClass, clientContext);
                logMINOR = Logger.shouldLog(Logger.MINOR, this);

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java        
2008-06-16 22:33:07 UTC (rev 20390)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java        
2008-06-16 22:36:04 UTC (rev 20391)
@@ -50,7 +50,7 @@
                this.wasDiskPut = wasDiskPut;
                this.manifestElements = manifestElements;
                this.defaultName = message.defaultName;
-               makePutter(server);
+               makePutter();
                if(putter != null) {
                        numberOfFiles = putter.countFiles();
                        totalSize = putter.totalSize();
@@ -72,7 +72,7 @@
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
                this.manifestElements = makeDiskDirManifest(dir, "", 
allowUnreadableFiles);
                this.defaultName = defaultName;
-               makePutter(server);
+               makePutter();
                if(putter != null) {
                        numberOfFiles = putter.countFiles();
                        totalSize = putter.totalSize();
@@ -127,9 +127,9 @@
                return map;
        }

-       private void makePutter(FCPServer server) throws InsertException {
+       private void makePutter() throws InsertException {
                SimpleManifestPutter p;
-                       p = new SimpleManifestPutter(this, 
server.core.requestStarters.chkPutScheduler, 
server.core.requestStarters.sskPutScheduler,
+                       p = new SimpleManifestPutter(this, 
                                        manifestElements, priorityClass, uri, 
defaultName, ctx, getCHKOnly,
                                        client.lowLevelClient,
                                        earlyEncode);
@@ -206,7 +206,7 @@
                SimpleManifestPutter p = null;
                try {
                        if(!finished)
-                               p = new SimpleManifestPutter(this, 
server.core.requestStarters.chkPutScheduler, 
server.core.requestStarters.sskPutScheduler,
+                               p = new SimpleManifestPutter(this, 
                                                manifestElements, 
priorityClass, uri, defaultName, ctx, getCHKOnly, 
                                                client.lowLevelClient,
                                                earlyEncode);
@@ -358,7 +358,7 @@
                return true;
        }

-       public boolean restart(ObjectContainer container, ClientContext 
context) {
+       public boolean restart(ObjectContainer container, ClientContext 
context) throws InsertException {
                if(!canRestart()) return false;
                setVarsRestart();
                makePutter();

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java       
2008-06-16 22:33:07 UTC (rev 20390)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java       
2008-06-16 22:36:04 UTC (rev 20391)
@@ -5,6 +5,7 @@

 import com.db4o.ObjectContainer;

+import freenet.client.InsertException;
 import freenet.client.async.*;
 import freenet.keys.*;
 import freenet.support.*;
@@ -299,7 +300,7 @@

        public abstract boolean canRestart();

-       public abstract boolean restart(ObjectContainer container, 
ClientContext context);
+       public abstract boolean restart(ObjectContainer container, 
ClientContext context) throws InsertException;

        protected abstract FCPMessage persistentTagMessage();