Author: jflesch
Date: 2006-07-15 01:57:11 +0000 (Sat, 15 Jul 2006)
New Revision: 9623
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Replace, in the tables, size = 0B by size == Unknown
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-07-15 01:00:51 UTC
(rev 9622)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-07-15 01:57:11 UTC
(rev 9623)
@@ -83,13 +83,15 @@
this.status = status;
this.identifier = id;
- successful = true;
+ successful = false;
running = true;
- if(progress < 100)
+ if(progress < 100) {
fromTheNodeProgress = 0;
- else
+ } else {
fromTheNodeProgress = 100;
+ progressReliable = true;
+ }
}
@@ -211,6 +213,10 @@
Logger.info(this, "Don't know
where to put file, so file not asked to the node");
}
}
+
+
+ fromTheNodeProgress = 100;
+ progressReliable = true;
setChanged();
notifyObservers();
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-15 01:00:51 UTC
(rev 9622)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2006-07-15 01:57:11 UTC
(rev 9623)
@@ -13,6 +13,7 @@
*/
public class FCPClientPut extends Observable implements FCPTransferQuery,
Observer {
private FCPQueueManager queueManager = null;
+ private final static int BLOCK_SIZE = 32768;
private File localFile = null;
private long fileSize = 0;
@@ -550,15 +551,19 @@
if(msg.getValue("Total") != null
&& msg.getValue("Succeeded") != null) {
- long required = (new
Long(msg.getValue("Total"))).longValue();
+ long total = (new
Long(msg.getValue("Total"))).longValue();
+ //long required = (new
Long(msg.getValue("Required"))).longValue();
long succeeded = (new
Long(msg.getValue("Succeeded"))).longValue();
- progress = (int)((succeeded * 99) /
required);
+ progress = (int)((succeeded * 99) /
total);
running = true;
finished = false;
successful = false;
+ //if(fileSize == 0)
+ // fileSize = BLOCK_SIZE *
required; // NOT RELIABLE
+
status = "Inserting";
setChanged();
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-07-15 01:00:51 UTC (rev 9622)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-07-15 01:57:11 UTC (rev 9623)
@@ -59,6 +59,9 @@
private String getPrintableSize(long size) {
+ if(size == 0)
+ return I18n.getMessage("thaw.common.unknown");
+
if(size < 1024) /* < 1KB */
return ((new Long(size)).toString() + " B");
