Author: nextgens
Date: 2006-05-11 18:53:16 +0000 (Thu, 11 May 2006)
New Revision: 8665
Modified:
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
trunk/freenet/src/freenet/crypt/DHGroup.java
trunk/freenet/src/freenet/crypt/DSAGroup.java
trunk/freenet/src/freenet/crypt/DSASignature.java
trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
trunk/freenet/src/freenet/crypt/DummyRandomSource.java
trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
trunk/freenet/src/freenet/crypt/Yarrow.java
trunk/freenet/src/freenet/io/comm/NotConnectedException.java
trunk/freenet/src/freenet/io/comm/PeerParseException.java
trunk/freenet/src/freenet/keys/CHKDecodeException.java
trunk/freenet/src/freenet/keys/CHKEncodeException.java
trunk/freenet/src/freenet/keys/CHKVerifyException.java
trunk/freenet/src/freenet/keys/KeyDecodeException.java
trunk/freenet/src/freenet/node/FSParseException.java
trunk/freenet/src/freenet/node/KeyChangedException.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
trunk/freenet/src/freenet/support/IllegalBase64Exception.java
trunk/freenet/src/freenet/support/PromiscuousItemException.java
trunk/freenet/src/freenet/support/VirginItemException.java
trunk/freenet/src/freenet/support/WouldBlockException.java
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
Log:
Fix the build, and some cleanups
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -344,6 +344,7 @@
}
static class ParseException extends Exception {
+ private static final long serialVersionUID = -1;
ParseException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/crypt/DHGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DHGroup.java 2006-05-11 18:22:18 UTC
(rev 8664)
+++ trunk/freenet/src/freenet/crypt/DHGroup.java 2006-05-11 18:53:16 UTC
(rev 8665)
@@ -12,7 +12,7 @@
* Holds a Diffie-Hellman key-exchange group
*/
public class DHGroup extends CryptoKey {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public final BigInteger p, g;
public DHGroup(BigInteger p, BigInteger g) {
Modified: trunk/freenet/src/freenet/crypt/DSAGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroup.java 2006-05-11 18:22:18 UTC
(rev 8664)
+++ trunk/freenet/src/freenet/crypt/DSAGroup.java 2006-05-11 18:53:16 UTC
(rev 8665)
@@ -20,7 +20,7 @@
* needed for the DSA algorithm
*/
public class DSAGroup extends CryptoKey {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
private static final boolean DEBUG = false;
private BigInteger p, q, g;
@@ -350,4 +350,4 @@
return new DSAGroup(p, q, g);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/freenet/src/freenet/crypt/DSASignature.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSASignature.java 2006-05-11 18:22:18 UTC
(rev 8664)
+++ trunk/freenet/src/freenet/crypt/DSASignature.java 2006-05-11 18:53:16 UTC
(rev 8665)
@@ -11,7 +11,7 @@
public class DSASignature implements CryptoElement, java.io.Serializable {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
private final BigInteger r, s;
private String toStringCached; //toString() cache
Modified: trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/crypt/DecryptionFailedException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -1,7 +1,7 @@
package freenet.crypt;
public class DecryptionFailedException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public DecryptionFailedException (String m) {
super(m);
}
Modified: trunk/freenet/src/freenet/crypt/DummyRandomSource.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DummyRandomSource.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/crypt/DummyRandomSource.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -6,7 +6,7 @@
* Not a real RNG at all, just a simple PRNG. Use it for e.g. simulations.
*/
public class DummyRandomSource extends RandomSource {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public int acceptEntropy(EntropySource source, long data, int
entropyGuess) {
return 0;
}
Modified: trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/crypt/UnsupportedCipherException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -1,7 +1,7 @@
package freenet.crypt;
public class UnsupportedCipherException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public UnsupportedCipherException() {}
public UnsupportedCipherException(String s) {
super(s);
Modified: trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
===================================================================
--- trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/crypt/UnsupportedDigestException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -1,7 +1,7 @@
package freenet.crypt;
public class UnsupportedDigestException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public UnsupportedDigestException() {}
public UnsupportedDigestException(String s) {
super(s);
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2006-05-11 18:22:18 UTC (rev
8664)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2006-05-11 18:53:16 UTC (rev
8665)
@@ -50,7 +50,7 @@
* @author Scott G. Miller <scgmille at indiana.edu>
*/
public class Yarrow extends RandomSource {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
/**
* Security parameters
*/
Modified: trunk/freenet/src/freenet/io/comm/NotConnectedException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/NotConnectedException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/io/comm/NotConnectedException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -7,7 +7,7 @@
* not currently connected.
*/
public class NotConnectedException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public NotConnectedException(String string) {
super(string);
}
Modified: trunk/freenet/src/freenet/io/comm/PeerParseException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/PeerParseException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/io/comm/PeerParseException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -5,7 +5,7 @@
* @author amphibian
*/
public class PeerParseException extends Exception {
- private static final long serialVersionUID = -1;test;
+ private static final long serialVersionUID = -1;
public PeerParseException(Exception e) {
super(e);
}
Modified: trunk/freenet/src/freenet/keys/CHKDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKDecodeException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/keys/CHKDecodeException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -6,7 +6,7 @@
* Exception thrown when decode fails.
*/
public class CHKDecodeException extends KeyDecodeException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
/**
*
*/
Modified: trunk/freenet/src/freenet/keys/CHKEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKEncodeException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/keys/CHKEncodeException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -7,7 +7,7 @@
* Specifically, it is thrown when the data is too big to encode.
*/
public class CHKEncodeException extends KeyEncodeException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public CHKEncodeException() {
super();
}
Modified: trunk/freenet/src/freenet/keys/CHKVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/CHKVerifyException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/keys/CHKVerifyException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -6,7 +6,7 @@
* Exception thrown when a CHK doesn't verify.
*/
public class CHKVerifyException extends KeyVerifyException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
/**
*
Modified: trunk/freenet/src/freenet/keys/KeyDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyDecodeException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/keys/KeyDecodeException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -4,7 +4,7 @@
* Base class for decode exceptions.
*/
public class KeyDecodeException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public KeyDecodeException(String message) {
super(message);
}
Modified: trunk/freenet/src/freenet/node/FSParseException.java
===================================================================
--- trunk/freenet/src/freenet/node/FSParseException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/node/FSParseException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -5,7 +5,7 @@
* SimpleFieldSet format (after it has been turned into a SFS).
*/
public class FSParseException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public FSParseException(Exception e) {
super(e);
}
Modified: trunk/freenet/src/freenet/node/KeyChangedException.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyChangedException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/node/KeyChangedException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -5,5 +5,5 @@
* of acquiring a packet number.
*/
public class KeyChangedException extends Exception {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-11 18:22:18 UTC (rev
8664)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-11 18:53:16 UTC (rev
8665)
@@ -737,7 +737,7 @@
static class NodeInitException extends Exception {
// One of the exit codes from above
public final int exitCode;
- static final long serialVersionUID=0;
+ private static final long serialVersionUID = 0;
NodeInitException(int exitCode, String msg) {
super(msg+" ("+exitCode+")");
Modified:
trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/CPUInformation/UnknownCPUException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -8,7 +8,7 @@
*
*/
public class UnknownCPUException extends RuntimeException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public UnknownCPUException() {
super();
}
Modified: trunk/freenet/src/freenet/support/IllegalBase64Exception.java
===================================================================
--- trunk/freenet/src/freenet/support/IllegalBase64Exception.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/IllegalBase64Exception.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -8,7 +8,7 @@
extends Exception
{
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public IllegalBase64Exception(String descr)
{
super(descr);
Modified: trunk/freenet/src/freenet/support/PromiscuousItemException.java
===================================================================
--- trunk/freenet/src/freenet/support/PromiscuousItemException.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/PromiscuousItemException.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -13,7 +13,7 @@
*/
public class PromiscuousItemException extends RuntimeException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
PromiscuousItemException(DoublyLinkedList.Item item) {
super(item.toString());
Modified: trunk/freenet/src/freenet/support/VirginItemException.java
===================================================================
--- trunk/freenet/src/freenet/support/VirginItemException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/VirginItemException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -6,7 +6,7 @@
* @author tavin
*/
public class VirginItemException extends RuntimeException {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
VirginItemException(DoublyLinkedList.Item item) {
super(item.toString());
}
Modified: trunk/freenet/src/freenet/support/WouldBlockException.java
===================================================================
--- trunk/freenet/src/freenet/support/WouldBlockException.java 2006-05-11
18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/WouldBlockException.java 2006-05-11
18:53:16 UTC (rev 8665)
@@ -6,6 +6,8 @@
* Thrown when we would have to block but have been told not to.
*/
public class WouldBlockException extends LowLevelFilterException {
+ private static final long serialVersionUID = -1;
+
public WouldBlockException(String string) {
super(string);
}
@@ -14,5 +16,4 @@
super();
}
- static final long serialVersionUID = -1;
}
Modified:
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
===================================================================
---
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
2006-05-11 18:22:18 UTC (rev 8664)
+++
trunk/freenet/src/freenet/support/math/BootstrappingDecayingRunningAverage.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -21,7 +21,7 @@
public class BootstrappingDecayingRunningAverage implements
RunningAverage {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
public final Object clone() {
return new BootstrappingDecayingRunningAverage(this);
}
Modified: trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/math/SimpleRunningAverage.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -8,7 +8,7 @@
* @author amphibian
*/
public class SimpleRunningAverage implements RunningAverage {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
final double[] refs;
int nextSlotPtr=0;
int curLen=0;
Modified: trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
2006-05-11 18:22:18 UTC (rev 8664)
+++ trunk/freenet/src/freenet/support/math/TimeDecayingRunningAverage.java
2006-05-11 18:53:16 UTC (rev 8665)
@@ -63,7 +63,7 @@
*/
public class TimeDecayingRunningAverage implements RunningAverage {
- static final long serialVersionUID = -1;
+ private static final long serialVersionUID = -1;
static final int MAGIC = 0x5ff4ac92;
public final Object clone() {
