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

[t...@freenetproject.org]

Author: toad
Date: 2008-10-02 22:23:07 +0000 (Thu, 02 Oct 2008)
New Revision: 22924

Modified:
   branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
   branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
   branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
   
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
   branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
Log:
Remove implementations of canRemove().


Modified: 
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-10-02 22:20:35 UTC (rev 22923)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-10-02 22:23:07 UTC (rev 22924)
@@ -191,11 +191,6 @@
                return !ctx.cacheLocalRequests;
        }

-       public boolean canRemove(ObjectContainer container) {
-               // Simple request, once it's sent, it's sent. May be requeued 
at a different # retries.
-               return true;
-       }
-
        public void onGotKey(Key key, KeyBlock block, ObjectContainer 
container, ClientContext context) {
                if(persistent) {
                        container.activate(this, 1);

Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2008-10-02 22:20:35 UTC (rev 22923)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2008-10-02 22:23:07 UTC (rev 22924)
@@ -178,10 +178,6 @@
                };
        }

-       public boolean canRemove(ObjectContainer container) {
-               return false;
-       }
-
        @Override
        public boolean isCancelled(ObjectContainer container) {
                return false;

Modified: 
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-10-02 22:20:35 UTC (rev 22923)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-10-02 22:23:07 UTC (rev 22924)
@@ -404,10 +404,6 @@
                }
        }

-       public boolean canRemove(ObjectContainer container) {
-               return true;
-       }
-
        @Override
        public synchronized Object[] sendableKeys(ObjectContainer container) {
                if(finished)

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-10-02 22:20:35 UTC (rev 22923)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-10-02 22:23:07 UTC (rev 22924)
@@ -468,20 +468,6 @@
                return retryCount;
        }

-       public boolean canRemove(ObjectContainer container) {
-               if(persistent)
-                       container.activate(blockNums, 1);
-               synchronized(segment) {
-                       if(blockNums.size() < 2) {
-                               // Can be removed, if the one key is processed.
-                               // Once it has been processed, we may need to 
be reinstated.
-                               if(Logger.shouldLog(Logger.MINOR, this))
-                                       Logger.minor(this, "Can remove "+this+" 
in canRemove()");
-                               return true;
-                       } else return false;
-               }
-       }
-
        @Override
        public boolean isCancelled(ObjectContainer container) {
                if(persistent) {

Modified: branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java    
2008-10-02 22:20:35 UTC (rev 22923)
+++ branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java    
2008-10-02 22:23:07 UTC (rev 22924)
@@ -123,10 +123,6 @@
                return finished;
        }

-       public boolean canRemove(ObjectContainer container) {
-               return true;
-       }
-
        public void schedule() {
                finished = false; // can reschedule
                scheduler.registerInsert(this, false, false, null);