[freenet-cvs] r17883 - in trunk/freenet/src/freenet: client/async clients/http clients/http/bookmark node

[jflesch at freenetproject.org]

Author: jflesch
Date: 2008-02-13 22:52:15 +0000 (Wed, 13 Feb 2008)
New Revision: 17883

Modified:
   trunk/freenet/src/freenet/client/async/USKFetcher.java
   trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
   trunk/freenet/src/freenet/node/Announcer.java
   trunk/freenet/src/freenet/node/NodeCryptoConfig.java
Log:
Remove unused variables / useless calls to get[...]() functions

Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -248,7 +248,7 @@
 	private void finishSuccess() {
 		if(backgroundPoll) {
 			long valAtEnd = uskManager.lookup(origUSK);
-			long end, newValAtEnd;
+			long end;
 			long now = System.currentTimeMillis();
 			synchronized(this) {
 				started = false; // don't finish before have rescheduled
@@ -271,7 +271,6 @@
 						newMinFailures = maxMinFailures;
 					minFailures = newMinFailures;
 				}
-				newValAtEnd = valAtEnd;
 			}
 			schedule(end-now);
 		} else {

Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -117,8 +117,6 @@
 		}
 		else
 		{
-			final boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
-			final boolean logNORMAL = Logger.shouldLog(Logger.NORMAL, this);
 			PageMaker pageMaker = ctx.getPageMaker();
 
 			if (request.isPartSet("submit-official") || request.isPartSet("submit-other")) {

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -403,7 +403,6 @@
 		long storeSize = storeKeys * fix32kb;
 		long maxCachedKeys = node.getChkDatacache().getMaxKeys();
 		long maxStoreKeys = node.getChkDatastore().getMaxKeys();
-		long maxOverallKeys = node.getMaxTotalKeys();
 		long cacheHits = node.getChkDatacache().hits();
 		long cacheMisses = node.getChkDatacache().misses();
 		long cacheAccesses = cacheHits + cacheMisses;

Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkManager.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -294,13 +294,7 @@
 	}
 
 	private void readBookmarks(BookmarkCategory category, SimpleFieldSet sfs) {
-		try {
-			int bookmarkVersion = sfs.getInt("Version");
-
-			_innerReadBookmarks("", category, sfs);
-		} catch(FSParseException e) {
-			_innerReadTrunkBookmarks("", category, sfs);
-		}
+		_innerReadBookmarks("", category, sfs);
 	}
 	
 	private void subscribeToUSK(BookmarkItem item) {

Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/node/Announcer.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -405,7 +405,6 @@
 				Logger.error(this, "Announcement to "+seed.userToString()+" got bogus noderef: "+reason, new Exception("debug"));
 			}
 			public void completed() {
-				long now = System.currentTimeMillis();
 				synchronized(Announcer.this) {
 					runningAnnouncements--;
 					Logger.error(this, "Announcement to "+seed.userToString()+" completed, now running "+runningAnnouncements+" announcements");

Modified: trunk/freenet/src/freenet/node/NodeCryptoConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCryptoConfig.java	2008-02-13 22:28:25 UTC (rev 17882)
+++ trunk/freenet/src/freenet/node/NodeCryptoConfig.java	2008-02-13 22:52:15 UTC (rev 17883)
@@ -177,8 +177,7 @@
 	}
 	
 	synchronized void maybeStarted(NodeCrypto crypto2) {
-		if(crypto != null) {
-		}
+
 	}
 	
 	synchronized void stopping(NodeCrypto crypto2) {