[freenet-cvs] r13128 - in trunk/freenet/src/freenet: client/async support

[toad at freenetproject.org]

Author: toad
Date: 2007-05-03 18:20:00 +0000 (Thu, 03 May 2007)
New Revision: 13128

Added:
   trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithObject.java
Removed:
   trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithContextObject.java
Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
missed one

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2007-05-03 18:18:23 UTC (rev 13127)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2007-05-03 18:20:00 UTC (rev 13128)
@@ -24,7 +24,7 @@
 import freenet.node.SendableRequest;
 import freenet.support.Logger;
 import freenet.support.RandomGrabArray;
-import freenet.support.SectoredRandomGrabArrayWithContextObject;
+import freenet.support.SectoredRandomGrabArrayWithObject;
 import freenet.support.SectoredRandomGrabArrayWithInt;
 import freenet.support.SortedVectorByNumber;
 import freenet.support.api.StringCallback;
@@ -253,9 +253,9 @@
 			if(logMINOR) Logger.minor(this, "Registering retry count "+rc+" with prioclass "+priorityClass);
 		}
 		// Request
-		SectoredRandomGrabArrayWithContextObject requestGrabber = (SectoredRandomGrabArrayWithContextObject) clientGrabber.getGrabber(client);
+		SectoredRandomGrabArrayWithObject requestGrabber = (SectoredRandomGrabArrayWithObject) clientGrabber.getGrabber(client);
 		if(requestGrabber == null) {
-			requestGrabber = new SectoredRandomGrabArrayWithContextObject(client, random);
+			requestGrabber = new SectoredRandomGrabArrayWithObject(client, random);
 			clientGrabber.addGrabber(client, requestGrabber);
 		}
 		requestGrabber.add(cr, req);

Deleted: trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithContextObject.java
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithContextObject.java	2007-05-03 18:18:23 UTC (rev 13127)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithContextObject.java	2007-05-03 18:20:00 UTC (rev 13128)
@@ -1,18 +0,0 @@
-package freenet.support;
-
-import freenet.crypt.RandomSource;
-
-public class SectoredRandomGrabArrayWithContextObject extends SectoredRandomGrabArray implements RemoveRandomWithObject {
-
-	private final Object object;
-	
-	public SectoredRandomGrabArrayWithContextObject(Object object, RandomSource rand) {
-		super(rand);
-		this.object = object;
-	}
-
-	public Object getObject() {
-		return object;
-	}
-	
-}

Copied: trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithObject.java (from rev 13125, trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithContextObject.java)
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithObject.java	                        (rev 0)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArrayWithObject.java	2007-05-03 18:20:00 UTC (rev 13128)
@@ -0,0 +1,18 @@
+package freenet.support;
+
+import freenet.crypt.RandomSource;
+
+public class SectoredRandomGrabArrayWithObject extends SectoredRandomGrabArray implements RemoveRandomWithObject {
+
+	private final Object object;
+	
+	public SectoredRandomGrabArrayWithObject(Object object, RandomSource rand) {
+		super(rand);
+		this.object = object;
+	}
+
+	public Object getObject() {
+		return object;
+	}
+	
+}