Author: saces
Date: 2009-03-31 11:50:56 +0000 (Tue, 31 Mar 2009)
New Revision: 26277
Modified:
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
add type parameters/remove unnecessary casts
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-03-31
07:38:13 UTC (rev 26276)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-03-31
11:50:56 UTC (rev 26277)
@@ -357,7 +357,7 @@
if(isGlobalQueue) {
synchronized(clientsWatchingLock) {
if(clientsWatching != null)
- clients = (FCPClient[])
clientsWatching.toArray(new FCPClient[clientsWatching.size()]);
+ clients = clientsWatching.toArray(new
FCPClient[clientsWatching.size()]);
else
clients = null;
}
@@ -395,7 +395,7 @@
if(container != null) {
container.activate(clientRequestsByIdentifier, 2);
}
- ClientRequest req = (ClientRequest)
clientRequestsByIdentifier.get(identifier);
+ ClientRequest req = clientRequestsByIdentifier.get(identifier);
if(persistenceType == ClientRequest.PERSIST_FOREVER)
container.activate(req, 1);
return req;
@@ -410,7 +410,7 @@
container.activate(toStart, 2);
}
synchronized(this) {
- reqs = (ClientRequest[]) toStart.toArray(new
ClientRequest[toStart.size()]);
+ reqs = toStart.toArray(new
ClientRequest[toStart.size()]);
toStart.clear();
container.store(toStart);
}
@@ -477,9 +477,9 @@
container.activate(clientRequestsByIdentifier, 2);
}
synchronized(this) {
- Iterator i = runningPersistentRequests.iterator();
+ Iterator<ClientRequest> i =
runningPersistentRequests.iterator();
while(i.hasNext()) {
- ClientRequest req = (ClientRequest) i.next();
+ ClientRequest req = i.next();
toKill.add(req);
}
runningPersistentRequests.clear();
@@ -488,21 +488,21 @@
completedUnackedRequests.clear();
i = clientRequestsByIdentifier.values().iterator();
while(i.hasNext()) {
- ClientRequest req = (ClientRequest) i.next();
+ ClientRequest req = i.next();
toKill.add(req);
}
clientRequestsByIdentifier.clear();
container.ext().store(clientRequestsByIdentifier, 2);
i = toStart.iterator();
while(i.hasNext()) {
- ClientRequest req = (ClientRequest) i.next();
+ ClientRequest req = i.next();
toKill.add(req);
}
toStart.clear();
}
- Iterator i = toStart.iterator();
+ Iterator<ClientRequest> i = toStart.iterator();
while(i.hasNext()) {
- ClientRequest req = (ClientRequest) i.next();
+ ClientRequest req = i.next();
req.cancel(container, context);
req.requestWasRemoved(container, context);
}
@@ -516,7 +516,7 @@
container.activate(completedUnackedRequests, 2);
}
for(int i=0;i<completedUnackedRequests.size();i++) {
- ClientRequest req = (ClientRequest)
completedUnackedRequests.get(i);
+ ClientRequest req = completedUnackedRequests.get(i);
if(!(req instanceof ClientGet)) continue;
ClientGet getter = (ClientGet) req;
if(persistenceType == ClientRequest.PERSIST_FOREVER)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
