From b456e84ab6e88c2b9eba76080debef4d2e3102b6 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Wed, 22 Jul 2009 17:28:41 +0000
Subject: [PATCH] =?UTF-8?q?Fixes=20file=20transfer=20progress=20wrong=20da?=
 =?UTF-8?q?ta=20type=20(from=20int=20to=20long).=20Problem=20and=20fix=20t?=
 =?UTF-8?q?hereof=20Jo=C3=A3o=20Antunes!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communicator/impl/protocol/icq/FileTransferImpl.java  | 2 +-
 .../jabber/OperationSetFileTransferJabberImpl.java        | 6 +++---
 .../protocol/yahoo/OperationSetFileTransferYahooImpl.java | 2 +-
 .../service/protocol/AbstractFileTransfer.java            | 4 +++-
 .../service/protocol/event/FileTransferProgressEvent.java | 8 ++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
index 28271e366..ebab14415 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/FileTransferImpl.java
@@ -221,7 +221,7 @@ public void run()
 
                                 setTransferedBytes(transfered);
                                 fireProgressChangeEvent(
-                                    System.currentTimeMillis(), (int)transfered);
+                                    System.currentTimeMillis(), transfered);
 
                                 try {
                                     Thread.sleep(100);
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 d2b6fda24..72e8ccf1e 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
@@ -385,7 +385,7 @@ public FileTransferProgressThread(
         public void run()
         {
             int status;
-            double progress;
+            long progress;
 
             while (true)
             {
@@ -406,7 +406,7 @@ public void run()
 
                     fileTransfer.fireStatusChangeEvent(status);
                     fileTransfer.fireProgressChangeEvent(
-                        System.currentTimeMillis(), (int) progress);
+                        System.currentTimeMillis(), progress);
                 }
                 catch (InterruptedException e)
                 {
@@ -423,7 +423,7 @@ public void run()
 
             fileTransfer.fireStatusChangeEvent(status);
             fileTransfer.fireProgressChangeEvent(
-                System.currentTimeMillis(), (int) progress);
+                System.currentTimeMillis(), progress);
         }
     }
 
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
index 4ee1603ef..db92e772a 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetFileTransferYahooImpl.java
@@ -398,7 +398,7 @@ public void statusChanged(SessionFileTransferEvent ev)
 
             ft.setTransferedBytes(ev.getProgress());
             ft.fireProgressChangeEvent(
-                System.currentTimeMillis(), (int)ev.getProgress());
+                System.currentTimeMillis(), ev.getProgress());
         }
         else
             ft.fireStatusChangeEvent(getStateMapping(newState));
diff --git a/src/net/java/sip/communicator/service/protocol/AbstractFileTransfer.java b/src/net/java/sip/communicator/service/protocol/AbstractFileTransfer.java
index 6eeed43d8..b61a77875 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractFileTransfer.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractFileTransfer.java
@@ -158,8 +158,10 @@ public void fireStatusChangeEvent(int newStatus)
     /**
      * Notifies all status listeners that a new
      * <tt>FileTransferProgressEvent</tt> occured.
+     * @param timestamp the date on which the event occured
+     * @param progress the bytes representing the progress of the transfer
      */
-    public void fireProgressChangeEvent(long timestamp, int progress)
+    public void fireProgressChangeEvent(long timestamp, long progress)
     {
         Collection<FileTransferProgressListener> listeners = null;
         synchronized (progressListeners)
diff --git a/src/net/java/sip/communicator/service/protocol/event/FileTransferProgressEvent.java b/src/net/java/sip/communicator/service/protocol/event/FileTransferProgressEvent.java
index 8421923b0..b8c57efcd 100644
--- a/src/net/java/sip/communicator/service/protocol/event/FileTransferProgressEvent.java
+++ b/src/net/java/sip/communicator/service/protocol/event/FileTransferProgressEvent.java
@@ -22,7 +22,7 @@ public class FileTransferProgressEvent
     /**
      * Indicates the progress of a file transfer in bytes.
      */
-    private int progress;
+    private long progress;
 
     /**
      * Indicates when this event occured.
@@ -41,7 +41,7 @@ public class FileTransferProgressEvent
      */
     public FileTransferProgressEvent(   FileTransfer fileTransfer,
                                         long timestamp,
-                                        int progress)
+                                        long progress)
     {
         super(fileTransfer);
 
@@ -60,11 +60,11 @@ public FileTransfer getFileTransfer()
     }
 
     /**
-     * Returns the progress of the file transfer.
+     * Returns the progress of the file transfer in transferred bytes.
      * 
      * @return the progress of the file transfer
      */
-    public int getProgress()
+    public long getProgress()
     {
         return progress;
     }