[Thaw-dev] r9624 - in trunk/apps/Thaw/src/thaw: fcp plugins/queueWatcher

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-07-15 02:15:57 +0000 (Sat, 15 Jul 2006)
New Revision: 9624

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
   trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
In tables, don't display request progression if they fail

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-07-15 01:57:11 UTC 
(rev 9623)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2006-07-15 02:15:57 UTC 
(rev 9624)
@@ -120,7 +120,7 @@

                this.progress = 0;
                this.fileSize = 0;
-               this.attempt = -1;
+               this.attempt = 0;

                if(key.indexOf('/') == key.length()-1) {
                        filename = "index.html";

Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java       
2006-07-15 01:57:11 UTC (rev 9623)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java       
2006-07-15 02:15:57 UTC (rev 9624)
@@ -168,10 +168,17 @@
                                JProgressBar bar = new JProgressBar(0, 100);

                                bar.setStringPainted(true);
-                               bar.setValue(progress.intValue());
-                               bar.setString(progress.toString() + "%");
                                bar.setBorderPainted(false);

+                               if(progress.intValue() >= 0) {
+                                       bar.setValue(progress.intValue());
+                                       bar.setString(progress.toString() + 
"%");
+                               } else {
+                                       bar.setValue(100);
+                                       
bar.setString(I18n.getMessage("thaw.common.failed"));
+                               }
+
+
                                return bar;
                        }


Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java  
2006-07-15 01:57:11 UTC (rev 9623)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java  
2006-07-15 02:15:57 UTC (rev 9624)
@@ -108,7 +108,11 @@

                if( (isForInsertions && column == 3
                     || (!isForInsertions && column == 4) ) ) {
-                       return (new Integer(query.getProgression()));
+                       if(!query.isFinished() || query.isSuccessful())
+                               return (new Integer(query.getProgression()));
+                       else
+                               return (new Integer(-1));
+
                }

                return null;