[freenet-cvs] r9835 - in trunk/freenet/src/freenet: clients/http node/updater

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-07-31 12:29:35 +0000 (Mon, 31 Jul 2006)
New Revision: 9835

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
display a message on the /queue/ page if the global queue is empty

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-07-31 
10:46:17 UTC (rev 9834)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-07-31 
12:29:35 UTC (rev 9835)
@@ -136,6 +136,22 @@

                ClientRequest[] reqs = fcp.getGlobalRequests();
                Logger.minor(this, "Request count: "+reqs.length);
+               
+               if(reqs.length < 1){
+                       ctx.getPageMaker().makeHead(buf, "Global Queue");
+                       buf.append("<div class=\"infobox 
infobox-information\">\n");
+                       buf.append("<div class=\"infobox-header\">\n");
+                       buf.append("Global queue is empty!\n");
+                       buf.append("</div>\n");
+                       buf.append("<div class=\"infobox-content\">\n");
+                       buf.append("There is no task queued on the global queue 
at the moment.\n");
+                       buf.append("</form>\n");
+                       buf.append("</div>\n");
+                       buf.append("</div>\n");
+                       ctx.getPageMaker().makeTail(buf);
+                       writeReply(ctx, 200, "text/html", "OK", buf.toString());
+                       return;
+               }

                for(int i=0;i<reqs.length;i++) {
                        ClientRequest req = reqs[i];

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-07-31 
10:46:17 UTC (rev 9834)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-07-31 
12:29:35 UTC (rev 9835)
@@ -541,8 +541,8 @@
         String URI = updaterConfig.getString("URI");


-        updaterConfig.register("revocationURI",        
NodeUpdater.REVOCATION_URI,
-                       3, true, "Where should the node look for revocation ?",
+        updaterConfig.register("revocationURI",        
NodeUpdater.REVOCATION_URI,4,
+                       true, "Where should the node look for revocation ?",
                        "Where should the node look for revocation ?",
                        new UpdateRevocationURICallback(node));