zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unnecessary casts (eclipse)

Browse Source
This commit is contained in:
zzz
2012-03-25 20:42:41 +00:00
parent ed13424913
commit 3e889d2747
59 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
View File

@@ -218,7 +218,7 @@ public class MetaInfo
if (l < oldTotal)
throw new InvalidBEncodingException("Huge total length");
val = (BEValue)desc.get("path");
val = desc.get("path");
if (val == null)
throw new InvalidBEncodingException("Missing path list");
List<BEValue> path_list = val.getList();
@@ -244,7 +244,7 @@ public class MetaInfo
m_files.add(Collections.unmodifiableList(file));
val = (BEValue)desc.get("path.utf-8");
val = desc.get("path.utf-8");
if (val != null) {
path_list = val.getList();
path_length = path_list.size();

2
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
View File

@@ -143,7 +143,7 @@ class PeerConnectionOut implements Runnable
}
}
if (m == null && !sendQueue.isEmpty()) {
m = (Message)sendQueue.remove(0);
m = sendQueue.remove(0);
//SimpleTimer.getInstance().removeEvent(m.expireEvent);
}
}

6
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -662,7 +662,7 @@ public class SnarkManager implements Snark.CompleteListener {
File dataDir = getDataDir();
Snark torrent = null;
synchronized (_snarks) {
torrent = (Snark)_snarks.get(filename);
torrent = _snarks.get(filename);
}
// don't hold the _snarks lock while verifying the torrent
if (torrent == null) {
@@ -1132,9 +1132,9 @@ public class SnarkManager implements Snark.CompleteListener {
Snark torrent = null;
synchronized (_snarks) {
if (shouldRemove)
torrent = (Snark)_snarks.remove(filename);
torrent = _snarks.remove(filename);
else
torrent = (Snark)_snarks.get(filename);
torrent = _snarks.get(filename);
remaining = _snarks.size();
}
if (torrent != null) {

2
apps/i2psnark/java/src/org/klomp/snark/Storage.java
View File

@@ -877,7 +877,7 @@ public class Storage
{
// First check if the piece is correct.
// Copy the array first to be paranoid.
byte[] bs = (byte[]) ba.clone();
byte[] bs = ba.clone();
int length = bs.length;
boolean correctHash = metainfo.checkPiece(piece, bs, 0, length);
if (listener != null)

4
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@@ -302,7 +302,7 @@ public class I2PSnarkServlet extends DefaultServlet {
if (!msgs.isEmpty()) {
out.write("<div class=\"snarkMessages\"><ul>");
for (int i = msgs.size()-1; i >= 0; i--) {
String msg = (String)msgs.get(i);
String msg = msgs.get(i);
out.write("<li>" + msg + "</li>\n");
}
// lazy GET, lose p parameter
@@ -1176,7 +1176,7 @@ public class I2PSnarkServlet extends DefaultServlet {
out.write("<td align=\"right\" class=\"snarkTorrentStatus " + rowClass + "\">");
float pct;
if (isValid) {
pct = (float) (100.0 * (float) peer.completed() / meta.getPieces());
pct = (float) (100.0 * peer.completed() / meta.getPieces());
if (pct == 100.0)
out.write(_("Seed"));
else {

28
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
View File

@@ -395,7 +395,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
notifyEvent("serverTaskId", Integer.valueOf(-1));
throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
}
I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, this, this);
serv.setReadTimeout(readTimeout);
serv.startRunning();
addtask(serv);
@@ -446,7 +446,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
notifyEvent("serverTaskId", Integer.valueOf(-1));
throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[2]);
}
I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, this, this);
serv.setReadTimeout(readTimeout);
serv.startRunning();
addtask(serv);
@@ -507,7 +507,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
notifyEvent("serverTaskId", Integer.valueOf(-1));
throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[3]);
}
I2PTunnelHTTPServer serv = new I2PTunnelHTTPServer(serverHost, portNum, privKeyFile, args[3], spoofedHost, l, (EventDispatcher) this, this);
I2PTunnelHTTPServer serv = new I2PTunnelHTTPServer(serverHost, portNum, privKeyFile, args[3], spoofedHost, l, this, this);
serv.setReadTimeout(readTimeout);
serv.startRunning();
addtask(serv);
@@ -583,7 +583,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
throw new IllegalArgumentException(getPrefix() + "Cannot open private key file " + args[4]);
}
I2PTunnelHTTPBidirServer serv = new I2PTunnelHTTPBidirServer(serverHost, portNum, port2Num, privKeyFile, args[3], spoofedHost, l, (EventDispatcher) this, this);
I2PTunnelHTTPBidirServer serv = new I2PTunnelHTTPBidirServer(serverHost, portNum, port2Num, privKeyFile, args[3], spoofedHost, l, this, this);
serv.setReadTimeout(readTimeout);
serv.startRunning();
addtask(serv);
@@ -637,7 +637,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
if (portNum <= 0)
throw new IllegalArgumentException(getPrefix() + "Bad port " + args[1]);
I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, args[2], l, (EventDispatcher) this, this);
I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, args[2], l, this, this);
serv.setReadTimeout(readTimeout);
serv.startRunning();
addtask(serv);
@@ -685,7 +685,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
String privateKeyFile = null;
if (args.length >= 4)
privateKeyFile = args[3];
task = new I2PTunnelClient(portNum, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
task = new I2PTunnelClient(portNum, args[1], l, ownDest, this, this, privateKeyFile);
addtask(task);
notifyEvent("clientTaskId", Integer.valueOf(task.getId()));
} catch (IllegalArgumentException iae) {
@@ -761,7 +761,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
I2PTunnelTask task;
ownDest = !isShared;
try {
task = new I2PTunnelHTTPClient(clientPort, l, ownDest, proxy, (EventDispatcher) this, this);
task = new I2PTunnelHTTPClient(clientPort, l, ownDest, proxy, this, this);
addtask(task);
notifyEvent("httpclientTaskId", Integer.valueOf(task.getId()));
} catch (IllegalArgumentException iae) {
@@ -830,7 +830,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
I2PTunnelTask task;
ownDest = !isShared;
try {
task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, (EventDispatcher) this, this);
task = new I2PTunnelConnectClient(_port, l, ownDest, proxy, this, this);
addtask(task);
} catch (IllegalArgumentException iae) {
String msg = "Invalid I2PTunnel configuration to create a CONNECT client connecting to the router at " + host + ':'+ port +
@@ -895,7 +895,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
String privateKeyFile = null;
if (args.length >= 4)
privateKeyFile = args[3];
task = new I2PTunnelIRCClient(_port, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
task = new I2PTunnelIRCClient(_port, args[1], l, ownDest, this, this, privateKeyFile);
addtask(task);
notifyEvent("ircclientTaskId", Integer.valueOf(task.getId()));
} catch (IllegalArgumentException iae) {
@@ -949,7 +949,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
ownDest = !isShared;
try {
I2PTunnelTask task = new I2PSOCKSTunnel(_port, l, ownDest, (EventDispatcher) this, this, null);
I2PTunnelTask task = new I2PSOCKSTunnel(_port, l, ownDest, this, this, null);
addtask(task);
notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
} catch (IllegalArgumentException iae) {
@@ -996,7 +996,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
if (args.length == 3)
privateKeyFile = args[2];
try {
I2PTunnelTask task = new I2PSOCKSIRCTunnel(_port, l, ownDest, (EventDispatcher) this, this, privateKeyFile);
I2PTunnelTask task = new I2PSOCKSIRCTunnel(_port, l, ownDest, this, this, privateKeyFile);
addtask(task);
notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
} catch (IllegalArgumentException iae) {
@@ -1045,7 +1045,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
throw new IllegalArgumentException(getPrefix() + "Bad port " + args[0]);
try {
StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, (EventDispatcher) this, this);
StreamrConsumer task = new StreamrConsumer(_host, _port, args[2], l, this, this);
task.startRunning();
addtask(task);
notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
@@ -1094,7 +1094,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
return;
}
StreamrProducer task = new StreamrProducer(_port, privKeyFile, args[1], l, (EventDispatcher) this, this);
StreamrProducer task = new StreamrProducer(_port, privKeyFile, args[1], l, this, this);
task.startRunning();
addtask(task);
notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
@@ -1411,7 +1411,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
if (allargs.length() != 0) {
I2PTunnelTask task;
// pings always use the main destination
task = new I2Ping(allargs, l, false, (EventDispatcher) this, this);
task = new I2Ping(allargs, l, false, this, this);
addtask(task);
notifyEvent("pingTaskId", Integer.valueOf(task.getId()));
} else {

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
View File

@@ -176,7 +176,7 @@ public class ConfigTunnelsHelper extends HelperBase {
"value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String prop = (String)iter.next();
String val = (String)props.getProperty(prop);
String val = props.getProperty(prop);
buf.append(prop).append('=').append(val).append(' ');
}
buf.append("\"></td></tr>\n");
@@ -189,7 +189,7 @@ public class ConfigTunnelsHelper extends HelperBase {
"value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String prop = (String)iter.next();
String val = (String)props.getProperty(prop);
String val = props.getProperty(prop);
buf.append(prop).append('=').append(val).append(' ');
}
buf.append("\"></td></tr>\n");

2
apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java
View File

@@ -161,7 +161,7 @@ public class PluginUpdateHandler extends UpdateHandler {
StringBuilder buf = new StringBuilder(64);
buf.append("<b>").append(_("Downloading plugin")).append(' ');
double pct = ((double)alreadyTransferred + (double)currentWrite) /
((double)alreadyTransferred + (double)currentWrite + (double)bytesRemaining);
((double)alreadyTransferred + (double)currentWrite + bytesRemaining);
synchronized (_pct) {
buf.append(_pct.format(pct));
}

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
View File

@@ -73,7 +73,7 @@ class SummaryListener implements RateSummaryListener {
// add one value to the db (the average value for the period)
try {
_sample.setTime(when);
double val = eventCount > 0 ? (totalValue / (double)eventCount) : 0d;
double val = eventCount > 0 ? (totalValue / eventCount) : 0d;
_sample.setValue(_name, val);
_sample.setValue(_eventName, eventCount);
//_sample.setValue(0, val);

4
apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
View File

@@ -118,7 +118,7 @@ public class TunnelRenderer {
lifetime = 1;
if (lifetime > 10*60)
lifetime = 10*60;
int bps = 1024 * (int) cfg.getProcessedMessagesCount() / lifetime;
int bps = 1024 * cfg.getProcessedMessagesCount() / lifetime;
out.write("<td class=\"cells\" align=\"center\">" + bps + " Bps</td>");
if (cfg.getSendTo() == null)
out.write("<td class=\"cells\" align=\"center\">" + _("Outbound Endpoint") + "</td>");
@@ -139,7 +139,7 @@ public class TunnelRenderer {
private static class TunnelComparator implements Comparator<HopConfig> {
public int compare(HopConfig l, HopConfig r) {
return (int) (r.getProcessedMessagesCount() - l.getProcessedMessagesCount());
return (r.getProcessedMessagesCount() - l.getProcessedMessagesCount());
}
}

2
apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
View File

@@ -236,7 +236,7 @@ public class UpdateHandler {
StringBuilder buf = new StringBuilder(64);
buf.append("<b>").append(_("Updating")).append("</b> ");
double pct = ((double)alreadyTransferred + (double)currentWrite) /
((double)alreadyTransferred + (double)currentWrite + (double)bytesRemaining);
((double)alreadyTransferred + (double)currentWrite + bytesRemaining);
synchronized (_pct) {
buf.append(_pct.format(pct));
}

6
apps/sam/java/src/net/i2p/sam/SAMBridge.java
View File

@@ -109,7 +109,7 @@ public class SAMBridge implements Runnable {
*/
public Destination getDestination(String name) {
synchronized (nameToPrivKeys) {
String val = (String)nameToPrivKeys.get(name);
String val = nameToPrivKeys.get(name);
if (val == null) return null;
try {
Destination d = new Destination();
@@ -133,7 +133,7 @@ public class SAMBridge implements Runnable {
*/
public String getKeystream(String name) {
synchronized (nameToPrivKeys) {
String val = (String)nameToPrivKeys.get(name);
String val = nameToPrivKeys.get(name);
if (val == null) return null;
return val;
}
@@ -191,7 +191,7 @@ public class SAMBridge implements Runnable {
out = new FileOutputStream(persistFilename);
for (Iterator iter = nameToPrivKeys.keySet().iterator(); iter.hasNext(); ) {
String name = (String)iter.next();
String privKeys = (String)nameToPrivKeys.get(name);
String privKeys = nameToPrivKeys.get(name);
out.write(name.getBytes());
out.write('=');
out.write(privKeys.getBytes());

4
apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
View File

@@ -144,8 +144,8 @@ public class SAMHandlerFactory {
if ((minMinor >= 10) || (maxMinor >= 10)) return null ;
float fminVer = (float) minMajor + (float) minMinor / 10 ;
float fmaxVer = (float) maxMajor + (float) maxMinor / 10 ;
float fminVer = minMajor + (float) minMinor / 10 ;
float fmaxVer = maxMajor + (float) maxMinor / 10 ;
if ( ( fminVer <= 3.0 ) && ( fmaxVer >= 3.0 ) ) return "3.0" ;

14
apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
View File

@@ -344,12 +344,12 @@ public class SAMStreamSession {
*/
protected SAMStreamSessionSocketReader getSocketReader ( int id ) {
synchronized (handlersMapLock) {
return (SAMStreamSessionSocketReader)handlersMap.get(new Integer(id));
return handlersMap.get(new Integer(id));
}
}
private StreamSender getSender(int id) {
synchronized (handlersMapLock) {
return (StreamSender)sendersMap.get(new Integer(id));
return sendersMap.get(new Integer(id));
}
}
@@ -375,8 +375,8 @@ public class SAMStreamSession {
StreamSender sender = null;
synchronized (handlersMapLock) {
reader = (SAMStreamSessionSocketReader)handlersMap.remove(new Integer(id));
sender = (StreamSender)sendersMap.remove(new Integer(id));
reader = handlersMap.remove(new Integer(id));
sender = sendersMap.remove(new Integer(id));
}
if (reader != null)
@@ -402,8 +402,8 @@ public class SAMStreamSession {
while (iter.hasNext()) {
id = (Integer)iter.next();
((SAMStreamSessionSocketReader)handlersMap.get(id)).stopRunning();
((StreamSender)sendersMap.get(id)).shutDownGracefully();
handlersMap.get(id).stopRunning();
sendersMap.get(id).shutDownGracefully();
}
handlersMap.clear();
sendersMap.clear();
@@ -740,7 +740,7 @@ public class SAMStreamSession {
try {
synchronized (_data) {
if (!_data.isEmpty()) {
data = (ByteArray)_data.remove(0);
data = _data.remove(0);
} else if (_shuttingDownGracefully) {
/* No data left and shutting down gracefully?
If so, stop the sender. */

2
apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java
View File

@@ -374,7 +374,7 @@ public class SAMv2StreamSession extends SAMStreamSession
if ( !_data.isEmpty() )
{
int formerSize = _dataSize ;
data = ( ByteArray ) _data.remove ( 0 );
data = _data.remove ( 0 );
_dataSize -= data.getValid();
if ( ( formerSize >= SOCKET_HANDLER_BUF_SIZE ) && ( _dataSize < SOCKET_HANDLER_BUF_SIZE ) )

2
apps/sam/java/src/net/i2p/sam/client/SAMEventHandler.java
View File

@@ -116,7 +116,7 @@ public class SAMEventHandler extends SAMClientEventListenerImpl {
while (true) {
try {
synchronized (_namingReplyLock) {
String val = (String)_namingReplies.remove(name);
String val = _namingReplies.remove(name);
if (val == null) {
_namingReplyLock.wait();
} else {

2
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
View File

@@ -81,7 +81,7 @@ public class SAMStreamSend {
public void streamClosedReceived(String result, int id, String message) {
Sender sender = null;
synchronized (_remotePeers) {
sender = (Sender)_remotePeers.remove(new Integer(id));
sender = _remotePeers.remove(new Integer(id));
}
if (sender != null) {
sender.closed();

4
apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
View File

@@ -83,7 +83,7 @@ public class SAMStreamSink {
public void streamClosedReceived(String result, int id, String message) {
Sink sink = null;
synchronized (_remotePeers) {
sink = (Sink)_remotePeers.remove(new Integer(id));
sink = _remotePeers.remove(new Integer(id));
}
if (sink != null) {
sink.closed();
@@ -96,7 +96,7 @@ public class SAMStreamSink {
public void streamDataReceived(int id, byte data[], int offset, int length) {
Sink sink = null;
synchronized (_remotePeers) {
sink = (Sink)_remotePeers.get(new Integer(id));
sink = _remotePeers.get(new Integer(id));
}
if (sink != null) {
sink.received(data, offset, length);

2
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -1532,7 +1532,7 @@ public class WebMail extends HttpServlet
button( RELOAD, _("Reload Config") ) + spacer +
button( LOGOUT, _("Logout") ) );
String from = (String)request.getParameter( NEW_FROM );
String from = request.getParameter( NEW_FROM );
String fixed = Config.getProperty( CONFIG_SENDER_FIXED, "true" );
if( from == null || fixed.compareToIgnoreCase( "false" ) != 0 ) {