Author: nextgens
Date: 2006-07-11 16:48:23 +0000 (Tue, 11 Jul 2006)
New Revision: 9561
Modified:
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/config/StringArrOption.java
trunk/freenet/src/freenet/crypt/SHA1.java
trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/InsertHandler.java
trunk/freenet/src/freenet/node/SSKInsertHandler.java
trunk/freenet/src/freenet/support/NumberedRecentItems.java
trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
trunk/freenet/src/freenet/transport/IPAddressDetector.java
Log:
Second part of the potentially controversial patch : it removes more dead-code
and suppresses many eclipse warning
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2006-07-11 16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2006-07-11 16:48:23 UTC (rev 9561)
@@ -32,44 +32,36 @@
protected PutHandler(String name, Bucket data, ClientMetadata
cm, boolean getCHKOnly) throws InserterException {
super(SimpleManifestPutter.this.getPriorityClass(),
SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler,
SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = data;
InsertBlock block =
new InsertBlock(data, cm,
FreenetURI.EMPTY_CHK_URI);
this.origSFI =
new SingleFileInserter(this, this, block,
false, ctx, false, getCHKOnly, true, null, false);
- currentState = origSFI;
metadata = null;
}
protected PutHandler(String name, FreenetURI target,
ClientMetadata cm) {
super(SimpleManifestPutter.this.getPriorityClass(),
SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler,
SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = null;
Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT,
target, cm);
metadata = m;
origSFI = null;
- currentState = null;
}
protected PutHandler(String name, String targetInZip,
ClientMetadata cm, Bucket data) {
super(SimpleManifestPutter.this.getPriorityClass(),
SimpleManifestPutter.this.chkScheduler, SimpleManifestPutter.this.sskScheduler,
SimpleManifestPutter.this.client);
- this.name = name;
this.cm = cm;
this.data = data;
this.targetInZip = targetInZip;
Metadata m = new
Metadata(Metadata.ZIP_INTERNAL_REDIRECT, targetInZip, cm);
metadata = m;
origSFI = null;
- currentState = null;
}
private SingleFileInserter origSFI;
- private ClientPutState currentState;
private ClientMetadata cm;
- private final String name;
private Metadata metadata;
private boolean finished;
private String targetInZip;
@@ -118,9 +110,6 @@
public void onTransition(ClientPutState oldState,
ClientPutState newState) {
if(oldState == this) {
- // We do not need to have a hashtable of state
-> PutHandler.
- // Because we can just pull the parent off the
state!
- this.currentState = newState;
}
}
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-07-11 16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-07-11 16:48:23 UTC (rev 9561)
@@ -42,7 +42,6 @@
final boolean insertAsArchiveManifest;
/** If true, we are not the top level request, and should not
* update our parent to point to us as current put-stage. */
- private boolean cancelled;
private boolean reportMetadataOnly;
public final Object token;
@@ -396,7 +395,6 @@
}
public void cancel() {
- cancelled = true;
}
public void schedule() throws InserterException {
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-07-11 16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2006-07-11 16:48:23 UTC (rev 9561)
@@ -28,7 +28,6 @@
*/
public class ToadletContextImpl implements ToadletContext {
- private final Socket sock;
private final MultiValueTable headers;
private final OutputStream sockOutputStream;
private final PageMaker pagemaker;
@@ -40,7 +39,6 @@
private boolean closed;
public ToadletContextImpl(Socket sock, MultiValueTable headers, String
CSSName, BucketFactory bf) throws IOException {
- this.sock = sock;
this.headers = headers;
this.closed = false;
sockOutputStream = sock.getOutputStream();
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-07-11 16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-07-11 16:48:23 UTC (rev 9561)
@@ -32,32 +32,18 @@
public class HTMLFilter implements ContentDataFilter, CharsetExtractor {
- private boolean debug = false;
private static boolean deleteWierdStuff = true;
private static boolean deleteErrors = true;
- private boolean allowSecurityErrors = false;
- private boolean allowSecurityWarnings = false;
- private boolean cssParanoidStringCheck = false;
-
- private final static String possibleAnonCompromiseMsg =
- "You have retrieved some content which is not recognised by
FProxy, and so we "
- + "don't know what your web browser might do with it.
It could be harmless, "
- + "but it could make your web browser do something
which would compromise your "
- + "anonymity.";
public void setParanoidStringCheck(boolean b) {
- cssParanoidStringCheck = b;
}
public void setAllowSecurityWarnings(boolean value) {
- allowSecurityWarnings = value;
}
public void setAllowSecurityErrors(boolean value) {
- allowSecurityErrors = value;
}
public void setDebug(boolean debug) {
- this.debug = debug;
}
public Bucket readFilter(Bucket bucket, BucketFactory bf, String
charset, HashMap otherParams, FilterCallback cb) throws DataFilterException,
IOException {
@@ -413,7 +399,6 @@
if (!pc.killTag) {
t = t.sanitize(pc);
if (t != null) {
- boolean deletedStyle = false;
if (pc.writeStyleScriptWithTag) {
pc.writeStyleScriptWithTag = false;
String style =
pc.currentStyleScriptChunk;
@@ -1385,7 +1370,7 @@
ParsedTag p,
HTMLParseContext pc) throws DataFilterException {
// Call parent so we swallow the scripting
- Hashtable h = super.sanitizeHash(hn, p, pc);
+ super.sanitizeHash(hn, p, pc);
return null; // Lose the tags
}
Modified: trunk/freenet/src/freenet/config/StringArrOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrOption.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/config/StringArrOption.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -67,5 +67,9 @@
return null;
}
}
+
+ public String getDefaultValue() {
+ return defaultValue;
+ }
}
Modified: trunk/freenet/src/freenet/crypt/SHA1.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA1.java 2006-07-11 16:12:37 UTC (rev
9560)
+++ trunk/freenet/src/freenet/crypt/SHA1.java 2006-07-11 16:48:23 UTC (rev
9561)
@@ -58,7 +58,6 @@
private int state[] = new int[5];
private long count;
- private boolean digestValid = false;
private byte[] digestBits;
private boolean NSA = true;
@@ -83,7 +82,6 @@
*/
public SHA1(boolean b) {
count = 0;
- digestValid = false;
NSA = b;
init();
}
@@ -250,7 +248,6 @@
state[4] = 0xC3D2E1F0;
count = 0;
digestBits = new byte[20];
- digestValid = false;
blockIndex = 0;
}
@@ -336,7 +333,6 @@
digestBits[i] = (byte)
((state[i>>2] >>> ((3-(i & 3)) << 3) ) & 0xff);
}
- digestValid = true;
}
/**
@@ -394,8 +390,6 @@
for (int i = 0; i < count; i++)
sha1.update(data);
long endSameUpdate = System.currentTimeMillis();
- byte digested[] = sha1.digest();
- long afterDigested = System.currentTimeMillis();
long updateTime = endSameUpdate - startSameUpdate;
long speed = 0;
long eachTime = 0;
@@ -414,8 +408,6 @@
for (int i = 0; i < count; i++)
sha1.update(data2[i]);
long endDifferentUpdate = System.currentTimeMillis();
- digested = sha1.digest();
- afterDigested = System.currentTimeMillis();
updateTime = endDifferentUpdate - differentStartTime;
speed = 0;
eachTime = 0;
@@ -454,7 +446,7 @@
* perfoms a self-test - spits out the test vector outputs on System.out
*/
public static void SHAselfTest(Digest s) {
- int i, j;
+ int i;
// This line may be safely deleted, its to make it easy to see
// the output of the program.
System.out.println("SHA-1 Test PROGRAM.");
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -38,14 +38,12 @@
/** _filters serves as lock for both */
private LinkedList _filters = new LinkedList();
private LinkedList _unclaimed = new LinkedList();
- private int _unclaimedPos;
private int _dropProbability;
private LowLevelFilter lowLevelFilter;
/** RNG for debugging, used with _dropProbability.
* NOT CRYPTO SAFE. DO NOT USE FOR THINGS THAT NEED CRYPTO SAFE RNG!
*/
private Random dropRandom;
- private boolean _active;
private boolean _isDone;
private static UdpSocketManager _usm;
private static final int MAX_UNMATCHED_FIFO_SIZE = 50000;
@@ -546,7 +544,6 @@
public void close(boolean exit) {
Logger.error(this, "Closing.", new Exception("error"));
- _active = false;
synchronized (this) {
while (!_isDone) {
try {
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -246,8 +246,6 @@
// No locally detected IP, only
one or two connections.
// Have we had more relatively
recently?
int count = 0;
- long timeref = now;
- if(firstTimeMaybeFakePeers > 0)
timeref = firstTimeMaybeFakePeers;
for(int i=0;i<peers.length;i++)
{
PeerNode p = peers[i];
if((!p.isConnected())
|| (now - p.lastReceivedPacketTime() < 5*60*1000)) {
Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java 2006-07-11 16:12:37 UTC
(rev 9560)
+++ trunk/freenet/src/freenet/node/InsertHandler.java 2006-07-11 16:48:23 UTC
(rev 9561)
@@ -39,8 +39,6 @@
private byte[] headers;
private BlockReceiver br;
private Thread runThread;
- private boolean sentSuccess;
-
PartiallyReceivedBlock prb;
InsertHandler(Message req, long id, Node node, long startTime) {
@@ -144,7 +142,6 @@
if(htl == 0) {
canCommit = true;
msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, this);
} catch (NotConnectedException e) {
@@ -253,7 +250,6 @@
if(status == CHKInsertSender.SUCCESS) {
msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, this);
} catch (NotConnectedException e) {
Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -8,7 +8,6 @@
import freenet.io.comm.Message;
import freenet.io.comm.MessageFilter;
import freenet.io.comm.NotConnectedException;
-import freenet.io.xfer.BlockReceiver;
import freenet.keys.NodeSSK;
import freenet.keys.SSKBlock;
import freenet.keys.SSKVerifyException;
@@ -37,12 +36,7 @@
private SSKInsertSender sender;
private byte[] data;
private byte[] headers;
- private BlockReceiver br;
- private Thread runThread;
- private boolean sentSuccess;
private boolean canCommit;
- private boolean collided;
-
SSKInsertHandler(Message req, long id, Node node, long startTime) {
this.req = req;
this.node = node;
@@ -79,8 +73,6 @@
}
private void realRun() {
- runThread = Thread.currentThread();
-
// Send Accepted
Message accepted = DMT.createFNPSSKAccepted(uid, pubKey == null);
@@ -160,7 +152,6 @@
if(htl == 0) {
Message msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, this);
} catch (NotConnectedException e) {
@@ -259,7 +250,6 @@
if(status == SSKInsertSender.SUCCESS) {
Message msg = DMT.createFNPInsertReply(uid);
- sentSuccess = true;
try {
source.send(msg, null);
} catch (NotConnectedException e) {
Modified: trunk/freenet/src/freenet/support/NumberedRecentItems.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedRecentItems.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/support/NumberedRecentItems.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -15,8 +15,6 @@
private NumberedItem[] items;
private int count;
private Comparator myComparator;
- private boolean wrapAround;
-
/**
* Create a NumberedRecentItems list.
* @param maxSize The maximum number of NumberedItems to keep.
@@ -27,7 +25,6 @@
public NumberedRecentItems(int maxSize, boolean wrap) {
items = new NumberedItem[maxSize];
count = 0;
- wrapAround = wrap;
myComparator = new NumberedItemComparator(wrap);
}
Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2006-07-11 16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2006-07-11 16:48:23 UTC (rev 9561)
@@ -25,9 +25,6 @@
/** Directory containing persistent temporary files */
private final File dir;
- /** Temp file prefix; anything not matching this prefix will be ignored
*/
- private final String prefix;
-
/** Original contents of directory */
private HashSet originalFiles;
@@ -40,7 +37,6 @@
public PersistentTempBucketFactory(File dir, String prefix,
RandomSource rand) throws IOException {
this.dir = dir;
this.rand = rand;
- this.prefix = prefix;
this.fg = new FilenameGenerator(rand, false, dir, prefix);
if(!dir.exists()) {
dir.mkdir();
Modified: trunk/freenet/src/freenet/transport/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/transport/IPAddressDetector.java 2006-07-11
16:12:37 UTC (rev 9560)
+++ trunk/freenet/src/freenet/transport/IPAddressDetector.java 2006-07-11
16:48:23 UTC (rev 9561)
@@ -205,7 +205,6 @@
Logger.debug(
this,
"onGetAddresses found " + v.size() + "
potential addresses)");
- boolean detectedInetAddress = false;
InetAddress addrDetected = null;
if (v.size() == 0) {
Logger.error(this, "No addresses found!");
@@ -229,7 +228,6 @@
addrDetected = i;
//Use the last detected valid
IP as 'detected' IP
- detectedInetAddress = true;
if ((preferedInetAddress !=
null)
&& addrDetected.equals(
preferedInetAddress)) { //Prefer the specified address if it is still available
to us. Do not look for more ones
