Author: nextgens
Date: 2006-11-14 14:43:25 +0000 (Tue, 14 Nov 2006)
New Revision: 10919
Modified:
trunk/freenet/.classpath
trunk/freenet/.project
trunk/freenet/.settings/org.eclipse.jdt.core.prefs
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/support/SizeUtil.java
Log:
Fix a stupid bug in SizeUtil... we are handling longs ;) thanks to stpeter for
reporting it
Modified: trunk/freenet/.classpath
===================================================================
--- trunk/freenet/.classpath 2006-11-14 00:42:38 UTC (rev 10918)
+++ trunk/freenet/.classpath 2006-11-14 14:43:25 UTC (rev 10919)
@@ -3,5 +3,6 @@
<classpathentry
excluding="freenet/node/*Test.java|org/spaceroots/mantissa/random/MersenneTwisterTest.java|test/**"
kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/freenet-ext.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib"
path="/home/nextgens/src/freenet/freenet-ext.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/freenet/.project
===================================================================
--- trunk/freenet/.project 2006-11-14 00:42:38 UTC (rev 10918)
+++ trunk/freenet/.project 2006-11-14 14:43:25 UTC (rev 10919)
@@ -22,6 +22,8 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
</natures>
</projectDescription>
Modified: trunk/freenet/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/freenet/.settings/org.eclipse.jdt.core.prefs 2006-11-14 00:42:38 UTC
(rev 10918)
+++ trunk/freenet/.settings/org.eclipse.jdt.core.prefs 2006-11-14 14:43:25 UTC
(rev 10919)
@@ -1,4 +1,4 @@
-#Sun Jul 09 17:12:16 CEST 2006
+#Fri Sep 08 23:07:46 CEST 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
@@ -11,5 +11,5 @@
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.source=1.4
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,REDFLAG
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,LOW
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,REDFLAG,REMOVE
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-14
00:42:38 UTC (rev 10918)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-14
14:43:25 UTC (rev 10919)
@@ -284,6 +284,7 @@
}
}else if (negType == 1){
// We are gonna do simple StS
+ System.out.println("STS packet in! "+packetType);
if((packetType < 0) || (packetType > 3)) {
Logger.error(this, "Decrypted auth packet but unknown
packet type "+packetType+" from "+replyTo+" possibly from "+pn);
Modified: trunk/freenet/src/freenet/support/SizeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/SizeUtil.java 2006-11-14 00:42:38 UTC
(rev 10918)
+++ trunk/freenet/src/freenet/support/SizeUtil.java 2006-11-14 14:43:25 UTC
(rev 10919)
@@ -4,14 +4,12 @@
* Size formatting utility.
*/
public class SizeUtil {
+ public static String[] suffixes = {"B",
"KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"};
public static String formatSize(long sz) {
- // First determine suffix
-
- String[] suffixes = {"B",
"KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"};
long s = 1;
int i;
- for(i=0;i<suffixes.length;i++) {
+ for(i=0;i<SizeUtil.suffixes.length;i++) {
s *= 1024;
if(s > sz) {
break;
@@ -22,7 +20,7 @@
s /= 1024; // we use the previous unit
if (s == 1) // Bytes? Then we don't need real numbers with a
comma
{
- return sz + " " + suffixes[0];
+ return sz + " " + SizeUtil.suffixes[0];
}
else
{
@@ -32,7 +30,8 @@
o = o.substring(0, 3);
else if((o.indexOf('.') > -1) && (o.indexOf('E') == -1)
&& (o.length() > 4))
o = o.substring(0, 4);
- o += " " + suffixes[i];
+ if(i < SizeUtil.suffixes.length) // handle the case
where the mantissa is Infinity
+ o += " " + SizeUtil.suffixes[i];
return o;
}
}
