Author: toad
Date: 2008-12-17 19:59:12 +0000 (Wed, 17 Dec 2008)
New Revision: 24481
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
More generics
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-17 19:57:32 UTC (rev 24480)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-17 19:59:12 UTC (rev 24481)
@@ -1026,7 +1026,7 @@
public boolean requeueAfterCooldown(Key key, long time, ObjectContainer
container, ClientContext context, SplitFileFetcherSubSegment dontDeactivate) {
if(persistent)
container.activate(this, 1);
- Vector v = null;
+ Vector<SplitFileFetcherSubSegment> v = null;
boolean notFound = true;
synchronized(this) {
if(isFinishing(container)) return false;
@@ -1046,7 +1046,7 @@
SplitFileFetcherSubSegment sub =
getSubSegment(tries, container, false, dontDeactivate);
if(logMINOR)
Logger.minor(this, "Retrying after
cooldown on "+this+": data block "+i+" on "+this+" :
tries="+tries+"/"+maxTries+" : "+sub);
- if(v == null) v = new Vector();
+ if(v == null) v = new
Vector<SplitFileFetcherSubSegment>();
sub.add(i, true, container, context, true);
if(!v.contains(sub)) v.add(sub);
notFound = false;
@@ -1070,7 +1070,7 @@
SplitFileFetcherSubSegment sub =
getSubSegment(tries, container, false, dontDeactivate);
if(logMINOR)
Logger.minor(this, "Retrying after
cooldown on "+this+": check block "+i+" on "+this+" :
tries="+tries+"/"+maxTries+" : "+sub);
- if(v == null) v = new Vector();
+ if(v == null) v = new
Vector<SplitFileFetcherSubSegment>();
sub.add(i+dataKeys.length, true, container,
context, true);
if(!v.contains(sub)) v.add(sub);
notFound = false;
@@ -1165,7 +1165,7 @@
}
public synchronized Integer[] getKeyNumbersAtRetryLevel(int retryCount)
{
- Vector v = new Vector();
+ Vector<Integer> v = new Vector<Integer>();
for(int i=0;i<dataRetries.length;i++) {
if(dataKeys[i] == null) continue;
if(dataRetries[i] == retryCount)
@@ -1253,7 +1253,7 @@
}
public Key[] listKeys(ObjectContainer container) {
- Vector v = new Vector();
+ Vector<Key> v = new Vector<Key>();
synchronized(this) {
for(int i=0;i<dataKeys.length;i++) {
if(dataKeys[i] != null) {
@@ -1270,7 +1270,7 @@
}
}
}
- return (Key[]) v.toArray(new Key[v.size()]);
+ return v.toArray(new Key[v.size()]);
}
/**
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
