Author: j16sdiz
Date: 2008-09-01 07:16:36 +0000 (Mon, 01 Sep 2008)
New Revision: 22293
Modified:
trunk/freenet/src/freenet/client/DefaultMIMETypes.java
trunk/freenet/src/freenet/client/FailureCodeTracker.java
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/client/async/OfferedKeysList.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/SimpleSendableInsert.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
trunk/freenet/src/freenet/support/NumberedRecentItems.java
trunk/freenet/src/freenet/support/Serializer.java
trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
trunk/freenet/src/freenet/support/SortedVectorByNumber.java
trunk/freenet/test/freenet/support/HTMLNodeTest.java
trunk/freenet/test/freenet/support/LRUHashtableTest.java
Log:
javac warning hunt: generic and auto-boxing
Modified: trunk/freenet/src/freenet/client/DefaultMIMETypes.java
===================================================================
--- trunk/freenet/src/freenet/client/DefaultMIMETypes.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/client/DefaultMIMETypes.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -49,7 +49,7 @@
mimeTypesByNumber.add(number, null);
}
mimeTypesByNumber.set(number, type);
- mimeTypesByName.put(type, new Short(number));
+ mimeTypesByName.put(type, number);
}
/**
@@ -763,15 +763,14 @@
public synchronized static String getExtension(String type) {
short typeNumber = byName(type);
if(typeNumber < 0) return null;
- return (String) primaryExtensionByMimeNumber.get(new
Short(typeNumber));
+ return (String) primaryExtensionByMimeNumber.get(typeNumber);
}
public synchronized static boolean isValidExt(String expectedMimeType,
String oldExt) {
short typeNumber = byName(expectedMimeType);
if(typeNumber < 0) return false;
- Short s = new Short(typeNumber);
- String[] extensions = (String[])
allExtensionsByMimeNumber.get(s);
+ String[] extensions = (String[])
allExtensionsByMimeNumber.get(typeNumber);
if(extensions == null) return false;
for(int i=0;i<extensions.length;i++)
if(oldExt.equals(extensions[i])) return true;
Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -58,10 +58,9 @@
final HashMap map = new HashMap();
public synchronized void inc(int k) {
- Integer key = new Integer(k);
- Item i = (Item) map.get(key);
+ Item i = (Item) map.get(k);
if(i == null)
- map.put(key, i = new Item());
+ map.put(k, i = new Item());
i.x++;
total++;
}
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-09-01 03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-09-01 07:16:36 UTC (rev 22293)
@@ -92,16 +92,16 @@
final boolean isInsertScheduler;
final boolean isSSKScheduler;
final RandomSource random;
- private final HashMap allRequestsByClientRequest;
+ private final HashMap<ClientRequester, HashSet<SendableRequest>>
allRequestsByClientRequest;
private final RequestStarter starter;
private final Node node;
public final String name;
- private final LinkedList /* <WeakReference <RandomGrabArray> > */
recentSuccesses = new LinkedList();
+ private final LinkedList<WeakReference<RandomGrabArray>>
recentSuccesses = new LinkedList<WeakReference<RandomGrabArray>>();
private final RequestCooldownQueue cooldownQueue;
/** All pending gets by key. Used to automatically satisfy pending
requests when either the key is fetched by
* an overlapping request, or it is fetched by a request from another
node. Operations on this are synchronized on
* itself. */
- private final HashMap /* <Key, SendableGet[]> */ pendingKeys;
+ private final HashMap<Key, Object> pendingKeys;
public static final String PRIORITY_NONE = "NONE";
public static final String PRIORITY_SOFT = "SOFT";
@@ -167,11 +167,11 @@
this.isInsertScheduler = forInserts;
this.isSSKScheduler = forSSKs;
priorities = new
SortedVectorByNumber[RequestStarter.NUMBER_OF_PRIORITY_CLASSES];
- allRequestsByClientRequest = new HashMap();
+ allRequestsByClientRequest = new HashMap<ClientRequester,
HashSet<SendableRequest>>();
if(forInserts)
pendingKeys = null;
else
- pendingKeys = new HashMap();
+ pendingKeys = new HashMap<Key, Object>();
this.name = name;
sc.register(name+"_priority_policy", PRIORITY_HARD,
name.hashCode(), true, false,
@@ -303,9 +303,9 @@
private synchronized void innerRegister(SendableRequest req) {
if(logMINOR) Logger.minor(this, "Still registering "+req+" at
prio "+req.getPriorityClass()+" retry "+req.getRetryCount()+" for
"+req.getClientRequest());
addToGrabArray(req.getPriorityClass(), req.getRetryCount(),
req.getClient(), req.getClientRequest(), req);
- HashSet v = (HashSet)
allRequestsByClientRequest.get(req.getClientRequest());
+ HashSet<SendableRequest> v =
allRequestsByClientRequest.get(req.getClientRequest());
if(v == null) {
- v = new HashSet();
+ v = new HashSet<SendableRequest>();
allRequestsByClientRequest.put(req.getClientRequest(),
v);
}
v.add(req);
@@ -455,8 +455,8 @@
synchronized(this) {
if(!recentSuccesses.isEmpty()) {
if(random.nextBoolean()) {
- WeakReference
ref = (WeakReference) (recentSuccesses.removeLast());
- altRGA =
(RandomGrabArray) ref.get();
+
WeakReference<RandomGrabArray> ref = recentSuccesses.removeLast();
+ altRGA =
ref.get();
}
}
}
@@ -472,7 +472,7 @@
} else {
if(altReq != null) {
synchronized(this) {
-
recentSuccesses.addLast(new WeakReference(altRGA));
+
recentSuccesses.addLast(new WeakReference<RandomGrabArray>(altRGA));
}
if(logMINOR)
Logger.minor(this, "Chosen req "+req+" is better, reregistering recently
succeeded "+altReq);
@@ -486,7 +486,7 @@
ClientRequester cr =
req.getClientRequest();
if(req.canRemove()) {
synchronized(this) {
- HashSet v = (HashSet)
allRequestsByClientRequest.get(cr);
+
HashSet<SendableRequest> v = allRequestsByClientRequest.get(cr);
if(v == null) {
Logger.error(this, "No HashSet registered for "+cr);
} else {
@@ -594,9 +594,9 @@
public void reregisterAll(ClientRequester request) {
SendableRequest[] reqs;
synchronized(this) {
- HashSet h = (HashSet)
allRequestsByClientRequest.get(request);
+ HashSet<SendableRequest> h =
allRequestsByClientRequest.get(request);
if(h == null) return;
- reqs = (SendableRequest[]) h.toArray(new
SendableRequest[h.size()]);
+ reqs = h.toArray(new SendableRequest[h.size()]);
}
for(int i=0;i<reqs.length;i++) {
@@ -617,7 +617,7 @@
synchronized(this) {
if(logMINOR)
Logger.minor(this, "Recording successful fetch
from "+parentGrabArray);
- recentSuccesses.addFirst(new
WeakReference(parentGrabArray));
+ recentSuccesses.addFirst(new
WeakReference<RandomGrabArray>(parentGrabArray));
while(recentSuccesses.size() > 8)
recentSuccesses.removeLast();
}
Modified: trunk/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/client/async/OfferedKeysList.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -31,23 +31,23 @@
*/
public class OfferedKeysList extends BaseSendableGet {
- private final HashSet keys;
- private final Vector keysList; // O(1) remove random element the way we
use it, see chooseKey().
+ private final HashSet<Key> keys;
+ private final Vector<Key> keysList; // O(1) remove random element the
way we use it, see chooseKey().
private static boolean logMINOR;
private final RandomSource random;
private final short priorityClass;
private final NodeClientCore core;
OfferedKeysList(NodeClientCore core, RandomSource random, short
priorityClass) {
- this.keys = new HashSet();
- this.keysList = new Vector();
+ this.keys = new HashSet<Key>();
+ this.keysList = new Vector<Key>();
this.random = random;
this.priorityClass = priorityClass;
this.core = core;
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
- /** Called when a key is found, when it no longer belogns to this list
etc. */
+ /** Called when a key is found, when it no longer belongs to this list
etc. */
public synchronized void remove(Key key) {
assert(keysList.size() == keys.size());
logMINOR = Logger.shouldLog(Logger.MINOR, this);
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-01 03:48:27 UTC
(rev 22292)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-01 07:16:36 UTC
(rev 22293)
@@ -511,7 +511,7 @@
node.usm.send(this, n2nm, null);
Logger.normal(this, "Sent
queued ("+fileNumber+") N2NM to '"+getName()+"': "+n2nm);
sendSuccess = true;
-
queuedToSendN2NMExtraPeerDataFileNumbers.remove(new Integer(fileNumber));
+
queuedToSendN2NMExtraPeerDataFileNumbers.remove(fileNumber);
}
deleteExtraPeerDataFile(fileNumber);
} catch (NotConnectedException e) {
@@ -558,7 +558,7 @@
}
nextFileNumber = localFileNumbers[i].intValue()
+ 1;
}
- extraPeerDataFileNumbers.add(new
Integer(nextFileNumber));
+ extraPeerDataFileNumbers.add(nextFileNumber);
}
FileOutputStream fos;
File extraPeerDataFile = new
File(extraPeerDataPeerDir.getPath()+File.separator+nextFileNumber);
@@ -613,7 +613,7 @@
return;
}
synchronized(extraPeerDataFileNumbers) {
- extraPeerDataFileNumbers.remove(new
Integer(fileNumber));
+ extraPeerDataFileNumbers.remove(fileNumber);
}
if(!extraPeerDataFile.delete()) {
if(extraPeerDataFile.exists()) {
@@ -724,7 +724,7 @@
public void queueN2NM(SimpleFieldSet fs) {
int fileNumber = writeNewExtraPeerDataFile( fs,
Node.EXTRA_PEER_DATA_TYPE_QUEUED_TO_SEND_N2NM);
synchronized(queuedToSendN2NMExtraPeerDataFileNumbers) {
- queuedToSendN2NMExtraPeerDataFileNumbers.add(new
Integer(fileNumber));
+
queuedToSendN2NMExtraPeerDataFileNumbers.add(fileNumber);
}
}
@@ -767,9 +767,9 @@
// FIXME this should be persistent across node restarts
/** Files I have offered to this peer */
- private final HashMap myFileOffersByUID = new HashMap();
+ private final HashMap<Long, FileOffer> myFileOffersByUID = new
HashMap<Long, FileOffer>();
/** Files this peer has offered to me */
- private final HashMap hisFileOffersByUID = new HashMap();
+ private final HashMap<Long, FileOffer> hisFileOffersByUID = new
HashMap<Long, FileOffer>();
private void storeOffers() {
// FIXME do something
@@ -870,10 +870,9 @@
}
protected void remove() {
- Long l = new Long(uid);
synchronized(DarknetPeerNode.this) {
- myFileOffersByUID.remove(l);
- hisFileOffersByUID.remove(l);
+ myFileOffersByUID.remove(uid);
+ hisFileOffersByUID.remove(uid);
}
data.close();
}
@@ -1342,7 +1341,7 @@
RandomAccessThing data = new RandomAccessFileWrapper(filename,
"r");
FileOffer fo = new FileOffer(uid, data, fnam, mime, message);
synchronized(this) {
- myFileOffersByUID.put(new Long(uid), fo);
+ myFileOffersByUID.put(uid, fo);
}
storeOffers();
long now = System.currentTimeMillis();
@@ -1406,9 +1405,10 @@
Logger.error(this, "Could not parse offer: "+e+" on
"+this+" :\n"+fs, e);
return;
}
- Long u = new Long(offer.uid);
- synchronized(this) {
- if(hisFileOffersByUID.containsKey(u)) return; // Ignore
re-advertisement
+ Long u = offer.uid;
+ synchronized (this) {
+ if (hisFileOffersByUID.containsKey(u))
+ return; // Ignore re-advertisement
hisFileOffersByUID.put(u, offer);
}
@@ -1425,7 +1425,7 @@
Logger.minor(this, "Accepting transfer "+id+" on
"+this);
FileOffer fo;
synchronized(this) {
- fo = (FileOffer) hisFileOffersByUID.get(new Long(id));
+ fo = hisFileOffersByUID.get(id);
}
fo.accept();
}
@@ -1433,7 +1433,7 @@
public void rejectTransfer(long id) {
FileOffer fo;
synchronized(this) {
- fo = (FileOffer) hisFileOffersByUID.remove(new
Long(id));
+ fo = hisFileOffersByUID.remove(id);
}
fo.reject();
}
@@ -1451,10 +1451,9 @@
}
if(logMINOR)
Logger.minor(this, "Offer accepted for "+uid);
- Long u = new Long(uid);
FileOffer fo;
synchronized(this) {
- fo = (FileOffer) (myFileOffersByUID.get(u));
+ fo = (myFileOffersByUID.get(uid));
}
if(fo == null) {
Logger.error(this, "No such offer: "+uid);
@@ -1486,7 +1485,7 @@
FileOffer fo;
synchronized(this) {
- fo = (FileOffer) myFileOffersByUID.remove(new
Long(uid));
+ fo = myFileOffersByUID.remove(uid);
}
fo.onRejected();
}
Modified: trunk/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- trunk/freenet/src/freenet/node/SimpleSendableInsert.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/node/SimpleSendableInsert.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -120,16 +120,17 @@
public synchronized Object[] allKeys() {
if(finished) return new Object[] {};
- return new Object[] { new Integer(0) };
+ return new Object[] { 0 };
}
public synchronized Object[] sendableKeys() {
if(finished) return new Object[] {};
- return new Object[] { new Integer(0) };
+ return new Object[] { 0 };
}
public synchronized Object chooseKey(KeysFetchingLocally keys) {
if(finished) return null;
- else return new Integer(0);
+ else
+ return 0;
}
}
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -731,7 +731,7 @@
if (!comment && (type != 0)) {
if (sb.length() > 0) {
strVec.addElement(sb.toString());
- fmtVec.addElement(new Integer(0));
+ fmtVec.addElement((int) 0);
sb = new StringBuilder();
}
fmtVec.addElement(new Integer(type));
Modified: trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2008-09-01 03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2008-09-01 07:16:36 UTC (rev 22293)
@@ -18,7 +18,7 @@
public class LimitedRangeIntByteArrayMap {
private static boolean logMINOR;
- private final HashMap contents;
+ private final HashMap<Integer, LimitedRangeIntByteArrayMapElement>
contents;
private int minValue;
private int maxValue;
private final int maxRange;
@@ -27,7 +27,7 @@
public LimitedRangeIntByteArrayMap(int maxRange) {
this.maxRange = maxRange;
- contents = new HashMap();
+ contents = new HashMap<Integer, LimitedRangeIntByteArrayMapElement>();
minValue = -1;
maxValue = -1;
flag = false;
@@ -43,32 +43,29 @@
}
public synchronized byte[] get(int index) {
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement wrapper =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ LimitedRangeIntByteArrayMapElement wrapper = contents.get(index);
if(wrapper != null)
return wrapper.data;
else return null;
}
public synchronized AsyncMessageCallback[] getCallbacks(int index) {
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement wrapper =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ LimitedRangeIntByteArrayMapElement wrapper = contents.get(index);
if(wrapper != null)
return wrapper.callbacks;
else return null;
}
public synchronized long getTime(int index) {
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement wrapper =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ LimitedRangeIntByteArrayMapElement wrapper = contents.get(index);
if(wrapper != null)
return wrapper.createdTime;
else return -1;
}
public short getPriority(int index, short defaultValue) {
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement wrapper =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ Integer i = index;
+ LimitedRangeIntByteArrayMapElement wrapper = contents.get(i);
if(wrapper != null)
return wrapper.priority;
else return defaultValue;
@@ -78,8 +75,7 @@
* Get the time at which an index was re-added last.
*/
public synchronized long getReaddedTime(int index) {
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement wrapper =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ LimitedRangeIntByteArrayMapElement wrapper = contents.get(index);
if(wrapper != null)
return wrapper.reputTime;
else return -1;
@@ -108,10 +104,9 @@
minValue = index;
}
if(data == null) throw new NullPointerException();
- Integer i = new Integer(index);
- LimitedRangeIntByteArrayMapElement le =
(LimitedRangeIntByteArrayMapElement) contents.get(i);
+ LimitedRangeIntByteArrayMapElement le = contents.get(index);
if(le == null)
- contents.put(new Integer(index), new
LimitedRangeIntByteArrayMapElement(index, data, callbacks, priority));
+ contents.put(index, new
LimitedRangeIntByteArrayMapElement(index, data, callbacks, priority));
else
le.reput();
notifyAll();
@@ -166,7 +161,7 @@
*/
public synchronized boolean remove(int index) {
if(logMINOR) Logger.minor(this, "Removing "+index+" - min="+minValue+"
max="+maxValue);
- if(contents.remove(new Integer(index)) != null) {
+ if (contents.remove(index) != null) {
if((index > minValue) && (index < maxValue)) return true;
if(contents.size() == 0) {
minValue = maxValue = -1;
Modified: trunk/freenet/src/freenet/support/NumberedRecentItems.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedRecentItems.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/support/NumberedRecentItems.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -29,7 +29,7 @@
}
public synchronized NumberedItem get(int num) {
- int x = java.util.Arrays.binarySearch(items, new Integer(num),
myComparator);
+ int x = Arrays.binarySearch(items, num, myComparator);
if(x >= 0) return items[x];
return null;
}
@@ -42,7 +42,7 @@
*/
public synchronized boolean add(NumberedItem item) {
long num = item.getNumber();
- int x = Arrays.binarySearch(items, new Long(num), myComparator);
+ int x = Arrays.binarySearch(items, num, myComparator);
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Search pos: "+x);
if(x >= 0) return false; // already present
@@ -97,7 +97,7 @@
}
public synchronized NumberedItem[] getAfter(long target) {
- int x = Arrays.binarySearch(items, new Long(target), myComparator);
+ int x = Arrays.binarySearch(items, target, myComparator);
if(x == items.length-1) return null;
if(x >= 0) {
NumberedItem[] out = new NumberedItem[items.length-x-1];
Modified: trunk/freenet/src/freenet/support/Serializer.java
===================================================================
--- trunk/freenet/src/freenet/support/Serializer.java 2008-09-01 03:48:27 UTC
(rev 22292)
+++ trunk/freenet/src/freenet/support/Serializer.java 2008-09-01 07:16:36 UTC
(rev 22293)
@@ -63,15 +63,15 @@
throw new IOException("Boolean is non boolean value:
"+bool);
} else if (type.equals(Byte.class)) {
int b = dis.readByte();
- return new Byte((byte) b);
+ return (byte) b;
} else if (type.equals(Short.class)) {
- return new Short(dis.readShort());
+ return dis.readShort();
} else if (type.equals(Integer.class)) {
- return new Integer(dis.readInt());
+ return dis.readInt();
} else if (type.equals(Long.class)) {
- return new Long(dis.readLong());
+ return dis.readLong();
} else if (type.equals(Double.class)) {
- return new Double(dis.readDouble());
+ return dis.readDouble();
} else if (type.equals(String.class)) {
int length = dis.readInt();
StringBuffer sb = new StringBuffer(length);
Modified: trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
2008-09-01 03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/support/SimpleIntNumberedItemComparator.java
2008-09-01 07:16:36 UTC (rev 22293)
@@ -2,7 +2,7 @@
import java.util.Comparator;
-public class SimpleIntNumberedItemComparator implements Comparator {
+public class SimpleIntNumberedItemComparator implements Comparator<Object> {
private final boolean nullAtStart;
Modified: trunk/freenet/src/freenet/support/SortedVectorByNumber.java
===================================================================
--- trunk/freenet/src/freenet/support/SortedVectorByNumber.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/src/freenet/support/SortedVectorByNumber.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -11,7 +11,7 @@
private IntNumberedItem[] data;
private int length;
- private static final Comparator comparator = new
SimpleIntNumberedItemComparator(true);
+ private static final Comparator<Object> comparator = new
SimpleIntNumberedItemComparator(true);
private static final int MIN_SIZE = 4;
public SortedVectorByNumber() {
@@ -28,15 +28,15 @@
return length == 0;
}
- public synchronized IntNumberedItem get(int retryCount) {
- int x = Arrays.binarySearch(data, new Integer(retryCount),
comparator);
+ public synchronized IntNumberedItem get(int item) {
+ int x = Arrays.binarySearch(data, item, comparator);
if(x >= 0)
return data[x];
return null;
}
public synchronized void remove(int item) {
- int x = Arrays.binarySearch(data, new Integer(item),
comparator);
+ int x = Arrays.binarySearch(data, item, comparator);
if(x >= 0) {
if(x < length-1)
System.arraycopy(data, x+1, data, x,
length-x-1);
@@ -70,7 +70,7 @@
* @return True if we added the item.
*/
public synchronized boolean push(IntNumberedItem grabber) {
- int x = Arrays.binarySearch(data, new
Integer(grabber.getNumber()), comparator);
+ int x = Arrays.binarySearch(data, grabber.getNumber(),
comparator);
if(x >= 0) return false;
// insertion point
x = -x-1;
@@ -79,7 +79,7 @@
}
public synchronized void add(IntNumberedItem grabber) {
- int x = Arrays.binarySearch(data, new
Integer(grabber.getNumber()), comparator);
+ int x = Arrays.binarySearch(data, grabber.getNumber(),
comparator);
if(x >= 0) {
if(grabber != data[x])
throw new IllegalArgumentException(); //
already exists
Modified: trunk/freenet/test/freenet/support/HTMLNodeTest.java
===================================================================
--- trunk/freenet/test/freenet/support/HTMLNodeTest.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/test/freenet/support/HTMLNodeTest.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -211,11 +211,11 @@
HTMLNode methodHTMLNode = new HTMLNode(SAMPLE_OKAY_NODE_NAME);
methodHTMLNode.addChild(SAMPLE_OKAY_NODE_NAME,
SAMPLE_OKAY_ATTRIBUTE_NAME,
SAMPLE_ATTRIBUTE_VALUE);
- List childrenList = methodHTMLNode.children;
+ List<HTMLNode> childrenList = methodHTMLNode.children;
assertEquals(1,childrenList.size());
assertEquals(generateNoContentNodeOutput(SAMPLE_OKAY_NODE_NAME,
SAMPLE_OKAY_ATTRIBUTE_NAME,SAMPLE_ATTRIBUTE_VALUE),
- ((HTMLNode)childrenList.get(0)).generate());
+ childrenList.get(0).generate());
}
/**
@@ -228,12 +228,12 @@
methodHTMLNode.addChild(SAMPLE_OKAY_NODE_NAME,
SAMPLE_OKAY_ATTRIBUTE_NAME,
SAMPLE_ATTRIBUTE_VALUE,
SAMPLE_NODE_CONTENT);
- List childrenList = methodHTMLNode.children;
+ List<HTMLNode> childrenList = methodHTMLNode.children;
assertEquals(1,childrenList.size());
assertEquals(generateFullNodeOutput(SAMPLE_OKAY_NODE_NAME,
SAMPLE_OKAY_ATTRIBUTE_NAME,
SAMPLE_ATTRIBUTE_VALUE,
SAMPLE_NODE_CONTENT),
-
((HTMLNode)childrenList.get(0)).generate());
+ childrenList.get(0).generate());
}
/**
@@ -274,9 +274,9 @@
* @param attributesValues the attributes values to check
*/
private void testSingleChildAttributes(HTMLNode aHTMLNode,String[]
attibutesNames, String[] attributesValues) {
- List childrenList = aHTMLNode.children;
+ List<HTMLNode> childrenList = aHTMLNode.children;
assertEquals(1,childrenList.size());
- HTMLNode childHTMLNode = (HTMLNode)childrenList.get(0);
+ HTMLNode childHTMLNode = childrenList.get(0);
assertEquals(attibutesNames.length,childHTMLNode.getAttributes().size());
for(int i = 0 ; i<attibutesNames.length;i++)
assertEquals(attributesValues[i],
@@ -296,7 +296,7 @@
//since the HTMLNode name is not "#", or "%",
//the content will be a new child with the "#" name
assertEquals(SAMPLE_NODE_CONTENT,
-
((HTMLNode)(methodHTMLNode.children.get(0))).getContent());
+ methodHTMLNode.children.get(0).getContent());
assertNull(methodHTMLNode.getContent());
methodHTMLNode = new HTMLNode("#",SAMPLE_NODE_CONTENT);
Modified: trunk/freenet/test/freenet/support/LRUHashtableTest.java
===================================================================
--- trunk/freenet/test/freenet/support/LRUHashtableTest.java 2008-09-01
03:48:27 UTC (rev 22292)
+++ trunk/freenet/test/freenet/support/LRUHashtableTest.java 2008-09-01
07:16:36 UTC (rev 22293)
@@ -50,8 +50,8 @@
* @param size HashTable size
* @return the created LRUHashtable
*/
- private LRUHashtable createSampleHashTable(int size) {
- LRUHashtable methodLRUht = new LRUHashtable();
+ private LRUHashtable<Object, Object> createSampleHashTable(int size) {
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects = createSampleKeyVal(size);
for (int i=0;i<sampleObjects.length;i++)
methodLRUht.push(sampleObjects[i][0],sampleObjects[i][1]);
@@ -66,7 +66,7 @@
* @param aValue the correspondent value
* @return true if the key is present and returned value is the same as
in the argument
*/
- private boolean verifyKeyValPresence(LRUHashtable aLRUht, Object aKey,
Object aValue) {
+ private boolean verifyKeyValPresence(LRUHashtable<Object, Object>
aLRUht, Object aKey, Object aValue) {
if (aLRUht.containsKey(aKey))
return aLRUht.get(aKey).equals(aValue);
return false;
@@ -80,7 +80,7 @@
* is raised
*/
public void testPushNull() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
try {
//a null value is admitted
methodLRUht.push(new Object(),null);}
@@ -104,7 +104,7 @@
* time.
*/
public void testPushSameObjTwice() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
Object[][] sampleObj = {
{ new Integer(sampleElemsNumber), new Object()
},
{ new Integer(sampleElemsNumber+1), new
Object() } };
@@ -132,7 +132,7 @@
* values.
*/
public void testPushSameKey() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
Object[][] sampleObj = {
{ new Integer(sampleElemsNumber), new Object()
},
{ new Integer(sampleElemsNumber+1), new
Object() } };
@@ -162,7 +162,7 @@
* HashTable entry deleted
*/
public void testPopKey() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -182,7 +182,7 @@
* HashTable entry deleted
*/
public void testPopValue() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -210,7 +210,7 @@
* verifying if their peekValue is correct
*/
public void testPeekValue() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -232,7 +232,7 @@
* the LRUHashTable
*/
public void testSize() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
assertTrue(methodLRUht.size()==0);
//pushing objects
@@ -253,7 +253,7 @@
* the HashTable size.
*/
public void testRemoveKey() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -271,7 +271,7 @@
* setting up a sample queue.
*/
public void testRemoveNullKey() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
try {
methodLRUht.removeKey(null);
fail("Expected Exception Error Not Thrown!"); }
@@ -285,7 +285,7 @@
* setting up a sample LRUHashtable.
*/
public void testRemoveNotPresent() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
assertFalse(methodLRUht.removeKey(new Object()));
}
@@ -296,7 +296,7 @@
* Then it search for a present one.
*/
public void testContainsKey() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
assertFalse(methodLRUht.containsKey(new Object()));
Object methodSampleObj = new Object();
methodLRUht.push(methodSampleObj,null);
@@ -310,7 +310,7 @@
* then it search a present key.
*/
public void testGet() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
assertNull(methodLRUht.get(new Object()));
Object methodSampleKey = new Object();
Object methodSampleValue = new Object();
@@ -323,7 +323,7 @@
* a null key.
*/
public void testGetNullKey() {
- LRUHashtable methodLRUht =
createSampleHashTable(sampleElemsNumber);
+ LRUHashtable<Object, Object> methodLRUht =
createSampleHashTable(sampleElemsNumber);
try {
methodLRUht.get(null);
fail("Expected Exception Error Not Thrown!"); }
@@ -337,7 +337,7 @@
* is correct
*/
public void testKeys() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
Object[][] sampleObjects =
createSampleKeyVal(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -356,7 +356,7 @@
* out all keys in a sample LRUHashTable
*/
public void testIsEmpty() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<Object, Object> methodLRUht = new
LRUHashtable<Object, Object>();
assertTrue(methodLRUht.isEmpty());
methodLRUht = createSampleHashTable(sampleElemsNumber);
//popping keys
