echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 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

2
core/java/src/gnu/crypto/hash/Sha256Standalone.java
View File

@ -125,7 +125,7 @@ public class Sha256Standalone extends BaseHashStandalone {
this.h6 = md.h6;
this.h7 = md.h7;
this.count = md.count;
this.buffer = (byte[]) md.buffer.clone();
this.buffer = md.buffer.clone();
}
// Class methods

2
core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
View File

@ -77,7 +77,7 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl
@Override
public void seed(byte val[]) {
Map props = new HashMap(1);
props.put(SEED, (Object)val);
props.put(SEED, val);
init(props);
//fillBlock();
}

2
core/java/src/gnu/crypto/prng/FortunaStandalone.java
View File

@ -132,7 +132,7 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
public void seed(byte val[]) {
Map props = new HashMap(1);
props.put(SEED, (Object)val);
props.put(SEED, val);
init(props);
fillBlock();
}

2
core/java/src/gnu/crypto/prng/RandomEventStandalone.java
View File

@ -62,7 +62,7 @@ public class RandomEventStandalone extends EventObject
this.poolNumber = poolNumber;
if (data.length == 0 || data.length > 32)
throw new IllegalArgumentException("random events take between 1 and 32 bytes of data");
this.data = (byte[]) data.clone();
this.data = data.clone();
}
public byte getSourceNumber()

2
core/java/src/net/i2p/crypto/SHA1.java
View File

