Author: j16sdiz
Date: 2008-04-11 11:22:59 +0000 (Fri, 11 Apr 2008)
New Revision: 19174
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/io/AddressTrackerItem.java
trunk/freenet/src/freenet/io/comm/DMT.java
trunk/freenet/src/freenet/node/NetworkIDManager.java
trunk/freenet/src/freenet/node/NodeStarter.java
trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
trunk/freenet/src/freenet/support/io/NativeThread.java
trunk/freenet/src/freenet/support/io/TempBucketFactory.java
Log:
findbugs: fields isn't final but should be
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2008-04-11 10:41:03 UTC
(rev 19173)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2008-04-11 11:22:59 UTC
(rev 19174)
@@ -196,11 +196,11 @@
/** If the minimum gap is at least this, we might be port forwarded.
* RFC 4787 requires at least 2 minutes, but many NATs have shorter
timeouts. */
- public static long MAYBE_TUNNEL_LENGTH = ((5*60)+1)*1000L;
+ public final static long MAYBE_TUNNEL_LENGTH = ((5 * 60) + 1) * 1000L;
/** If the minimum gap is at least this, we are almost certainly port
forwarded.
* Some stateful firewalls do at least 30 minutes. Hopefully the below
is
* sufficiently over the top! */
- public static long DEFINITELY_TUNNEL_LENGTH = (12*60+1)*60*1000L;
+ public final static long DEFINITELY_TUNNEL_LENGTH = (12 * 60 + 1) * 60
* 1000L;
/** Time after which we ignore evidence that we are port forwarded */
public static final long HORIZON = 24*60*60*1000L;
Modified: trunk/freenet/src/freenet/io/AddressTrackerItem.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTrackerItem.java 2008-04-11
10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/io/AddressTrackerItem.java 2008-04-11
11:22:59 UTC (rev 19174)
@@ -50,7 +50,7 @@
public static final int TRACK_GAPS = 5;
private long[] gapLengths;
private long[] gapLengthRecvTimes;
- static final long GAP_THRESHOLD = AddressTracker.MAYBE_TUNNEL_LENGTH;
+ private static final long GAP_THRESHOLD =
AddressTracker.MAYBE_TUNNEL_LENGTH;
static final boolean INCLUDE_RECEIVED_PACKETS = true;
public AddressTrackerItem(long timeDefinitelyNoPacketsReceived, long
timeDefinitelyNoPacketsSent) {
Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java 2008-04-11 10:41:03 UTC (rev
19173)
+++ trunk/freenet/src/freenet/io/comm/DMT.java 2008-04-11 11:22:59 UTC (rev
19174)
@@ -711,7 +711,8 @@
return msg;
}
- public static MessageType FNPSSKAccepted = new
MessageType("FNPSSKAccepted", PRIORITY_HIGH) {{
+ public final static MessageType FNPSSKAccepted = new
MessageType("FNPSSKAccepted", PRIORITY_HIGH) {
+ {
addField(UID, Long.class);
addField(NEED_PUB_KEY, Boolean.class);
}};
@@ -723,7 +724,8 @@
return msg;
}
- public static MessageType FNPSSKPubKey = new
MessageType("FNPSSKPubKey", PRIORITY_BULK_DATA) {{
+ public final static MessageType FNPSSKPubKey = new
MessageType("FNPSSKPubKey", PRIORITY_BULK_DATA) {
+ {
addField(UID, Long.class);
addField(PUBKEY_AS_BYTES, ShortBuffer.class);
}};
@@ -735,7 +737,8 @@
return msg;
}
- public static MessageType FNPSSKPubKeyAccepted = new
MessageType("FNPSSKPubKeyAccepted", PRIORITY_HIGH) {{
+ public final static MessageType FNPSSKPubKeyAccepted = new
MessageType("FNPSSKPubKeyAccepted", PRIORITY_HIGH) {
+ {
addField(UID, Long.class);
}};
@@ -749,7 +752,8 @@
/** Sent when a request to an opennet node is completed, but the data
source does not want to
* path fold. Sent even on pure darknet. A better name might be
FNPRequestCompletedAck. */
- public static MessageType FNPOpennetCompletedAck = new
MessageType("FNPOpennetCompletedAck", PRIORITY_LOW) {{
+ public final static MessageType FNPOpennetCompletedAck = new
MessageType("FNPOpennetCompletedAck", PRIORITY_LOW) {
+ {
addField(UID, Long.class);
}};
@@ -762,7 +766,9 @@
/** Sent when a request completes and the data source wants to path
fold. Starts a bulk data
* transfer including the (padded) noderef.
*/
- public static MessageType FNPOpennetConnectDestinationNew = new
MessageType("FNPConnectDestinationNew", PRIORITY_UNSPECIFIED) {{
+ public final static MessageType FNPOpennetConnectDestinationNew = new
MessageType("FNPConnectDestinationNew",
+ PRIORITY_UNSPECIFIED) {
+ {
addField(UID, Long.class); // UID of original message chain
addField(TRANSFER_UID, Long.class); // UID of data transfer
addField(NODEREF_LENGTH, Integer.class); // Size of noderef
@@ -781,7 +787,9 @@
/** Path folding response. Sent when the requestor wants to path fold
and has received a noderef
* from the data source. Starts a bulk data transfer including the
(padded) noderef.
*/
- public static MessageType FNPOpennetConnectReplyNew = new
MessageType("FNPConnectReplyNew", PRIORITY_UNSPECIFIED) {{
+ public final static MessageType FNPOpennetConnectReplyNew = new
MessageType("FNPConnectReplyNew",
+ PRIORITY_UNSPECIFIED) {
+ {
addField(UID, Long.class); // UID of original message chain
addField(TRANSFER_UID, Long.class); // UID of data transfer
addField(NODEREF_LENGTH, Integer.class); // Size of noderef
@@ -802,7 +810,9 @@
/**
* Announcement request. Noderef is attached, will be transferred
before anything else is done.
*/
- public static MessageType FNPOpennetAnnounceRequest = new
MessageType("FNPOpennetAnnounceRequest", PRIORITY_HIGH) {{
+ public final static MessageType FNPOpennetAnnounceRequest = new
MessageType("FNPOpennetAnnounceRequest",
+ PRIORITY_HIGH) {
+ {
addField(UID, Long.class);
addField(TRANSFER_UID, Long.class);
addField(NODEREF_LENGTH, Integer.class);
@@ -829,7 +839,8 @@
* request will result in many reply's. When the announcement is done,
we return a DataNotFound; if
* we run into a dead-end, we return a RejectedLoop; if we can't accept
it, RejectedOverload.
*/
- public static MessageType FNPOpennetAnnounceReply = new
MessageType("FNPOpennetAnnounceReply", PRIORITY_LOW) {{
+ public final static MessageType FNPOpennetAnnounceReply = new
MessageType("FNPOpennetAnnounceReply", PRIORITY_LOW) {
+ {
addField(UID, Long.class);
addField(TRANSFER_UID, Long.class);
addField(NODEREF_LENGTH, Integer.class);
@@ -845,7 +856,9 @@
return msg;
}
- public static MessageType FNPOpennetAnnounceCompleted = new
MessageType("FNPOpennetAnnounceCompleted", PRIORITY_LOW) {{
+ public final static MessageType FNPOpennetAnnounceCompleted = new
MessageType("FNPOpennetAnnounceCompleted",
+ PRIORITY_LOW) {
+ {
addField(UID, Long.class);
}};
@@ -855,7 +868,8 @@
return msg;
}
- public static MessageType FNPOpennetDisabled = new
MessageType("FNPOpennetDisabled", PRIORITY_HIGH) {{
+ public final static MessageType FNPOpennetDisabled = new
MessageType("FNPOpennetDisabled", PRIORITY_HIGH) {
+ {
addField(UID, Long.class);
}};
@@ -865,7 +879,9 @@
return msg;
}
- public static MessageType FNPOpennetNoderefRejected = new
MessageType("FNPOpennetNoderefRejected", PRIORITY_HIGH) {{
+ public final static MessageType FNPOpennetNoderefRejected = new
MessageType("FNPOpennetNoderefRejected",
+ PRIORITY_HIGH) {
+ {
addField(UID, Long.class);
addField(REJECT_CODE, Integer.class);
}};
@@ -899,7 +915,9 @@
// FIXME get rid???
- public static MessageType FNPOpennetAnnounceNodeNotWanted = new
MessageType("FNPOpennetAnnounceNodeNotWanted", PRIORITY_LOW) {{
+ public final static MessageType FNPOpennetAnnounceNodeNotWanted = new
MessageType(
+ "FNPOpennetAnnounceNodeNotWanted", PRIORITY_LOW) {
+ {
addField(UID, Long.class);
}};
@@ -911,7 +929,8 @@
// Key offers (ULPRs)
- public static MessageType FNPOfferKey = new MessageType("FNPOfferKey",
PRIORITY_LOW) {{
+ public final static MessageType FNPOfferKey = new
MessageType("FNPOfferKey", PRIORITY_LOW) {
+ {
addField(KEY, Key.class);
addField(OFFER_AUTHENTICATOR, ShortBuffer.class);
}};
@@ -924,7 +943,8 @@
}
// Short timeout so PRIORITY_HIGH
- public static MessageType FNPGetOfferedKey = new
MessageType("FNPGetOfferedKey", PRIORITY_HIGH) {{
+ public final static MessageType FNPGetOfferedKey = new
MessageType("FNPGetOfferedKey", PRIORITY_HIGH) {
+ {
addField(KEY, Key.class);
addField(OFFER_AUTHENTICATOR, ShortBuffer.class);
addField(NEED_PUB_KEY, Boolean.class);
@@ -941,7 +961,8 @@
}
// Permanently rejected. RejectedOverload means temporarily rejected.
- public static MessageType FNPGetOfferedKeyInvalid = new
MessageType("FNPGetOfferedKeyInvalid", PRIORITY_HIGH) {{ // short timeout
+ public final static MessageType FNPGetOfferedKeyInvalid = new
MessageType("FNPGetOfferedKeyInvalid", PRIORITY_HIGH) {
+ { // short timeout
addField(UID, Long.class);
addField(REASON, Short.class);
}};
@@ -953,8 +974,8 @@
return msg;
}
- public static short GET_OFFERED_KEY_REJECTED_BAD_AUTHENTICATOR = 1;
- public static short GET_OFFERED_KEY_REJECTED_NO_KEY = 2;
+ public final static short GET_OFFERED_KEY_REJECTED_BAD_AUTHENTICATOR =
1;
+ public final static short GET_OFFERED_KEY_REJECTED_NO_KEY = 2;
public static final MessageType FNPPing = new MessageType("FNPPing",
PRIORITY_HIGH) {{
addField(PING_SEQNO, Integer.class);
Modified: trunk/freenet/src/freenet/node/NetworkIDManager.java
===================================================================
--- trunk/freenet/src/freenet/node/NetworkIDManager.java 2008-04-11
10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/node/NetworkIDManager.java 2008-04-11
11:22:59 UTC (rev 19174)
@@ -31,9 +31,9 @@
* @created 2008-02-06
*/
public class NetworkIDManager implements Runnable, Comparator {
- public static boolean disableSecretPings=true;
- public static boolean disableSecretPinger=true;
- public static boolean disableSwapSegregation=true;
+ public static boolean disableSecretPings = true;
+ public static boolean disableSecretPinger = true;
+ public static boolean disableSwapSegregation = true;
private static final int ACCEPTED_TIMEOUT = 5000;
private static final int SECRETPONG_TIMEOUT = 20000;
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2008-04-11 10:41:03 UTC
(rev 19173)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2008-04-11 11:22:59 UTC
(rev 19174)
@@ -36,7 +36,7 @@
{
private Node node;
private static LoggingConfigHandler logConfigHandler;
- public static int RECOMMENDED_EXT_BUILD_NUMBER = 20;
+ public final static int RECOMMENDED_EXT_BUILD_NUMBER = 20;
/*
(File.separatorChar == '\\') &&
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2008-04-11 10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2008-04-11 11:22:59 UTC (rev 19174)
@@ -29,7 +29,7 @@
*/
public class ClientPutDiskDirMessage extends ClientPutDirMessage {
- public static String NAME = "ClientPutDiskDir";
+ public final static String NAME = "ClientPutDiskDir";
final File dirname;
final boolean allowUnreadableFiles;
Modified: trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
2008-04-11 10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
2008-04-11 11:22:59 UTC (rev 19174)
@@ -22,9 +22,9 @@
*
*/
public class TestDDACompleteMessage extends FCPMessage {
- public static String name = "TestDDAComplete";
- public static String READ_ALLOWED = "ReadDirectoryAllowed";
- public static String WRITE_ALLOWED = "WriteDirectoryAllowed";
+ public final static String name = "TestDDAComplete";
+ public final static String READ_ALLOWED = "ReadDirectoryAllowed";
+ public final static String WRITE_ALLOWED = "WriteDirectoryAllowed";
final DDACheckJob checkJob;
final String readContentFromClient;
Modified: trunk/freenet/src/freenet/support/io/NativeThread.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NativeThread.java 2008-04-11
10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/support/io/NativeThread.java 2008-04-11
11:22:59 UTC (rev 19174)
@@ -19,14 +19,14 @@
public static final boolean _loadNative;
private static boolean _disabled;
public static final int JAVA_PRIORITY_RANGE = Thread.MAX_PRIORITY -
Thread.MIN_PRIORITY;
- private static int NATIVE_PRIORITY_BASE;
- public static int NATIVE_PRIORITY_RANGE;
+ private final static int NATIVE_PRIORITY_BASE;
+ public final static int NATIVE_PRIORITY_RANGE;
private int currentPriority = Thread.MAX_PRIORITY;
private boolean dontCheckRenice = false;
- public static boolean HAS_THREE_NICE_LEVELS;
- public static boolean HAS_ENOUGH_NICE_LEVELS;
- public static boolean HAS_PLENTY_NICE_LEVELS;
+ public final static boolean HAS_THREE_NICE_LEVELS;
+ public final static boolean HAS_ENOUGH_NICE_LEVELS;
+ public final static boolean HAS_PLENTY_NICE_LEVELS;
// 5 is enough generally for our purposes.
public static final int ENOUGH_NICE_LEVELS = 5;
Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-04-11
10:41:03 UTC (rev 19173)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-04-11
11:22:59 UTC (rev 19174)
@@ -22,7 +22,7 @@
public static long defaultIncrement = 4096;
- public static float DEFAULT_FACTOR = 1.25F;
+ public final static float DEFAULT_FACTOR = 1.25F;
// Storage accounting disabled by default.
public TempBucketFactory(FilenameGenerator filenameGenerator) {
