Author: blured75
Date: 2005-11-05 20:37:43 +0000 (Sat, 05 Nov 2005)
New Revision: 7482
Modified:
trunk/freenet/src/freenet/node/FSParseException.java
trunk/freenet/src/freenet/node/KeyChangedException.java
trunk/freenet/src/freenet/node/Location.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
Log:
Correcting non neccessary import clauses and unused variables
Modified: trunk/freenet/src/freenet/node/FSParseException.java
===================================================================
--- trunk/freenet/src/freenet/node/FSParseException.java 2005-11-05
20:37:19 UTC (rev 7481)
+++ trunk/freenet/src/freenet/node/FSParseException.java 2005-11-05
20:37:43 UTC (rev 7482)
@@ -5,7 +5,7 @@
* SimpleFieldSet format (after it has been turned into a SFS).
*/
public class FSParseException extends Exception {
-
+ 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 2005-11-05
20:37:19 UTC (rev 7481)
+++ trunk/freenet/src/freenet/node/KeyChangedException.java 2005-11-05
20:37:43 UTC (rev 7482)
@@ -5,5 +5,5 @@
* of acquiring a packet number.
*/
public class KeyChangedException extends Exception {
-
+ static final long serialVersionUID = -1;
}
Modified: trunk/freenet/src/freenet/node/Location.java
===================================================================
--- trunk/freenet/src/freenet/node/Location.java 2005-11-05 20:37:19 UTC
(rev 7481)
+++ trunk/freenet/src/freenet/node/Location.java 2005-11-05 20:37:43 UTC
(rev 7482)
@@ -1,12 +1,5 @@
package freenet.node;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-
import freenet.crypt.RandomSource;
/**
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2005-11-05 20:37:19 UTC
(rev 7481)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2005-11-05 20:37:43 UTC
(rev 7482)
@@ -324,8 +324,7 @@
RecentlyForwardedItem item;
public void run() {
- long uid = r.nextLong();
- Long luid = new Long(uid);
+ long uid = r.nextLong();
if(!lock()) return;
try {
startedSwaps++;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2005-11-05 20:37:19 UTC (rev
7481)
+++ trunk/freenet/src/freenet/node/Node.java 2005-11-05 20:37:43 UTC (rev
7482)
@@ -55,6 +55,8 @@
*/
public class Node implements SimpleLowLevelClient {
+ static final long serialVersionUID = -1;
+
public static final int PACKETS_IN_BLOCK = 32;
public static final int PACKET_SIZE = 1024;
public static final double DECREMENT_AT_MIN_PROB = 0.2;
@@ -701,4 +703,9 @@
myName = key;
writeNodeFile();
}
+
+ public KeyBlock getKey(ClientKey key, boolean localOnly) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2005-11-05 20:37:19 UTC
(rev 7481)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2005-11-05 20:37:43 UTC
(rev 7482)
@@ -3,7 +3,6 @@
import java.util.LinkedList;
import freenet.io.comm.NotConnectedException;
-import freenet.support.Fields;
import freenet.support.Logger;
/**
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2005-11-05 20:37:19 UTC
(rev 7481)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2005-11-05 20:37:43 UTC
(rev 7482)
@@ -25,7 +25,6 @@
import freenet.io.comm.Peer;
import freenet.io.comm.PeerContext;
import freenet.io.comm.PeerParseException;
-import freenet.io.xfer.PacketThrottle;
import freenet.support.Fields;
import freenet.support.HexUtil;
import freenet.support.Logger;
@@ -69,13 +68,7 @@
/** When did we last send a packet? */
private long timeLastSentPacket;
-
- /** What is the current maximum inter-packet time (this is
- * randomized to make it hard to profile; it is essentially
- * a keepalive though).
- */
- private long maxTimeBetweenPacketSends;
-
+
/** When did we last receive a packet? */
private long timeLastReceivedPacket;
@@ -89,8 +82,6 @@
*/
private boolean isConnected;
- /** Throttle, used by data transfers */
- private PacketThrottle throttle;
/** Current location in the keyspace */
private Location currentLocation;
@@ -250,9 +241,7 @@
// Not connected yet; need to handshake
isConnected = false;
-
- throttle = PacketThrottle.getThrottle(peer, Node.PACKET_SIZE);
-
+
messagesToSendNow = new LinkedList();
decrementHTLAtMaximum = node.random.nextFloat() <
Node.DECREMENT_AT_MAX_PROB;
@@ -262,7 +251,6 @@
private void randomizeMaxTimeBetweenPacketSends() {
int x = Node.KEEPALIVE_INTERVAL;
x += node.random.nextInt(x);
- maxTimeBetweenPacketSends = x;
}
private void randomizeMaxTimeBetweenPacketReceives() {
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2005-11-05 20:37:19 UTC
(rev 7481)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2005-11-05 20:37:43 UTC
(rev 7482)
@@ -47,8 +47,7 @@
// Terminal status
// Always set finished AFTER setting the reason flag
- private boolean finished = false;
-
+
private int status = -1;
static final int NOT_FINISHED = -1;
static final int SUCCESS = 0;
@@ -58,8 +57,8 @@
static final int TRANSFER_FAILED = 4;
static final int VERIFY_FAILURE = 5;
- private boolean transferring = false;
+
public String toString() {
return super.toString()+" for "+uid;
}
@@ -213,8 +212,7 @@
headers =
((ShortBuffer)msg.getObject(DMT.BLOCK_HEADERS)).getData();
// FIXME: Validate headers
-
- transferring = true;
+
node.addTransferringSender(key, this);
try {
@@ -246,7 +244,6 @@
return;
}
} finally {
- transferring = false;
node.removeTransferringSender(key, this);
}
}
@@ -299,7 +296,7 @@
private void finish(int code) {
Logger.minor(this, "finish("+code+")");
status = code;
- finished = true;
+
synchronized(this) {
notifyAll();
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-05
20:37:19 UTC (rev 7481)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-05
20:37:43 UTC (rev 7482)
@@ -9,9 +9,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import java.net.MalformedURLException;
import java.util.Hashtable;
@@ -22,7 +20,6 @@
import freenet.keys.CHKEncodeException;
import freenet.keys.ClientCHK;
import freenet.keys.ClientCHKBlock;
-import freenet.keys.ClientPublishStreamKey;
import freenet.keys.FreenetURI;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
