Author: toad
Date: 2009-04-04 00:01:27 +0000 (Sat, 04 Apr 2009)
New Revision: 26493
Modified:
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Generics, clobbered by merge apparently
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-04-03
23:29:36 UTC (rev 26492)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-04-04
00:01:27 UTC (rev 26493)
@@ -135,7 +135,7 @@
}
}
- MultiValueTable responseHeaders = new
MultiValueTable<String, String>();
+ MultiValueTable<String, String> responseHeaders
= new MultiValueTable<String, String>();
responseHeaders.put("Location",
"/files/?key="+insertURI.toASCIIString());
ctx.sendReplyHeaders(302, "Found",
responseHeaders, null, 0);
return;
@@ -143,7 +143,7 @@
String pass = request.getPartAsString("formPassword",
32);
if ((pass.length() == 0) ||
!pass.equals(core.formPassword)) {
- MultiValueTable headers = new
MultiValueTable<String, String>();
+ MultiValueTable<String, String> headers = new
MultiValueTable<String, String>();
headers.put("Location", "/queue/");
ctx.sendReplyHeaders(302, "Found", headers,
null, 0);
if(logMINOR) Logger.minor(this, "No
formPassword: "+pass);
@@ -220,7 +220,7 @@
writePermanentRedirect(ctx, "Done",
"/queue/");
return;
}
- LinkedList<String> success = new LinkedList(),
failure = new LinkedList();
+ LinkedList<String> success = new
LinkedList<String>(), failure = new LinkedList<String>();
for(int i=0; i<keys.length; i++) {
String currentKey = keys[i];
@@ -573,18 +573,18 @@
private HTMLNode handleGetInner(PageMaker pageMaker, final
ObjectContainer container, ClientContext context, final HTTPRequest request,
ToadletContext ctx) {
// First, get the queued requests, and separate them into
different types.
- LinkedList<ClientRequest> completedDownloadToDisk = new
LinkedList();
- LinkedList<ClientRequest> completedDownloadToTemp = new
LinkedList();
- LinkedList<ClientRequest> completedUpload = new LinkedList();
- LinkedList<ClientRequest> completedDirUpload = new LinkedList();
+ LinkedList<ClientRequest> completedDownloadToDisk = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> completedDownloadToTemp = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> completedUpload = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> completedDirUpload = new
LinkedList<ClientRequest>();
- LinkedList<ClientRequest> failedDownload = new LinkedList();
- LinkedList<ClientRequest> failedUpload = new LinkedList();
- LinkedList<ClientRequest> failedDirUpload = new LinkedList();
+ LinkedList<ClientRequest> failedDownload = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> failedUpload = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> failedDirUpload = new
LinkedList<ClientRequest>();
- LinkedList<ClientRequest> uncompletedDownload = new
LinkedList();
- LinkedList<ClientRequest> uncompletedUpload = new LinkedList();
- LinkedList<ClientRequest> uncompletedDirUpload = new
LinkedList();
+ LinkedList<ClientRequest> uncompletedDownload = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> uncompletedUpload = new
LinkedList<ClientRequest>();
+ LinkedList<ClientRequest> uncompletedDirUpload = new
LinkedList<ClientRequest>();
ClientRequest[] reqs = fcp.getGlobalRequests(container);
if(Logger.shouldLog(Logger.MINOR, this))
@@ -1246,9 +1246,9 @@
/**
* List of completed request identifiers which the user hasn't
acknowledged yet.
*/
- private final HashSet<String> completedRequestIdentifiers = new
HashSet();
+ private final HashSet<String> completedRequestIdentifiers = new
HashSet<String>();
- private final HashMap<String, UserAlert> alertsByIdentifier = new
HashMap();
+ private final HashMap<String, UserAlert> alertsByIdentifier = new
HashMap<String, UserAlert>();
public void notifyFailure(ClientRequest req, ObjectContainer container)
{
// FIXME do something???
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
