Author: toad
Date: 2005-11-25 00:50:05 +0000 (Fri, 25 Nov 2005)
New Revision: 7591
Modified:
trunk/freenet/src/freenet/client/RetryTracker.java
trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
trunk/freenet/src/freenet/node/Version.java
Log:
211:
More splitfile fixes; progress monitor should work now.
Modified: trunk/freenet/src/freenet/client/RetryTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/RetryTracker.java 2005-11-25 00:40:25 UTC
(rev 7590)
+++ trunk/freenet/src/freenet/client/RetryTracker.java 2005-11-25 00:50:05 UTC
(rev 7591)
@@ -208,6 +208,7 @@
callback.onProgress();
if(killed) return;
Logger.minor(this, "succeeded: "+succeededBlocks.size()+",
target: "+targetSuccesses+
+ ", failed:
"+failedBlocksTooManyRetries.size()+", fatal: "+failedBlocksFatalErrors.size()+
", running: "+runningBlocks.size()+", levels:
"+levels.size()+"("+curMinLevel+"-"+curMaxLevel+"), finishOnEmpty:
"+finishOnEmpty);
if(runningBlocks.size() == 1)
Logger.minor(this, "Only block running:
"+runningBlocks.toArray()[0]);
Modified: trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2005-11-25 00:40:25 UTC (rev 7590)
+++ trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2005-11-25 00:50:05 UTC (rev 7591)
@@ -20,7 +20,7 @@
}
public String getDescription() {
- return "Completed "+fetchedBlocks+"/"+totalBlocks+" (failed
"+fetchedBlocks+", fatally "+fatallyFailedBlocks+", running "+runningBlocks+")";
+ return "Completed "+fetchedBlocks+"/"+totalBlocks+" (failed
"+failedBlocks+", fatally "+fatallyFailedBlocks+", running "+runningBlocks+")";
}
public int getCode() {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-25 00:40:25 UTC (rev
7590)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-25 00:50:05 UTC (rev
7591)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 210;
+ public static final int buildNumber = 211;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 210;
+ public static final int lastGoodBuild = 211;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
