Author: jflesch
Date: 2006-08-15 23:17:19 +0000 (Tue, 15 Aug 2006)
New Revision: 10104
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
Log:
I forgot to deactivate a debug output
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-08-15 22:42:38 UTC
(rev 10103)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPConnection.java 2006-08-15 23:17:19 UTC
(rev 10104)
@@ -249,8 +249,6 @@
try {
lastWrite = System.currentTimeMillis();
- System.out.println(new String(data));
-
out.write(data);
} catch(java.io.IOException e) {
Logger.warning(this, "Unable to write() on the
socket ?! : "+ e.toString());
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-08-15 22:42:38 UTC
(rev 10103)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-08-15 23:17:19 UTC
(rev 10104)
@@ -62,18 +62,19 @@
/**
* Note: public key is found from private one.
- * @param keyType : 0 = CHK ; 1 = KSK ; 2 = SSK
- * @param rev : ignored if key == CHK
- * @param name : ignored if key == CHK
- * @param privateKey : ignored if key == CHK/KSK ; can be null if it
has to be generated
+ * @param fileList File list, separated by ';'
+ * @param keyType 0 = CHK ; 1 = KSK ; 2 = SSK
+ * @param rev ignored if key == CHK
+ * @param name ignored if key == CHK
+ * @param privateKey ignored if key == CHK/KSK ; can be null if it has
to be generated
* @param persistence 0 = Forever ; 1 = Until node reboot ; 2 = Until
the app disconnect
* @param mimeType null = autodetect
*/
public boolean insertFile(String fileList, int keyType,
- int rev, String name,
- String privateKey,
- int priority, boolean global,
- int persistence, String mimeType) {
+ int rev, String name,
+ String privateKey,
+ int priority, boolean global,
+ int persistence, String mimeType) {
FCPClientPut clientPut = null;
String[] files = fileList.split(";");
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-08-15 22:42:38 UTC (rev 10103)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-08-15 23:17:19 UTC (rev 10104)
@@ -198,7 +198,8 @@
if(value == null)
return null;
-
+ FCPTransferQuery query = model.getQuery(row);
+
if(value instanceof Integer) {
Integer progress = (Integer)value;
@@ -209,7 +210,14 @@
if(progress.intValue() >= 0) {
bar.setValue(progress.intValue());
- bar.setString(progress.toString() +
"%");
+
+ String toAdd = "%";
+
+ if(!query.isProgressionReliable()
+ && query.getProgression() != 0)
+ toAdd = toAdd + " [*]";
+
+ bar.setString(progress.toString() +
toAdd);
} else {
bar.setValue(100);
bar.setString(I18n.getMessage("thaw.common.failed"));
@@ -226,8 +234,6 @@
if(!isSelected) {
- FCPTransferQuery query = model.getQuery(row);
-
if(query == null)
return null;
