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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-01 19:48:49 +0000 (Mon, 01 Sep 2008)
New Revision: 22310

Modified:
   branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
   branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
   branches/db4o/freenet/src/freenet/node/SendableGet.java
   branches/db4o/freenet/src/freenet/node/SendableInsert.java
   branches/db4o/freenet/src/freenet/node/SendableRequest.java
Log:
Add isInsert() to SendableRequest API.


Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2008-09-01 19:47:22 UTC (rev 22309)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2008-09-01 19:48:49 UTC (rev 22310)
@@ -199,4 +199,9 @@
                throw new UnsupportedOperationException("Transient only");
        }

+       @Override
+       public boolean isInsert() {
+               return false;
+       }
+
 }

Modified: 
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-09-01 19:47:22 UTC (rev 22309)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-09-01 19:48:49 UTC (rev 22310)
@@ -145,10 +145,6 @@
                return block;
        }

-       public boolean isInsert() {
-               return true;
-       }
-
        public short getPriorityClass(ObjectContainer container) {
                if(persistent) container.activate(parent, 1);
                return parent.getPriorityClass(); // Not much point deactivating

Modified: branches/db4o/freenet/src/freenet/node/SendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableGet.java     2008-09-01 
19:47:22 UTC (rev 22309)
+++ branches/db4o/freenet/src/freenet/node/SendableGet.java     2008-09-01 
19:48:49 UTC (rev 22310)
@@ -101,4 +101,8 @@
         */
        public abstract void requeueAfterCooldown(Key key, long time, 
ObjectContainer container, ClientContext context);

+       public final boolean isInsert() {
+               return false;
+       }
+       
 }

Modified: branches/db4o/freenet/src/freenet/node/SendableInsert.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableInsert.java  2008-09-01 
19:47:22 UTC (rev 22309)
+++ branches/db4o/freenet/src/freenet/node/SendableInsert.java  2008-09-01 
19:48:49 UTC (rev 22310)
@@ -30,4 +30,8 @@
                sched.callFailure(this, new 
LowLevelPutException(LowLevelPutException.INTERNAL_ERROR, t.getMessage(), t), 
NativeThread.MAX_PRIORITY, persistent);
        }

+       public final boolean isInsert() {
+               return true;
+       }
+       
 }

Modified: branches/db4o/freenet/src/freenet/node/SendableRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-09-01 
19:47:22 UTC (rev 22309)
+++ branches/db4o/freenet/src/freenet/node/SendableRequest.java 2008-09-01 
19:48:49 UTC (rev 22310)
@@ -126,6 +126,9 @@
        /** Is this an SSK? For purposes of determining which scheduler to use. 
*/
        public abstract boolean isSSK();

+       /** Is this an insert? For purposes of determining which scheduler to 
use. */
+       public abstract boolean isInsert();
+       
        /** Requeue after an internal error */
        public abstract void internalError(Throwable t, RequestScheduler sched, 
ObjectContainer container, ClientContext context, boolean persistent);