Author: jflesch
Date: 2008-01-05 01:11:04 +0000 (Sat, 05 Jan 2008)
New Revision: 16902
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
First fixes related to the previous commit
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-05 01:04:36 UTC
(rev 16901)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2008-01-05 01:11:04 UTC
(rev 16902)
@@ -231,8 +231,7 @@
startInsert();
}
- setChanged();
- this.notifyObservers();
+ notifyChange();
return true;
}
@@ -338,8 +337,7 @@
identifier = queueManager.getAnID();
}
- setChanged();
- this.notifyObservers();
+ notifyChange();
final FCPMessage msg = new FCPMessage();
@@ -490,8 +488,7 @@
if( System.currentTimeMillis() >= (startTime+3000) ) {
toTheNodeProgress = (int) (((origSize -
remaining) * 100) / origSize);
- setChanged();
- this.notifyObservers();
+ notifyChange();
startTime = System.currentTimeMillis();
}
@@ -595,8 +592,7 @@
status = "Inserting";
- setChanged();
- this.notifyObservers();
+ notifyChange();
return;
}
@@ -610,8 +606,7 @@
if (publicKey == null) {
status = "[Warning]";
Logger.warning(this, "PutSuccessful
message without URI field ?!");
- setChanged();
- this.notifyObservers();
+ notifyChange();
return;
}
@@ -629,8 +624,7 @@
status = "Finished";
- setChanged();
- this.notifyObservers();
+ notifyChange();
return;
}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2008-01-05 01:04:36 UTC
(rev 16901)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2008-01-05 01:11:04 UTC
(rev 16902)
@@ -95,6 +95,8 @@
averageSpeed = (blocks * BLOCK_SIZE) /
diffTime;
ETA = diffTime; /* ok, it's a little bit icky,
but it does the trick :) */
+ notifyChange();
+
return;
}
@@ -108,14 +110,14 @@
long diffBlocks = transferedBlocks -
transferedBlocksPast[currentReadCursor];
long remainingBlocks = (insertion ?
(totalBlocks - transferedBlocks) : (requiredBlocks - transferedBlocks));
- if (diffTimeSec <= 0 /* we never know */ ||
diffBlocks <= 0 || remainingBlocks == 0) {
+ if (diffTimeSec <= 0 || diffBlocks <= 0 ||
remainingBlocks == 0) {
averageSpeed = 0;
ETA = 0;
} else {
double averageSpeedInBlocksPerSecond =
diffBlocks / diffTimeSec;
averageSpeed =
(long)(averageSpeedInBlocksPerSecond * (double)BLOCK_SIZE);
- ETA = (long)(((double)remainingBlocks)
/ averageSpeedInBlocksPerSecond);
+ ETA = (long)(remainingBlocks /
averageSpeedInBlocksPerSecond);
}
if (currentWriteCursor == currentReadCursor-1
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2008-01-05 01:04:36 UTC (rev 16901)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2008-01-05 01:11:04 UTC (rev 16902)
@@ -186,7 +186,7 @@
if (!query.isFinished())
return GUIHelper.getPrintableTime(remaining);
else
- return
I18n.getMessage("thaw.plugin.queueWatcher.totalTime") + "
"+GUIHelper.getPrintableSize(remaining);
+ return
I18n.getMessage("thaw.plugin.queueWatcher.totalTime") + "
"+GUIHelper.getPrintableTime(remaining);
}
return null;
