[freenet-cvs] r8781 - in trunk/freenet/src/freenet: clients/http node node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-05-18 23:24:55 +0000 (Thu, 18 May 2006)
New Revision: 8781

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
Log:
728:
Fix progress % on queue page (was out by a factor of 100).
Make progress % go green when finalizedTotal.

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-05-18 
23:15:49 UTC (rev 8780)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-05-18 
23:24:55 UTC (rev 8781)
@@ -369,14 +369,20 @@

        private void writeSuccessFractionCell(ClientRequest p, StringBuffer 
buf) {
                double frac = p.getSuccessFraction();
+               boolean b = p.isTotalFinalized();
                if(frac < 0) {
                        buf.append("<td>UNKNOWN</td>\n");
                } else {
                        buf.append("<td>");
+                       if(b)
+                               buf.append("<font color=\"green\">");
                        NumberFormat nf = NumberFormat.getInstance();
                        nf.setMaximumFractionDigits(1);
                        buf.append(nf.format(frac*100));
-                       buf.append("%</td>\n");
+                       if(b)
+                               buf.append("%</font></td>");
+                       else
+                               buf.append("%</td>\n");
                }
        }


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-18 23:15:49 UTC (rev 
8780)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-18 23:24:55 UTC (rev 
8781)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 727;
+       private static final int buildNumber = 728;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 698;

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-05-18 23:15:49 UTC 
(rev 8780)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-05-18 23:24:55 UTC 
(rev 8781)
@@ -500,4 +500,10 @@
                return s;
        }

+
+       public boolean isTotalFinalized() {
+               if(progressPending == null) return false;
+               else return progressPending.isTotalFinalized();
+       }
+
 }

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2006-05-18 
23:15:49 UTC (rev 8780)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2006-05-18 
23:24:55 UTC (rev 8781)
@@ -237,6 +237,11 @@
                        return -1;
        }

+       public boolean isTotalFinalized() {
+               if(!(progressMessage instanceof SimpleProgressMessage)) return 
false;
+               else return 
((SimpleProgressMessage)progressMessage).isTotalFinalized();
+       }
+       
        public String getFailureReason() {
                if(putFailedMessage == null)
                        return null;

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-05-18 
23:15:49 UTC (rev 8780)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-05-18 
23:24:55 UTC (rev 8781)
@@ -235,4 +235,9 @@
        public abstract double getSuccessFraction();

        public abstract String getFailureReason();
+
+       /**
+        * Has the total number of blocks to insert been determined yet?
+        */
+       public abstract boolean isTotalFinalized();
 }

Modified: trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java       
2006-05-18 23:15:49 UTC (rev 8780)
+++ trunk/freenet/src/freenet/node/fcp/SimpleProgressMessage.java       
2006-05-18 23:24:55 UTC (rev 8781)
@@ -38,4 +38,8 @@
                return (double) event.fetchedBlocks / (double) 
event.totalBlocks;
        }

+       public boolean isTotalFinalized() {
+               return event.finalizedTotal;
+       }
+
 }