File transfer related changes as follows:

 - show transfer speed and estimated transfer time.
 - introduced new event that notifies the gui when a file transfer request has been cancelled by the sender.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
index 64a7ea8..d2b6fda 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
@@ -273,8 +273,10 @@ public class OperationSetFileTransferJabberImpl
 
             // Create an event associated to this global request.
             FileTransferRequestEvent fileTransferRequestEvent
-                = new FileTransferRequestEvent( incomingFileTransferRequest,
-                                                requestDate);
+                = new FileTransferRequestEvent(
+                    OperationSetFileTransferJabberImpl.this,
+                    incomingFileTransferRequest,
+                    requestDate);
 
             // Notify the global listener that a request has arrived.
             fireFileTransferRequest(fileTransferRequestEvent);
@@ -403,7 +405,8 @@ public class OperationSetFileTransferJabberImpl
                     }
 
                     fileTransfer.fireStatusChangeEvent(status);
-                    fileTransfer.fireProgressChangeEvent((int)progress);
+                    fileTransfer.fireProgressChangeEvent(
+                        System.currentTimeMillis(), (int) progress);
                 }
                 catch (InterruptedException e)
                 {
@@ -419,7 +422,8 @@ public class OperationSetFileTransferJabberImpl
             }
 
             fileTransfer.fireStatusChangeEvent(status);
-            fileTransfer.fireProgressChangeEvent((int)progress);
+            fileTransfer.fireProgressChangeEvent(
+                System.currentTimeMillis(), (int) progress);
         }
     }