Author: nextgens
Date: 2006-06-17 07:53:03 +0000 (Sat, 17 Jun 2006)
New Revision: 9254
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
trunk/freenet/src/freenet/client/Metadata.java
trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
trunk/freenet/src/freenet/client/async/SplitFileInserter.java
trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java
trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
trunk/freenet/src/freenet/crypt/DSAPublicKey.java
trunk/freenet/src/freenet/crypt/SHA1.java
trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/io/xfer/AbortedException.java
trunk/freenet/src/freenet/keys/KeyEncodeException.java
trunk/freenet/src/freenet/keys/KeyVerifyException.java
trunk/freenet/src/freenet/keys/SSKDecodeException.java
trunk/freenet/src/freenet/keys/SSKEncodeException.java
trunk/freenet/src/freenet/keys/SSKVerifyException.java
trunk/freenet/src/freenet/node/PacketSequenceException.java
trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
trunk/freenet/src/freenet/store/FreenetStore.java
trunk/freenet/src/freenet/support/LoggerHook.java
trunk/freenet/src/freenet/support/ReadOnlyFileSliceBucket.java
trunk/freenet/src/freenet/support/URLEncodedFormatException.java
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
trunk/freenet/src/freenet/support/io/TooLongException.java
trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
Log:
more warnings cleaned up
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -1,6 +1,5 @@
package freenet.client;
-import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -11,7 +11,6 @@
import freenet.client.events.EventLogger;
import freenet.client.events.SimpleEventProducer;
import freenet.crypt.RandomSource;
-import freenet.keys.ClientKey;
import freenet.keys.FreenetURI;
import freenet.node.Node;
import freenet.support.Bucket;
@@ -134,7 +133,7 @@
Logger.error(this, "Impossible error: "+e, e);
throw new
InserterException(InserterException.INTERNAL_ERROR, e, null);
}
- ClientKey k;
+
InsertBlock block = new InsertBlock(b, null, insertURI);
return insert(block, false, true);
}
Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java 2006-06-17 07:36:49 UTC
(rev 9253)
+++ trunk/freenet/src/freenet/client/Metadata.java 2006-06-17 07:53:03 UTC
(rev 9254)
@@ -10,7 +10,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Vector;
import freenet.keys.BaseClientKey;
import freenet.keys.ClientCHK;
Modified: trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
===================================================================
--- trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/MetadataUnresolvedException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.client;
public class MetadataUnresolvedException extends Exception {
+ private static final long serialVersionUID = -1;
public final Metadata[] mustResolve;
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -12,7 +12,6 @@
import freenet.client.Metadata;
import freenet.client.MetadataParseException;
import freenet.keys.FreenetURI;
-import freenet.keys.NodeCHK;
import freenet.support.Bucket;
import freenet.support.Fields;
import freenet.support.Logger;
@@ -79,7 +78,6 @@
splitfileDataBlocks = metadata.getSplitfileDataKeys();
splitfileCheckBlocks = metadata.getSplitfileCheckKeys();
splitUseLengths = metadata.splitUseLengths();
- int blockLength = splitUseLengths ? -1 : NodeCHK.BLOCK_SIZE;
if(splitfileType == Metadata.SPLITFILE_NONREDUNDANT) {
// Don't need to do much - just fetch everything and
piece it together.
blocksPerSegment = -1;
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserter.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserter.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -250,7 +250,6 @@
if(allSucceeded)
cb.onSuccess(this);
else {
- InserterException e;
if(tracker.isFatal(true))
cb.onFailure(new
InserterException(InserterException.FATAL_ERRORS_IN_BLOCKS, tracker, null),
this);
else
Modified: trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/client/async/USKCheckerCallback.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,7 +1,6 @@
package freenet.client.async;
import freenet.keys.ClientSSKBlock;
-import freenet.keys.SSKBlock;
/**
* Callback for a USKChecker
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -2,7 +2,6 @@
package freenet.clients.http.filter;
import java.io.*;
-import java.util.*;
/* This class tokenizes a CSS2 Reader stream, writes it out to the output
Writer, and filters any URLs found */
// WARNING: this is not as thorough as the HTML parser - new versions of the
standard could lead to anonymity risks. See comments in SaferFilter.java
// Mostly from http://www.w3.org/TR/REC-CSS2/grammar.html
Modified: trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/clients/http/filter/DataFilterException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -4,6 +4,7 @@
* Exception thrown when the data cannot be filtered.
*/
public class DataFilterException extends UnsafeContentTypeException {
+ private static final long serialVersionUID = -1;
final String rawTitle;
final String encodedTitle;
Modified: trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPrivateKey.java 2006-06-17 07:36:49 UTC
(rev 9253)
+++ trunk/freenet/src/freenet/crypt/DSAPrivateKey.java 2006-06-17 07:53:03 UTC
(rev 9254)
@@ -12,6 +12,7 @@
import net.i2p.util.NativeBigInteger;
public class DSAPrivateKey extends CryptoKey {
+ private static final long serialVersionUID = -1;
private final BigInteger x;
Modified: trunk/freenet/src/freenet/crypt/DSAPublicKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPublicKey.java 2006-06-17 07:36:49 UTC
(rev 9253)
+++ trunk/freenet/src/freenet/crypt/DSAPublicKey.java 2006-06-17 07:53:03 UTC
(rev 9254)
@@ -14,6 +14,7 @@
import net.i2p.util.NativeBigInteger;
public class DSAPublicKey extends CryptoKey {
+ private static final long serialVersionUID = -1;
private final BigInteger y;
/** A cache of the hexadecimal string representation of y */
Modified: trunk/freenet/src/freenet/crypt/SHA1.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA1.java 2006-06-17 07:36:49 UTC (rev
9253)
+++ trunk/freenet/src/freenet/crypt/SHA1.java 2006-06-17 07:53:03 UTC (rev
9254)
@@ -322,7 +322,7 @@
*/
protected final void finish() {
byte bits[] = new byte[8];
- int i, j;
+ int i;
for (i = 0; i < 8; i++) {
bits[i] = (byte)((count >>> (((7 - i) << 3))) & 0xff);
}
Modified: trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/io/comm/LowLevelFilterException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.io.comm;
public class LowLevelFilterException extends Exception {
+ private static final long serialVersionUID = -1;
public LowLevelFilterException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-06-17 07:36:49 UTC (rev
9253)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-06-17 07:53:03 UTC (rev
9254)
@@ -22,9 +22,7 @@
import java.io.*;
import java.net.*;
-import freenet.io.AddressIdentifier;
import freenet.io.WritableToDataOutputStream;
-import freenet.support.Logger;
/**
* @author ian
Modified: trunk/freenet/src/freenet/io/xfer/AbortedException.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/AbortedException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/io/xfer/AbortedException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -5,7 +5,8 @@
* in order to avoid some races.
*/
public class AbortedException extends Exception {
-
+ private static final long serialVersionUID = -1;
+
public AbortedException(String msg) {
super(msg);
}
Modified: trunk/freenet/src/freenet/keys/KeyEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyEncodeException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/keys/KeyEncodeException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.keys;
public class KeyEncodeException extends Exception {
+ private static final long serialVersionUID = -1;
public KeyEncodeException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/keys/KeyVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/KeyVerifyException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/keys/KeyVerifyException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.keys;
public class KeyVerifyException extends Exception {
+ private static final long serialVersionUID = -1;
public KeyVerifyException(String message) {
super(message);
Modified: trunk/freenet/src/freenet/keys/SSKDecodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKDecodeException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/keys/SSKDecodeException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.keys;
public class SSKDecodeException extends KeyDecodeException {
+ private static final long serialVersionUID = -1;
public SSKDecodeException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/keys/SSKEncodeException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKEncodeException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/keys/SSKEncodeException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.keys;
public class SSKEncodeException extends KeyEncodeException {
+ private static final long serialVersionUID = -1;
public SSKEncodeException(String message, KeyEncodeException e) {
super(message, e);
Modified: trunk/freenet/src/freenet/keys/SSKVerifyException.java
===================================================================
--- trunk/freenet/src/freenet/keys/SSKVerifyException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/keys/SSKVerifyException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -4,6 +4,7 @@
* Thrown when an SSK fails to verify at the node level.
*/
public class SSKVerifyException extends KeyVerifyException {
+ private static final long serialVersionUID = -1;
public SSKVerifyException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/node/PacketSequenceException.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSequenceException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/node/PacketSequenceException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -3,6 +3,7 @@
import freenet.io.comm.LowLevelFilterException;
public class PacketSequenceException extends LowLevelFilterException {
+ private static final long serialVersionUID = -1;
public PacketSequenceException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/node/fcp/IdentifierCollisionException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -4,5 +4,5 @@
* Thrown to indicate reuse of an Identifier.
*/
public class IdentifierCollisionException extends Exception {
-
+ private static final long serialVersionUID = -1;
}
Modified: trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/node/fcp/MessageInvalidException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -7,6 +7,7 @@
* ProtocolError.
*/
public class MessageInvalidException extends Exception {
+ private static final long serialVersionUID = -1;
int protocolCode;
public String ident;
Modified: trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/node/fcp/PersistenceParseException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -4,6 +4,7 @@
* Thrown when a persistent request cannot be parsed.
*/
public class PersistenceParseException extends Exception {
+ private static final long serialVersionUID = -1;
public PersistenceParseException(String string) {
super(string);
Modified: trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHTTPException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,6 +1,8 @@
package freenet.pluginmanager;
public class PluginHTTPException extends Exception {
+ private static final long serialVersionUID = -1;
+
private int code;
private String mimeType;
private String desc;
Modified: trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/pluginmanager/PluginNotFoundException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.pluginmanager;
public class PluginNotFoundException extends Exception {
+ private static final long serialVersionUID = -1;
public PluginNotFoundException() {
super();
Modified: trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/pluginmanager/PluginSecurityException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,6 +1,7 @@
package freenet.pluginmanager;
public class PluginSecurityException extends Exception {
+ private static final long serialVersionUID = -1;
/**
*
Modified: trunk/freenet/src/freenet/store/FreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/FreenetStore.java 2006-06-17 07:36:49 UTC
(rev 9253)
+++ trunk/freenet/src/freenet/store/FreenetStore.java 2006-06-17 07:53:03 UTC
(rev 9254)
@@ -4,7 +4,6 @@
import freenet.crypt.DSAPublicKey;
import freenet.keys.CHKBlock;
-import freenet.keys.KeyBlock;
import freenet.keys.NodeCHK;
import freenet.keys.NodeSSK;
import freenet.keys.SSKBlock;
Modified: trunk/freenet/src/freenet/support/LoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/LoggerHook.java 2006-06-17 07:36:49 UTC
(rev 9253)
+++ trunk/freenet/src/freenet/support/LoggerHook.java 2006-06-17 07:53:03 UTC
(rev 9254)
@@ -158,6 +158,8 @@
}
public static class InvalidThresholdException extends Exception {
+ private static final long serialVersionUID = -1;
+
InvalidThresholdException(String msg) {
super(msg);
}
Modified: trunk/freenet/src/freenet/support/ReadOnlyFileSliceBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/ReadOnlyFileSliceBucket.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/support/ReadOnlyFileSliceBucket.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -99,7 +99,8 @@
}
public class ReadOnlyFileSliceBucketException extends IOException {
-
+ private static final long serialVersionUID = -1;
+
public ReadOnlyFileSliceBucketException(FileNotFoundException
e) {
super("File not found: "+e.getMessage());
initCause(e);
Modified: trunk/freenet/src/freenet/support/URLEncodedFormatException.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncodedFormatException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/support/URLEncodedFormatException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -13,6 +13,8 @@
**/
public class URLEncodedFormatException extends Exception {
+ private static final long serialVersionUID = -1;
+
URLEncodedFormatException () {}
URLEncodedFormatException (String s) { super(s); }
}
Modified:
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
===================================================================
---
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++
trunk/freenet/src/freenet/support/UpdatableSortedLinkedListKilledException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -1,5 +1,5 @@
package freenet.support;
public class UpdatableSortedLinkedListKilledException extends Exception {
-
+ private static final long serialVersionUID = -1;
}
Modified:
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
===================================================================
---
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
2006-06-17 07:36:49 UTC (rev 9253)
+++
trunk/freenet/src/freenet/support/compress/CompressionOutputSizeException.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -4,5 +4,5 @@
* The output was too big for the buffer.
*/
public class CompressionOutputSizeException extends Exception {
-
+ private static final long serialVersionUID = -1;
}
Modified: trunk/freenet/src/freenet/support/io/TooLongException.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TooLongException.java 2006-06-17
07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/support/io/TooLongException.java 2006-06-17
07:53:03 UTC (rev 9254)
@@ -4,5 +4,6 @@
/** Exception thrown by a LineReadingInputStream when a line is too long. */
public class TooLongException extends IOException {
+ private static final long serialVersionUID = -1;
}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2006-06-17 07:36:49 UTC (rev 9253)
+++ trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2006-06-17 07:53:03 UTC (rev 9254)
@@ -16,6 +16,7 @@
* Created on May 14, 2004
*/
public class SimpleBinaryRunningAverage implements RunningAverage {
+ private static final long serialVersionUID = -1;
public Object clone() {
return new SimpleBinaryRunningAverage(this);
