Author: juiceman
Date: 2008-12-29 22:02:35 +0000 (Mon, 29 Dec 2008)
New Revision: 24829
Modified:
trunk/freenet/src/freenet/client/FailureCodeTracker.java
trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/crypt/Util.java
trunk/freenet/src/freenet/crypt/Yarrow.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/io/comm/MessageCore.java
trunk/freenet/src/freenet/io/comm/MessageFilter.java
trunk/freenet/src/freenet/io/comm/MessageType.java
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/NodeStarter.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
Log:
Do the same for Integer
Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -38,7 +38,7 @@
int num = Integer.parseInt(name);
int count = Integer.parseInt(f.get("Count"));
if(count < 0) throw new IllegalArgumentException("Count
< 0");
- map.put(new Integer(num), new Item(count));
+ map.put(Integer.valueOf(num), new Item(count));
total += count;
}
}
Modified: trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -22,7 +22,7 @@
final int maxRetries;
private int retryCount;
final FetchContext ctx;
- static final Object[] keys = new Object[] { new Integer(0) };
+ static final Object[] keys = new Object[] { Integer.valueOf(0) };
/** It is essential that we know when the cooldown will end, otherwise
we cannot
* remove the key from the queue if we are killed before that */
long cooldownWakeupTime;
Modified: trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/async/RequestCooldownQueue.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -196,8 +196,8 @@
if(cr instanceof ClientGetter) {
String shortURI =
((ClientGetter)cr).getURI().toShortString();
Integer ctr = (Integer)
countsByShortURI.get(shortURI);
- if(ctr == null) ctr = new Integer(1);
- else ctr = new Integer(ctr.intValue()+1);
+ if(ctr == null) ctr = Integer.valueOf(1);
+ else ctr = Integer.valueOf(ctr.intValue()+1);
countsByShortURI.put(shortURI, ctr);
} else {
notGetter++;
Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -372,7 +372,7 @@
if(finished)
return new Object[] {};
else
- return new Object[] { new Integer(0) };
+ return new Object[] { Integer.valueOf(0) };
}
@Override
@@ -383,7 +383,7 @@
@Override
public synchronized Object chooseKey(KeysFetchingLocally ignored) {
if(finished) return null;
- else return new Integer(0);
+ else return Integer.valueOf(0);
}
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -711,12 +711,12 @@
for(int i=0;i<dataRetries.length;i++) {
if(dataKeys[i] == null) continue;
if(dataRetries[i] == retryCount)
- v.add(new Integer(i));
+ v.add(Integer.valueOf(i));
}
for(int i=0;i<checkRetries.length;i++) {
if(checkKeys[i] == null) continue;
if(checkRetries[i] == retryCount)
- v.add(new Integer(i+dataKeys.length));
+ v.add(Integer.valueOf(i+dataKeys.length));
}
return (Integer[]) v.toArray(new Integer[v.size()]);
}
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -350,7 +350,7 @@
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Adding block "+blockNo+" to
"+this+" dontSchedule="+dontSchedule);
if(blockNo < 0) throw new IllegalArgumentException();
- Integer i = new Integer(blockNo);
+ Integer i = Integer.valueOf(blockNo);
boolean schedule = true;
synchronized(segment) {
@@ -422,7 +422,7 @@
Logger.minor(this, "No block found for key "+key+" on
"+this);
return;
}
- Integer token = new Integer(blockNo);
+ Integer token = Integer.valueOf(blockNo);
ClientCHK ckey = (ClientCHK) segment.getBlockKey(blockNo);
ClientCHKBlock cb;
try {
Modified: trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -353,7 +353,7 @@
List<Integer> intValueList = new ArrayList<Integer>();
for (int i = 0; i < valueList.size(); i++) {
try {
- intValueList.add(new Integer(valueList.get(i)));
+
intValueList.add(Integer.valueOf(valueList.get(i)));
} catch (Exception e) {
// ignore invalid parameter values
}
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -56,7 +56,7 @@
.getParam("peernode_hashcode");
int input_hashcode = -1;
try {
- input_hashcode = (new
Integer(input_hashcode_string))
+ input_hashcode =
(Integer.valueOf(input_hashcode_string))
.intValue();
} catch (NumberFormatException e) {
// ignore here, handle below
Modified: trunk/freenet/src/freenet/crypt/Util.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Util.java 2008-12-29 21:32:32 UTC (rev
24828)
+++ trunk/freenet/src/freenet/crypt/Util.java 2008-12-29 22:02:35 UTC (rev
24829)
@@ -231,7 +231,7 @@
return (BlockCipher) Loader.getInstance(
"freenet.crypt.ciphers." + name,
new Class<?>[] { Integer.class },
- new Object[] { new Integer(keySize)});
+ new Object[] { Integer.valueOf(keySize)});
} catch (Exception e) {
//throw new UnsupportedCipherException(""+e);
e.printStackTrace();
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2008-12-29 21:32:32 UTC (rev
24828)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2008-12-29 22:02:35 UTC (rev
24829)
@@ -502,9 +502,9 @@
if(source != null) {
Integer contributedEntropy =
entropySeen.get(source);
if(contributedEntropy == null)
- contributedEntropy = new
Integer(actualEntropy);
+ contributedEntropy =
Integer.valueOf(actualEntropy);
else
- contributedEntropy = new
Integer(actualEntropy + contributedEntropy.intValue());
+ contributedEntropy =
Integer.valueOf(actualEntropy + contributedEntropy.intValue());
entropySeen.put(source,
contributedEntropy);
if(slow_entropy >= (SLOW_THRESHOLD *
2)) {
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -62,7 +62,7 @@
boolean logMINOR = Logger.shouldLog(Logger.MINOR,
Message.class);
MessageType mspec;
try {
- mspec = MessageType.getSpec(new Integer(bb.readInt()));
+ mspec = MessageType.getSpec(Integer.valueOf(bb.readInt()));
} catch (IOException e1) {
if(Logger.shouldLog(Logger.DEBUG, Message.class))
Logger.minor(Message.class,"Failed to read message
type: "+e1, e1);
@@ -185,7 +185,7 @@
}
public void set(String key, int i) {
- set(key, new Integer(i));
+ set(key, Integer.valueOf(i));
}
public void set(String key, long l) {
Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -522,9 +522,9 @@
String messageName = m.getSpec().getName();
Integer messageCount =
messageCounts.get(messageName);
if (messageCount == null) {
- messageCounts.put(messageName, new
Integer(1) );
+ messageCounts.put(messageName,
Integer.valueOf(1) );
} else {
- messageCount = new
Integer(messageCount.intValue() + 1);
+ messageCount =
Integer.valueOf(messageCount.intValue() + 1);
messageCounts.put(messageName,
messageCount );
}
}
Modified: trunk/freenet/src/freenet/io/comm/MessageFilter.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageFilter.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/io/comm/MessageFilter.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -143,7 +143,7 @@
}
public MessageFilter setField(String fieldName, int value) {
- return setField(fieldName, new Integer(value));
+ return setField(fieldName, Integer.valueOf(value));
}
public MessageFilter setField(String fieldName, long value) {
Modified: trunk/freenet/src/freenet/io/comm/MessageType.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageType.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/io/comm/MessageType.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -51,7 +51,7 @@
_name = name;
this.priority = priority;
internalOnly = internal;
- Integer id = new Integer(name.hashCode());
+ Integer id = Integer.valueOf(name.hashCode());
if (_specs.containsKey(id)) {
throw new RuntimeException("A message type by the name
of " + name + " already exists!");
}
@@ -59,7 +59,7 @@
}
public void unregister() {
- _specs.remove(new Integer(_name.hashCode()));
+ _specs.remove(Integer.valueOf(_name.hashCode()));
}
public void addLinkedListField(String name, Class<?> parameter) {
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -111,7 +111,7 @@
Buffer data = (Buffer) m1.getObject(DMT.DATA);
_prb.addPacket(packetNo, data);
// Remove it from rrmp if its in there
- _recentlyReportedMissingPackets.remove(new
Integer(packetNo));
+
_recentlyReportedMissingPackets.remove(Integer.valueOf(packetNo));
// Check that we have what the sender thinks we
have
LinkedList<Integer> missing = new
LinkedList<Integer>();
for (int x = 0; x < sent.getSize(); x++) {
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -364,7 +364,7 @@
for (File extraPeerDataFile : extraPeerDataFiles) {
Integer fileNumber;
try {
- fileNumber = new
Integer(extraPeerDataFile.getName());
+ fileNumber =
Integer.valueOf(extraPeerDataFile.getName());
} catch (NumberFormatException e) {
gotError = true;
continue;
@@ -532,7 +532,7 @@
synchronized(queuedToSendN2NMExtraPeerDataFileNumbers) {
fs.putOverwrite("extraPeerDataType",
Integer.toString(extraPeerDataType));
fs.removeValue("sentTime");
-
queuedToSendN2NMExtraPeerDataFileNumbers.add(new Integer(fileNumber));
+
queuedToSendN2NMExtraPeerDataFileNumbers.add(Integer.valueOf(fileNumber));
}
}
return true;
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -76,7 +76,7 @@
public Integer start(String[] args) {
if(args.length > 1) {
System.out.println("Usage: $ java freenet.node.Node
<configFile>");
- return new Integer(-1);
+ return Integer.valueOf(-1);
}
getExtBuild();
@@ -98,7 +98,7 @@
} catch(IOException e) {
System.out.println("Error : " + e);
e.printStackTrace();
- return new Integer(-1);
+ return Integer.valueOf(-1);
}
// First, set up logging. It is global, and may be shared
between several nodes.
@@ -111,7 +111,7 @@
} catch(InvalidConfigValueException e) {
System.err.println("Error: could not set up logging: "
+ e.getMessage());
e.printStackTrace();
- return new Integer(-2);
+ return Integer.valueOf(-2);
}
executor.start();
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-12-29 21:32:32 UTC
(rev 24828)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-12-29 22:02:35 UTC
(rev 24829)
@@ -1431,7 +1431,7 @@
* Add a PeerNode status to the map
*/
public void addPeerNodeStatus(int pnStatus, PeerNode peerNode, boolean
noLog) {
- Integer peerNodeStatus = new Integer(pnStatus);
+ Integer peerNodeStatus = Integer.valueOf(pnStatus);
addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus,
peerNodeStatuses, noLog);
if(!peerNode.isOpennet())
addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus,
peerNodeStatusesDarknet, noLog);
@@ -1462,7 +1462,7 @@
* @param darknet If true, only count darknet nodes, if false, count
all nodes.
*/
public int getPeerNodeStatusSize(int pnStatus, boolean darknet) {
- Integer peerNodeStatus = new Integer(pnStatus);
+ Integer peerNodeStatus = Integer.valueOf(pnStatus);
HashSet<PeerNode> statusSet = null;
HashMap<Integer, HashSet<PeerNode>> statuses = darknet ?
peerNodeStatusesDarknet : this.peerNodeStatuses;
synchronized(statuses) {
@@ -1479,7 +1479,7 @@
* @param isInPeers If true, complain if the node is not in the peers
list; if false, complain if it is.
*/
public void removePeerNodeStatus(int pnStatus, PeerNode peerNode,
boolean noLog) {
- Integer peerNodeStatus = new Integer(pnStatus);
+ Integer peerNodeStatus = Integer.valueOf(pnStatus);
removePeerNodeStatus(pnStatus, peerNodeStatus, peerNode,
peerNodeStatuses, noLog);
if(!peerNode.isOpennet())
removePeerNodeStatus(pnStatus, peerNodeStatus,
peerNode, peerNodeStatusesDarknet, noLog);
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -178,8 +178,8 @@
rate = 1.0*good/total;
general.report(rate);
aRate.report(rate);
- generalIds.add(new Integer(id));
- aIds.add(new Integer(id));
+ generalIds.add(Integer.valueOf(id));
+ aIds.add(Integer.valueOf(id));
}
for (int i=0; i<NUMBER_OF_NODES; i++) {
@@ -195,8 +195,8 @@
rate = 1.0*good/total;
general.report(rate);
bRate.report(rate);
- generalIds.add(new Integer(id));
- bIds.add(new Integer(id));
+ generalIds.add(Integer.valueOf(id));
+ bIds.add(Integer.valueOf(id));
}
for (int i=0; i<BRIDGES; i++) {
@@ -211,8 +211,8 @@
rate = 1.0*good/total;
general.report(rate);
bridgeRate.report(rate);
- generalIds.add(new Integer(id));
- bridgeIds.add(new Integer(id));
+ generalIds.add(Integer.valueOf(id));
+ bridgeIds.add(Integer.valueOf(id));
}
Logger.error(log, "cycle = "+cycleNumber);
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-12-29
21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-12-29
22:02:35 UTC (rev 24829)
@@ -550,7 +550,7 @@
Arrays.sort(unwantedMoveNums);
for(int i=0;i<newSize;i++) {
- Integer ii = new Integer(i);
+ Integer ii = Integer.valueOf(i);
if(Arrays.binarySearch(wantedKeepNums, ii) >= 0)
continue;
if(Arrays.binarySearch(unwantedIgnoreNums, ii) >= 0)
continue;
if(Arrays.binarySearch(wantedMoveNums, ii) >= 0)
continue;
@@ -600,7 +600,7 @@
// Can we move over an empty slot?
if(i < freeEarlySlots.length) {
// Don't need to delete old block
- unwantedBlock = new Integer((int)
freeEarlySlots[i]); // will fit in an int
+ unwantedBlock = Integer.valueOf((int)
freeEarlySlots[i]); // will fit in an int
} else if(unwantedMoveNums.length +
freeEarlySlots.length > i) {
unwantedBlock =
unwantedMoveNums[i-freeEarlySlots.length];
// Delete unwantedBlock from the store
Modified: trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2008-12-29 21:32:32 UTC (rev 24828)
+++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2008-12-29 22:02:35 UTC (rev 24829)
@@ -176,7 +176,7 @@
}
if(index == maxValue) {
for(int i=maxValue;i>=minValue;i--) {
- Integer ii = new Integer(i);
+ Integer ii = Integer.valueOf(i);
if(contents.containsKey(ii)) {
maxValue = i;
notifyAll();
@@ -189,7 +189,7 @@
}
if(index == minValue) {
for(int i=minValue;i<=maxValue;i++) {
- Integer ii = new Integer(i);
+ Integer ii = Integer.valueOf(i);
if(contents.containsKey(ii)) {
minValue = i;
notifyAll();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
