Author: bombe
Date: 2006-08-04 06:25:19 +0000 (Fri, 04 Aug 2006)
New Revision: 9877
Modified:
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
sort requests by identifier
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-04
00:13:58 UTC (rev 9876)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-08-04
06:25:19 UTC (rev 9877)
@@ -5,6 +5,8 @@
import java.net.MalformedURLException;
import java.net.URI;
import java.text.NumberFormat;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
@@ -206,7 +208,25 @@
}
}
+ Comparator identifierComparator = new Comparator() {
+ public int compare(Object first, Object second) {
+ ClientRequest firstRequest = (ClientRequest)
first;
+ ClientRequest secondRequest = (ClientRequest)
second;
+ return
firstRequest.getIdentifier().compareTo(secondRequest.getIdentifier());
+ }
+ };
+ Collections.sort(completedDownloadToDisk, identifierComparator);
+ Collections.sort(completedDownloadToTemp, identifierComparator);
+ Collections.sort(completedUpload, identifierComparator);
+ Collections.sort(completedDirUpload, identifierComparator);
+ Collections.sort(failedDownload, identifierComparator);
+ Collections.sort(failedUpload, identifierComparator);
+ Collections.sort(failedDirUpload, identifierComparator);
+ Collections.sort(uncompletedDownload, identifierComparator);
+ Collections.sort(uncompletedUpload, identifierComparator);
+ Collections.sort(uncompletedDirUpload, identifierComparator);
+
ctx.getPageMaker().makeHead(buf,
"("+(uncompletedDirUpload.size()+uncompletedDownload.size()+uncompletedUpload.size())+
"/"+(failedDirUpload.size()+failedDownload.size()+failedUpload.size())+
"/"+(completedDirUpload.size()+completedDownloadToDisk.size()+completedDownloadToTemp.size()+completedUpload.size())+