@ -139,7 +139,7 @@ public final class SHA1 extends MessageDigest implements Cloneable {
@Override
public Object clone() throws CloneNotSupportedException {
SHA1 that = (SHA1)super.clone();
that.pad = (byte[])this.pad.clone();
that.pad = this.pad.clone();
return that;
}

4
core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
View File

@ -504,7 +504,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
removed.add(set);
}
for (int i = 0; i < removed.size(); i++) {
TagSet cur = (TagSet)removed.get(i);
TagSet cur = removed.get(i);
for (Iterator<SessionTag> iter = cur.getTags().iterator(); iter.hasNext(); ) {
SessionTag tag = iter.next();
_inboundTagSets.remove(tag);
@ -533,7 +533,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
public SessionKey consumeTag(SessionTag tag) {
//if (false) aggressiveExpire();
synchronized (_inboundTagSets) {
TagSet tagSet = (TagSet) _inboundTagSets.remove(tag);
TagSet tagSet = _inboundTagSets.remove(tag);
if (tagSet == null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Cannot consume IB " + tag + " as it is not known");

20
core/java/src/net/i2p/data/LeaseSet.java
View File

@ -175,9 +175,9 @@ public class LeaseSet extends DatabaseEntry {
public Lease getLease(int index) {
if (isEncrypted())
return (Lease) _decryptedLeases.get(index);
return _decryptedLeases.get(index);
else
return (Lease) _leases.get(index);
return _leases.get(index);
}
/**
@ -397,8 +397,8 @@ public class LeaseSet extends DatabaseEntry {
int datalen = ((DATA_LEN * size / 16) + 1) * 16;
ByteArrayOutputStream baos = new ByteArrayOutputStream(datalen);
for (int i = 0; i < size; i++) {
((Lease)_leases.get(i)).getGateway().writeBytes(baos);
((Lease)_leases.get(i)).getTunnelId().writeBytes(baos);
_leases.get(i).getGateway().writeBytes(baos);
_leases.get(i).getTunnelId().writeBytes(baos);
}
// pad out to multiple of 16 with random data before encryption
int padlen = datalen - (DATA_LEN * size);
@ -415,17 +415,17 @@ public class LeaseSet extends DatabaseEntry {
RandomSource.getInstance().nextBytes(enc, datalen, padlen);
// add the padded lease...
Lease padLease = new Lease();
padLease.setEndDate(((Lease)_leases.get(0)).getEndDate());
padLease.setEndDate(_leases.get(0).getEndDate());
_leases.add(padLease);
// ...and replace all the gateways and tunnel ids
ByteArrayInputStream bais = new ByteArrayInputStream(enc);
for (int i = 0; i < size+1; i++) {
Hash h = new Hash();
h.readBytes(bais);
((Lease)_leases.get(i)).setGateway(h);
_leases.get(i).setGateway(h);
TunnelId t = new TunnelId();
t.readBytes(bais);
((Lease)_leases.get(i)).setTunnelId(t);
_leases.get(i).setTunnelId(t);
}
}
@ -444,8 +444,8 @@ public class LeaseSet extends DatabaseEntry {
int datalen = DATA_LEN * size;
ByteArrayOutputStream baos = new ByteArrayOutputStream(datalen);
for (int i = 0; i < size; i++) {
((Lease)_leases.get(i)).getGateway().writeBytes(baos);
((Lease)_leases.get(i)).getTunnelId().writeBytes(baos);
_leases.get(i).getGateway().writeBytes(baos);
_leases.get(i).getTunnelId().writeBytes(baos);
}
byte[] iv = new byte[IV_LEN];
System.arraycopy(_destination.getPublicKey().getData(), 0, iv, 0, IV_LEN);
@ -464,7 +464,7 @@ public class LeaseSet extends DatabaseEntry {
TunnelId t = new TunnelId();
t.readBytes(bais);
l.setTunnelId(t);
l.setEndDate(((Lease)_leases.get(i)).getEndDate());
l.setEndDate(_leases.get(i).getEndDate());
_decryptedLeases.add(l);
}
}

2
core/java/src/net/i2p/stat/Rate.java
View File

@ -521,7 +521,7 @@ public class Rate {
*/
@Override
public int hashCode() {
return DataHelper.hashCode(_stat) ^ ((int)_period) ^ ((int) _creationDate);
return DataHelper.hashCode(_stat) ^ _period ^ ((int) _creationDate);
}
@Override

8
core/java/src/net/i2p/time/NtpMessage.java
View File

@ -293,8 +293,8 @@ public class NtpMessage {
p[0] = (byte) (leapIndicator << 6 | version << 3 | mode);
p[1] = (byte) stratum;
p[2] = (byte) pollInterval;
p[3] = (byte) precision;
p[2] = pollInterval;
p[3] = precision;
// root delay is a signed 16.16-bit FP, in Java an int is 32-bits
int l = (int) (rootDelay * 65536.0);
@ -358,7 +358,7 @@ public class NtpMessage {
if((b & 0x80)==0x80)
return (short) (128 + (b & 0x7f));
else
return (short) b;
return b;
}
@ -393,7 +393,7 @@ public class NtpMessage {
array[pointer+i] = (byte) (timestamp / base);
// Subtract captured value from remaining total
timestamp = timestamp - (double) (unsignedByteToShort(array[pointer+i]) * base);
timestamp = timestamp - (unsignedByteToShort(array[pointer+i]) * base);
}
// From RFC 2030: It is advisable to fill the non-significant

4
core/java/src/net/i2p/time/Timestamper.java
View File

@ -86,7 +86,7 @@ public class Timestamper implements Runnable {
}
public String getServer(int index) {
synchronized (_servers) {
return (String)_servers.get(index);
return _servers.get(index);
}
}
@ -305,7 +305,7 @@ public class Timestamper implements Runnable {
_servers.clear();
StringTokenizer tok = new StringTokenizer(serverList, ", ");
while (tok.hasMoreTokens()) {
String val = (String)tok.nextToken();
String val = tok.nextToken();
val = val.trim();
if (val.length() > 0)
_servers.add(val);

6
core/java/src/net/i2p/util/BufferedRandomSource.java
View File

@ -184,14 +184,14 @@ public class BufferedRandomSource extends RandomSource {
return nextBits(1) != 0;
}
private static final double DOUBLE_DENOMENATOR = (double)(1L << 53);
private static final double DOUBLE_DENOMENATOR = (1L << 53);
/** defined per javadoc ( ((nextBits(26)<<27) + nextBits(27)) / (1 << 53)) */
@Override
public final double nextDouble() {
long top = (((long)nextBits(26) << 27) + nextBits(27));
long top = ((nextBits(26) << 27) + nextBits(27));
return top / DOUBLE_DENOMENATOR;
}
private static final float FLOAT_DENOMENATOR = (float)(1 << 24);
private static final float FLOAT_DENOMENATOR = (1 << 24);
/** defined per javadoc (nextBits(24) / ((float)(1 << 24)) ) */
@Override
public float nextFloat() {

10
core/java/src/net/i2p/util/EepGet.java
View File

@ -362,20 +362,20 @@ public class EepGet {
buf.append(" ");
if ( bytesRemaining > 0 ) {
double pct = 100 * ((double)_written + _previousWritten) /
((double)alreadyTransferred + (double)currentWrite + (double)bytesRemaining);
((double)alreadyTransferred + (double)currentWrite + bytesRemaining);
fmt.format("%4.1f", Double.valueOf(pct));
buf.append("%: ");
}
fmt.format("%8d", Long.valueOf(_written));
buf.append(" @ ");
double lineKBytes = ((double)_markSize * (double)_lineSize)/1024.0d;
double kbps = lineKBytes/((double)timeToSend/1000.0d);
double kbps = lineKBytes/(timeToSend/1000.0d);
fmt.format("%7.2f", Double.valueOf(kbps));
buf.append(" KBps");
buf.append(" / ");
long lifetime = _context.clock().now() - _startedOn;
double lifetimeKBps = (1000.0d*(double)(_written)/((double)lifetime*1024.0d));
double lifetimeKBps = (1000.0d*(_written)/(lifetime*1024.0d));
fmt.format("%7.2f", Double.valueOf(lifetimeKBps));
buf.append(" KBps");
System.out.println(buf.toString());
@ -415,7 +415,7 @@ public class EepGet {
if (transferred > 0) {
StringBuilder buf = new StringBuilder(50);
buf.append("== Transfer rate: ");
double kbps = (1000.0d*(double)(transferred)/((double)timeToSend*1024.0d));
double kbps = (1000.0d*(transferred)/(timeToSend*1024.0d));
synchronized (_kbps) {
buf.append(_kbps.format(kbps));
}
@ -440,7 +440,7 @@ public class EepGet {
+ (bytesRemaining < 0 ? "unknown" : ""+bytesRemaining) + " remaining");
long timeToSend = _context.clock().now() - _startedOn;
System.out.println("== Transfer time: " + DataHelper.formatDuration(timeToSend));
double kbps = (timeToSend > 0 ? (1000.0d*(double)(bytesTransferred)/((double)timeToSend*1024.0d)) : 0);
double kbps = (timeToSend > 0 ? (1000.0d*(bytesTransferred)/(timeToSend*1024.0d)) : 0);
StringBuilder buf = new StringBuilder(50);
buf.append("== Transfer rate: ");
synchronized (_kbps) {

4
core/java/src/net/i2p/util/EepHead.java
View File

@ -172,10 +172,10 @@ public class EepHead extends EepGet {
if (_transferFailed) {
// 404, etc - transferFailed is called after all attempts fail, by fetch() above
for (int i = 0; i < _listeners.size(); i++)
((StatusListener)_listeners.get(i)).attemptFailed(_url, 0, 0, _currentAttempt, _numRetries, new Exception("Attempt failed"));
_listeners.get(i).attemptFailed(_url, 0, 0, _currentAttempt, _numRetries, new Exception("Attempt failed"));
} else {
for (int i = 0; i < _listeners.size(); i++)
((StatusListener)_listeners.get(i)).transferComplete(
_listeners.get(i).transferComplete(
0, 0, 0, _url, "dummy", false);
}
}

2
core/java/src/net/i2p/util/EepPost.java
View File

@ -218,7 +218,7 @@ public class EepPost {
I2PAppContext.getGlobalContext().random().nextBytes(separator);
StringBuilder sep = new StringBuilder(48);
for (int i = 0; i < separator.length; i++)
sep.append((char)((int)'a' + (int)(separator[i]&0x0F))).append((char)((int)'a' + (int)((separator[i] >>> 4) & 0x0F)));
sep.append((char)('a' + (separator[i]&0x0F))).append((char)('a' + ((separator[i] >>> 4) & 0x0F)));
return sep.toString();
}
}

2
core/java/src/net/i2p/util/NativeBigInteger.java
View File

@ -409,7 +409,7 @@ public class NativeBigInteger extends BigInteger {
System.out.println("native run time: \t" + totalTime + "ms (" + (totalTime / (runsProcessed + 1))
+ "ms each)");
System.out.println("java run time: \t" + javaTime + "ms (" + (javaTime / (runsProcessed + 1)) + "ms each)");
System.out.println("native = " + ((totalTime * 100.0d) / (double) javaTime) + "% of pure java time");
System.out.println("native = " + ((totalTime * 100.0d) / javaTime) + "% of pure java time");
} else {
System.out.println("java run time: \t" + javaTime + "ms (" + (javaTime / (runsProcessed + 1)) + "ms each)");
System.out.println("However, we couldn't load the native library, so this doesn't test much");

12
core/java/src/net/i2p/util/SimpleTimer.java
View File

@ -128,7 +128,7 @@ public class SimpleTimer {
Long time = Long.valueOf(eventTime);
synchronized (_events) {
// remove the old scheduled position, then reinsert it
Long oldTime = (Long)_eventTimes.get(event);
Long oldTime = _eventTimes.get(event);
if (oldTime != null) {
if (useEarliestTime) {
if (oldTime.longValue() < eventTime) {
@ -155,8 +155,8 @@ public class SimpleTimer {
_log.error("Skewed events: " + _events.size() + " for " + _eventTimes.size());
for (Iterator iter = _eventTimes.keySet().iterator(); iter.hasNext(); ) {
TimedEvent evt = (TimedEvent)iter.next();
Long when = (Long)_eventTimes.get(evt);
TimedEvent cur = (TimedEvent)_events.get(when);
Long when = _eventTimes.get(evt);
TimedEvent cur = _events.get(when);
if (cur != evt) {
_log.error("event " + evt + " @ " + when + ": " + cur);
}
@ -182,7 +182,7 @@ public class SimpleTimer {
public boolean removeEvent(TimedEvent evt) {
if (evt == null) return false;
synchronized (_events) {
Long when = (Long)_eventTimes.remove(evt);
Long when = _eventTimes.remove(evt);
if (when != null)
_events.remove(when);
return null != when;
@ -222,9 +222,9 @@ public class SimpleTimer {
if(_events.isEmpty()) {
break;
}
Long when = (Long)_events.firstKey();
Long when = _events.firstKey();
if (when.longValue() <= now) {
TimedEvent evt = (TimedEvent)_events.remove(when);
TimedEvent evt = _events.remove(when);
if (evt != null) {
_eventTimes.remove(evt);
eventsToFire.add(evt);

2
core/java/src/net/metanotion/io/block/BlockFile.java
View File

@ -325,7 +325,7 @@ public class BlockFile {
public static void pageSeek(RandomAccessInterface file, int page) throws IOException {
if (page < METAINDEX_PAGE)
throw new IOException("Negative page or superblock access attempt: " + page);
file.seek((((long)page) - 1L) * PAGESIZE );
file.seek((page - 1L) * PAGESIZE );
}
public int allocPage() throws IOException {

8
core/java/src/net/metanotion/io/data/IntBytes.java
View File

@ -42,10 +42,10 @@ public class IntBytes implements Serializer {
}
public Object construct(byte[] b) {
int v = (((int)(b[0] & 0xff) << 24) |
((int)(b[1] & 0xff) << 16) |
((int)(b[2] & 0xff) << 8) |
((int)(b[3] & 0xff)));
int v = (((b[0] & 0xff) << 24) |
((b[1] & 0xff) << 16) |
((b[2] & 0xff) << 8) |
(b[3] & 0xff));
return new Integer(v);
}
}

2
core/java/src/net/metanotion/io/data/LongBytes.java
View File

@ -53,7 +53,7 @@ public class LongBytes implements Serializer {
((long)(b[4] & 0xff) << 24) |
((long)(b[5] & 0xff) << 16) |
((long)(b[6] & 0xff) << 8) |
((long)(b[7] & 0xff)));
(b[7] & 0xff));
return new Long(v);
}
}

2
core/java/src/org/xlattice/crypto/filters/BloomSHA1.java
View File

@ -296,7 +296,7 @@ public class BloomSHA1 {
public final double falsePositives(int n) {
// (1 - e(-kN/M))^k
return java.lang.Math.pow (
(1l - java.lang.Math.exp(0d- ((double)k) * (long)n / (long)filterBits)), (long)k);
(1l - java.lang.Math.exp(0d- ((double)k) * (long)n / filterBits)), k);
}
public final double falsePositives() {

4
core/java/test/net/i2p/crypto/HMACSHA256Bench.java
View File

@ -109,8 +109,8 @@ public class HMACSHA256Bench {
}
private static void display(int times, long before, long after, int len, String name) {
double rate = ((double)times)/(((double)after-(double)before)/1000.0d);
double kbps = ((double)len/1024.0d)*((double)times)/(((double)after-(double)before)/1000.0d);
double rate = times/(((double)after-(double)before)/1000.0d);
double kbps = (len/1024.0d)*times/(((double)after-(double)before)/1000.0d);
System.out.println(name + " HMAC pulled " + kbps + "KBps or " + rate + " calcs per second");
}
}