Author: jflesch
Date: 2007-05-22 21:18:22 +0000 (Tue, 22 May 2007)
New Revision: 13317
Modified:
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Display the transfer state between Thaw and the node in the state column of the
queueWatcher plugin
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-05-22 20:15:13 UTC
(rev 13316)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-05-22 21:18:22 UTC
(rev 13317)
@@ -19,7 +19,7 @@
public class IndexBrowser extends ToolbarModifier implements Plugin,
ChangeListener {
- public static final String DEFAULT_INDEX = "USK at
G-ofLp2KlhHBNPezx~GDWDKThJ-QUxJK8c2xiF~-jwE,-55vLnqo3U1H5qmKA1LLADoYGQdk-Y3hSLxyKeUyHNc,AQABAAE/Thaw/9/Thaw.xml";
+ public static final String DEFAULT_INDEX = "USK at
p-uFAWUomLm37MCQLu3r67-B8e6yF1kS4q2v0liM1Vk,h0MWqM~lF0Bec-AIv445PLn06ams9-RFbnwO6Cm2Snc,AQACAAE/Thaw/1/Thaw.frdx";
private Core core;
private Hsqldb hsqldb;
Modified: trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java 2007-05-22 20:15:13 UTC
(rev 13316)
+++ trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java 2007-05-22 21:18:22 UTC
(rev 13317)
@@ -261,6 +261,9 @@
+ query.getFilename();
key = query.getFileKey();
} else {
+ if (query.getPath() == null)
+ return;
+
str =
I18n.getMessage("thaw.plugin.transferLogs.insertion.added") + " : "
+ query.getPath();
key = null;
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-05-22 20:15:13 UTC (rev 13316)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-05-22 21:18:22 UTC (rev 13317)
@@ -121,9 +121,20 @@
if( ((isForInsertions && (column == 3))
|| (!isForInsertions && (column == 4)) ) ) {
- if(!query.isFinished() || query.isSuccessful())
- return new Integer(query.getProgression());
- else
+
+ if(!query.isFinished() || query.isSuccessful()) {
+ int progress;
+
+ if ((query instanceof thaw.fcp.FCPClientPut
+ &&
(query.getTransferWithTheNodeProgression() < 100))
+ || ((query instanceof thaw.fcp.FCPClientGet)
+ &&
(query.getTransferWithTheNodeProgression() > 0)))
+ progress =
query.getTransferWithTheNodeProgression();
+ else
+ progress = query.getProgression();
+
+ return new Integer(progress);
+ } else
return new Integer(-1);
}
