Author: zothar
Date: 2006-07-09 21:51:04 +0000 (Sun, 09 Jul 2006)
New Revision: 9528
Modified:
trunk/freenet/src/freenet/client/async/USKFetcher.java
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
Log:
Sprinkle some statics as recommended by lint4j
Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-07-09
21:32:21 UTC (rev 9527)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-07-09
21:51:04 UTC (rev 9528)
@@ -168,8 +168,8 @@
long minFailures;
final long origMinFailures;
- final long origSleepTime = 1000;
- final long maxSleepTime = 60 * 60 * 1000;
+ static final long origSleepTime = 1000;
+ static final long maxSleepTime = 60 * 60 * 1000;
long sleepTime = origSleepTime;
/** Maximum number of editions to probe ahead. */
Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-07-09
21:32:21 UTC (rev 9527)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-07-09
21:51:04 UTC (rev 9528)
@@ -83,10 +83,10 @@
private final HashMap urisByWord = new HashMap();
private final HashMap titlesOfURIs = new HashMap();
- private final int minTimeBetweenEachIndexRewriting = 10;
+ private static final int minTimeBetweenEachIndexRewriting = 10;
// Can have many; this limit only exists to save memory.
- private final int maxParallelRequests = 20;
+ private static final int maxParallelRequests = 20;
private int maxShownURIs = 50;
private Node node;
@@ -94,19 +94,19 @@
private final short PRIORITY_CLASS =
RequestStarter.PREFETCH_PRIORITY_CLASS;
private boolean stopped = true;
- private final String indexFilename = "new.index.xml";
+ private static final String indexFilename = "new.index.xml";
- private final String pluginName = "Ninja spider";
+ private static final String pluginName = "Ninja spider";
- private final boolean htmlOnly = true;
+ private static final boolean htmlOnly = true;
/* The ones below are required to genereate a correct index, see:
* http://wiki.freenetproject.org/AnotherFreenetIndexFormat
*/
- private final String indexTitle= "This is an index";
- private final String indexOwner = "Another anonymous";
- private final String indexOwnerEmail = null; /* can be null */
+ private static final String indexTitle= "This is an index";
+ private static final String indexOwner = "Another anonymous";
+ private static final String indexOwnerEmail = null; /* can be null */
private final HashMap sizeOfURIs = new HashMap(); /* String (URI) ->
Long */
private final HashMap mimeOfURIs = new HashMap(); /* String (URI) ->
String */
private final HashMap lastPositionByURI = new HashMap(); /* String
(URI) -> Integer */ /* Use to determine word position on each uri */
Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2006-07-09 21:32:21 UTC
(rev 9527)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2006-07-09 21:51:04 UTC
(rev 9528)
@@ -57,10 +57,10 @@
private final HashMap urisByWord = new HashMap();
private final HashMap titlesOfURIs = new HashMap();
- private final int minTimeBetweenEachIndexRewriting = 10;
+ private static final int minTimeBetweenEachIndexRewriting = 10;
// Can have many; this limit only exists to save memory.
- private final int maxParallelRequests = 20;
+ private static final int maxParallelRequests = 20;
private int maxShownURIs = 50;
private Node node;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-07-09 21:32:21 UTC (rev
9527)
+++ trunk/freenet/src/freenet/node/Node.java 2006-07-09 21:51:04 UTC (rev
9528)
@@ -507,7 +507,7 @@
/** Next time to log the PeerNode status summary */
private long nextPeerNodeStatusLogTime = -1;
/** PeerNode status summary log interval (milliseconds) */
- private final long peerNodeStatusLogInterval = 1000;
+ private static final long peerNodeStatusLogInterval = 1000;
/** PeerNode statuses, by status */
private final HashMap peerNodeStatuses;
/** PeerNode routing backoff reasons, by reason */
@@ -515,17 +515,17 @@
/** Next time to update oldestNeverConnectedPeerAge */
private long nextOldestNeverConnectedPeerAgeUpdateTime = -1;
/** oldestNeverConnectedPeerAge update interval (milliseconds) */
- private final long oldestNeverConnectedPeerAgeUpdateInterval = 5000;
+ private static final long oldestNeverConnectedPeerAgeUpdateInterval =
5000;
/** age of oldest never connected peer (milliseconds) */
private long oldestNeverConnectedPeerAge = 0;
/** Next time to start a ready ARKFetcher */
private long nextReadyARKFetcherStartTime = -1;
/** Ready ARKFetcher start interval (milliseconds) */
- private final long readyARKFetcherStartInterval = 1000;
+ private static final long readyARKFetcherStartInterval = 1000;
/** Next time to update PeerManagerUserAlert stats */
private long nextPeerManagerUserAlertStatsUpdateTime = -1;
/** PeerManagerUserAlert stats update interval (milliseconds) */
- private final long peerManagerUserAlertStatsUpdateInterval = 1000; //
1 second
+ private static final long peerManagerUserAlertStatsUpdateInterval =
1000; // 1 second
/** first time bwlimitDelay was over PeerManagerUserAlert threshold */
private long firstBwlimitDelayTimeThresholdBreak = 0;
/** first time nodeAveragePing was over PeerManagerUserAlert threshold
*/
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-07-09 21:32:21 UTC
(rev 9527)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-07-09 21:51:04 UTC
(rev 9528)
@@ -1631,11 +1631,11 @@
long routingBackedOffUntil = -1;
/** Initial nominal routing backoff length */
- final int INITIAL_ROUTING_BACKOFF_LENGTH = 1000; // 1 second
+ static final int INITIAL_ROUTING_BACKOFF_LENGTH = 1000; // 1 second
/** How much to multiply by during fast routing backoff */
- final int BACKOFF_MULTIPLIER = 2;
+ static final int BACKOFF_MULTIPLIER = 2;
/** Maximum upper limit to routing backoff slow or fast */
- final int MAX_ROUTING_BACKOFF_LENGTH = 3*60*60*1000; // 3 hours
+ static final int MAX_ROUTING_BACKOFF_LENGTH = 3*60*60*1000; // 3 hours
/** Current nominal routing backoff length */
int routingBackoffLength = INITIAL_ROUTING_BACKOFF_LENGTH;
/** Last backoff reason */
Modified:
trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
2006-07-09 21:32:21 UTC (rev 9527)
+++ trunk/freenet/src/freenet/node/updater/UpdateRevocationURICallback.java
2006-07-09 21:51:04 UTC (rev 9528)
@@ -7,7 +7,7 @@
public class UpdateRevocationURICallback implements StringCallback{
private final Node node;
- private final String baseURI = "SSK at
VOfCZVTYPaatJ~eB~4lu2cPrWEmGyt4bfbB1v15Z6qQ,B6EynLhm7QE0se~rMgWWhl7wh3rFWjxJsEUcyohAm8A,AQABAAE/revoked/";
+ private static final String baseURI = "SSK at
VOfCZVTYPaatJ~eB~4lu2cPrWEmGyt4bfbB1v15Z6qQ,B6EynLhm7QE0se~rMgWWhl7wh3rFWjxJsEUcyohAm8A,AQABAAE/revoked/";
public UpdateRevocationURICallback(Node node) {
this.node = node;
Modified: trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
2006-07-09 21:32:21 UTC (rev 9527)
+++ trunk/freenet/src/freenet/node/updater/UpdateURICallback.java
2006-07-09 21:51:04 UTC (rev 9528)
@@ -8,7 +8,7 @@
public class UpdateURICallback implements StringCallback{
private final Node node;
- private final String baseURI = "freenet:USK at
SIDKS6l-eOU8IQqDo03d~3qqBd-69WG60aDgg4nWqss,CPFqYi95Is3GwzAdAKtAuFMCXDZFFWC3~uPoidCD67s,AQABAAE/update/";
+ private static final String baseURI = "freenet:USK at
SIDKS6l-eOU8IQqDo03d~3qqBd-69WG60aDgg4nWqss,CPFqYi95Is3GwzAdAKtAuFMCXDZFFWC3~uPoidCD67s,AQABAAE/update/";
public UpdateURICallback(Node node) {
this.node = node;
