Author: dbkr
Date: 2006-06-21 19:12:24 +0000 (Wed, 21 Jun 2006)
New Revision: 9338

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Fix percentages in the Queue toadlet ('whoops').


Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-06-21 
16:48:37 UTC (rev 9337)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-06-21 
19:12:24 UTC (rev 9338)
@@ -457,17 +457,20 @@
                double failed = p.getFailedBlocks()/total;
                double failed2 = p.getFatalyFailedBlocks()/total;
                double min = p.getMinBlocks()/total;
+
+               if (Double.isNaN(fetched)) fetched = 0.0;
+               if (Double.isNaN(failed)) failed = 0.0;
+               if (Double.isNaN(failed2)) failed2 = 0.0;
+               if (Double.isNaN(min)) min = 0.0;

-               double frac = fetched / total;
-               
                boolean b = p.isTotalFinalized();
-               if(frac < 0) {
+               if(fetched < 0) {
                        buf.append("<span 
class=\"progress_fraction_unknown\">unknown</span>");
                } else {
                        NumberFormat nf = NumberFormat.getInstance();
                        nf.setMaximumFractionDigits(0);
                        buf.append("<div class=\"progressbar\">"+
-                                       "<div class=\"progressbar-done\" 
style=\"width: "+nf.format(frac*100)+"px\"></div>");
+                                       "<div class=\"progressbar-done\" 
style=\"width: "+nf.format(fetched*100)+"px\"></div>");
                        
if(node.getToadletContainer().isAdvancedDarknetEnabled())
                        {
                                if(failed > 0)
@@ -484,7 +487,7 @@
                                buf.append("<span 
class=\"progress_fraction_finalized\">");
                        else
                                buf.append("<span 
class=\"progress_fraction_not_finalized\">");
-                       buf.append(nf.format(frac*100));
+                       buf.append(nf.format(fetched*100));
                        buf.append("%</span>");
                }
                buf.append("</td>\n");


Reply via email to