Author: j16sdiz
Date: 2009-04-03 06:45:32 +0000 (Fri, 03 Apr 2009)
New Revision: 26412
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
trunk/freenet/src/freenet/client/ArchiveStoreContext.java
trunk/freenet/src/freenet/client/async/OfferedKeysList.java
trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
trunk/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
trunk/freenet/src/freenet/client/async/SimpleBlockSet.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/support/io/BucketChainBucket.java
Log:
Remove unneeded casting
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2009-04-03
06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2009-04-03
06:45:32 UTC (rev 26412)
@@ -155,7 +155,7 @@
/** Get an ArchiveHandler by key */
ArchiveStoreContext getCached(FreenetURI key) {
if(logMINOR) Logger.minor(this, "Get cached AH for "+key);
- ArchiveStoreContext handler = (ArchiveStoreContext)
archiveHandlers.get(key);
+ ArchiveStoreContext handler = archiveHandlers.get(key);
if(handler == null) return null;
archiveHandlers.push(key, handler);
return handler;
@@ -205,7 +205,7 @@
ArchiveKey k = new ArchiveKey(key, filename);
ArchiveStoreItem asi = null;
synchronized (this) {
- asi = (ArchiveStoreItem) storedData.get(k);
+ asi = storedData.get(k);
if(asi == null) return null;
// Promote to top of LRU
storedData.push(k, asi);
@@ -569,7 +569,7 @@
if(logMINOR) Logger.minor(this, "Adding error element:
"+element+" for "+key+ ' ' +name);
ArchiveStoreItem oldItem;
synchronized (this) {
- oldItem = (ArchiveStoreItem)
storedData.get(element.key);
+ oldItem = storedData.get(element.key);
storedData.push(element.key, element);
if(oldItem != null) {
oldItem.close();
Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2009-04-03
06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2009-04-03
06:45:32 UTC (rev 26412)
@@ -65,7 +65,7 @@
while(true) {
synchronized (myItems) {
// removeCachedItem() will call removeItem(),
so don't remove it here.
- item = (ArchiveStoreItem) myItems.head();
+ item = myItems.head();
}
if(item == null) break;
manager.removeCachedItem(item);
Modified: trunk/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2009-04-03
06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2009-04-03
06:45:32 UTC (rev 26412)
@@ -107,7 +107,7 @@
assert(keysList.size() == keys.size());
if(keys.size() == 1) {
// Shortcut the common case
- Key k = (Key) keysList.get(0);
+ Key k = keysList.get(0);
if(fetching.hasKey(k)) return null;
keys.remove(k);
keysList.setSize(0);
@@ -118,7 +118,7 @@
if(keysList.isEmpty()) return null;
int ptr = random.nextInt(keysList.size());
// Avoid shuffling penalty by swapping the chosen
element with the end.
- Key k = (Key) keysList.get(ptr);
+ Key k = keysList.get(ptr);
if(fetching.hasKey(k)) continue;
keysList.set(ptr, keysList.get(keysList.size()-1));
keysList.setSize(keysList.size()-1);
@@ -134,7 +134,7 @@
assert(keysList.size() == keys.size());
if(keys.size() == 1) {
// Shortcut the common case
- Key k = (Key) keysList.get(0);
+ Key k = keysList.get(0);
if(fetching.hasKey(k)) return false;
return true;
}
@@ -142,7 +142,7 @@
// Pick a random key
if(keysList.isEmpty()) return false;
int ptr = random.nextInt(keysList.size());
- Key k = (Key) keysList.get(ptr);
+ Key k = keysList.get(ptr);
if(fetching.hasKey(k)) continue;
return true;
}
Modified: trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
2009-04-03 06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/PersistentCooldownQueue.java
2009-04-03 06:45:32 UTC (rev 26412)
@@ -125,7 +125,7 @@
v.add(i.key);
}
if(!v.isEmpty()) {
- return (Key[]) v.toArray(new Key[v.size()]);
+ return v.toArray(new Key[v.size()]);
} else {
query = container.query();
query.descend("time").orderAscending().constrain(new Long(now +
dontCareAfterMillis)).smaller().
Modified:
trunk/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
2009-04-03 06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/PersistentSendableRequestSet.java
2009-04-03 06:45:32 UTC (rev 26412)
@@ -44,7 +44,7 @@
public synchronized SendableRequest[] listRequests(ObjectContainer
container) {
container.activate(list, 1);
- return (SendableRequest[]) list.toArray(new
SendableRequest[list.size()]);
+ return list.toArray(new SendableRequest[list.size()]);
}
public synchronized boolean removeRequest(SendableRequest req,
ObjectContainer container) {
Modified: trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
2009-04-03 06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
2009-04-03 06:45:32 UTC (rev 26412)
@@ -142,7 +142,7 @@
if(startPtr == endPtr) {
if(logMINOR) Logger.minor(this, "No keys
queued");
if(!v.isEmpty())
- return (Key[]) v.toArray(new
Key[v.size()]);
+ return v.toArray(new Key[v.size()]);
else
return null;
}
@@ -160,7 +160,7 @@
if(time > now) {
if(logMINOR) Logger.minor(this, "First
key is later at time "+time);
if(!v.isEmpty())
- return (Key[]) v.toArray(new
Key[v.size()]);
+ return v.toArray(new
Key[v.size()]);
else if(time < (now +
dontCareAfterMillis))
return Long.valueOf(time);
else
@@ -176,7 +176,7 @@
v.add(key);
if(v.size() == maxKeys) {
if(!v.isEmpty())
- return (Key[]) v.toArray(new
Key[v.size()]);
+ return v.toArray(new Key[v.size()]);
else return null;
}
}
Modified: trunk/freenet/src/freenet/client/async/SimpleBlockSet.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleBlockSet.java 2009-04-03
06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/SimpleBlockSet.java 2009-04-03
06:45:32 UTC (rev 26412)
@@ -26,7 +26,7 @@
}
public synchronized KeyBlock get(Key key) {
- return (KeyBlock) blocksByKey.get(key);
+ return blocksByKey.get(key);
}
public synchronized Set keys() {
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-04-03 06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2009-04-03 06:45:32 UTC (rev 26412)
@@ -980,7 +980,7 @@
int dupes = 0;
synchronized(this) {
for(int i=0;i<subSegments.size();i++) {
- sub = (SplitFileFetcherSubSegment)
subSegments.get(i);
+ sub = subSegments.get(i);
if(persistent) container.activate(sub, 1);
if(sub.retryCount == retryCount) {
if(ret != null) {
@@ -1162,7 +1162,7 @@
container.activate(subSegments, 1);
SplitFileFetcherSubSegment[] deadSegs;
synchronized(this) {
- deadSegs = (SplitFileFetcherSubSegment[])
subSegments.toArray(new SplitFileFetcherSubSegment[subSegments.size()]);
+ deadSegs = subSegments.toArray(new
SplitFileFetcherSubSegment[subSegments.size()]);
subSegments.clear();
}
if(persistent && deadSegs.length > 0)
@@ -1253,7 +1253,7 @@
}
if(v != null) {
for(int i=0;i<v.size();i++) {
- SplitFileFetcherSubSegment sub =
(SplitFileFetcherSubSegment) v.get(i);
+ SplitFileFetcherSubSegment sub = v.get(i);
if(persistent && sub != dontDeactivate)
container.activate(sub, 1);
RandomGrabArray rga = sub.getParentGrabArray();
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-04-03 06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-04-03 06:45:32 UTC (rev 26412)
@@ -155,7 +155,7 @@
int initSize = blockNums.size();
Integer prev = null;
for(int i=0;i<blockNums.size();i++) {
- Integer x = (Integer) blockNums.get(i);
+ Integer x = blockNums.get(i);
if(x == prev || x.equals(prev)) {
blockNums.remove(i);
i--;
@@ -704,7 +704,7 @@
return;
}
Integer token = Integer.valueOf(blockNo);
- ClientCHK ckey = (ClientCHK) segment.getBlockKey(blockNo,
container);
+ ClientCHK ckey = segment.getBlockKey(blockNo, container);
ClientCHKBlock cb;
try {
cb = new ClientCHKBlock((CHKBlock)block, ckey);
@@ -716,7 +716,7 @@
if(data == null) return;
if(!cb.isMetadata()) {
- onSuccess(data, false, (Integer)token,
((Integer)token).intValue(), cb, container, context);
+ onSuccess(data, false, token, (token).intValue(), cb,
container, context);
} else {
onFailure(new
FetchException(FetchException.INVALID_METADATA, "Metadata where expected
data"), token, container, context);
}
@@ -807,7 +807,7 @@
container.activate(segment, 1);
}
synchronized(segment) {
-
segment.resetCooldownTimes((Integer[])blockNums.toArray(new
Integer[blockNums.size()]));
+ segment.resetCooldownTimes(blockNums.toArray(new
Integer[blockNums.size()]));
}
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2009-04-03 06:44:51 UTC
(rev 26411)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2009-04-03 06:45:32 UTC
(rev 26412)
@@ -617,7 +617,7 @@
container.activate(globalForeverClient, 2);
}
globalForeverClient.addPersistentRequests(v, false, container);
- return (ClientRequest[]) v.toArray(new ClientRequest[v.size()]);
+ return v.toArray(new ClientRequest[v.size()]);
}
public boolean removeGlobalRequestBlocking(final String identifier)
throws MessageInvalidException {
Modified: trunk/freenet/src/freenet/support/io/BucketChainBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketChainBucket.java 2009-04-03
06:44:51 UTC (rev 26411)
+++ trunk/freenet/src/freenet/support/io/BucketChainBucket.java 2009-04-03
06:45:32 UTC (rev 26412)
@@ -329,7 +329,7 @@
public Bucket createShadow() throws IOException {
Vector newBuckets = new Vector();
for(int i=0;i<buckets.size();i++) {
- Bucket data = (Bucket) buckets.get(i);
+ Bucket data = buckets.get(i);
Bucket shadow = data.createShadow();
if(shadow == null) {
// Shadow buckets don't need to be freed.
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
