Continuation on previous commit. Rename listener add and remove methods in the related operation set.

4 files changed, 19 insertions, 23 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index d86d3c9..c67e926 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -398,7 +398,7 @@ public class MainFrame
 
         if (fileTransferOpSet != null)
         {
-            fileTransferOpSet.addFileTransferRequestListener(
+            fileTransferOpSet.addFileTransferListener(
                 getContactListPanel());
         }
     }
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 f53ca00..a51cafa 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetFileTransferJabberImpl.java
@@ -146,13 +146,12 @@ public class OperationSetFileTransferJabberImpl
     }
 
     /**
-     * Adds the given <tt>listener</tt> that would listen for
-     * <tt>FileTransferRequestEvent</tt>-s and that should be notified every
-     * time a file transfer request has been received.
+     * Adds the given <tt>FileTransferListener</tt> that would listen for
+     * file transfer requests and created file transfers.
      * 
-     * @param listener the <tt>FileTransferRequestListener</tt> to add
+     * @param listener the <tt>FileTransferListener</tt> to add
      */
-    public void addFileTransferRequestListener(
+    public void addFileTransferListener(
         FileTransferListener listener)
     {
         synchronized(fileTransferListeners)
@@ -165,13 +164,12 @@ public class OperationSetFileTransferJabberImpl
     }
 
     /**
-     * Removes the given <tt>listener</tt> that listens for
-     * <tt>FileTransferRequestEvent</tt>-s and is notified every time a file
-     * transfer request has been received.
+     * Removes the given <tt>FileTransferListener</tt> that listens for
+     * file transfer requests and created file transfers.
      * 
-     * @param listener the <tt>FileTransferRequestListener</tt> to remove
+     * @param listener the <tt>FileTransferListener</tt> to remove
      */
-    public void removeFileTransferRequestListener(
+    public void removeFileTransferListener(
         FileTransferListener listener)
     {
         synchronized(fileTransferListeners)
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
index a91926f..aa2d77d 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
@@ -54,7 +54,7 @@ public class OperationSetFileTransferSSHImpl
      *
      * @param listener the <tt>FileListener</tt> to register.
      */
-    public void addFileTransferRequestListener(
+    public void addFileTransferListener(
         FileTransferListener listener)
     {
         synchronized (fileTransferListeners)
@@ -64,7 +64,7 @@ public class OperationSetFileTransferSSHImpl
         }
     }
 
-    public void removeFileTransferRequestListener(
+    public void removeFileTransferListener(
         FileTransferListener listener)
     {
         synchronized (fileTransferListeners)
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetFileTransfer.java b/src/net/java/sip/communicator/service/protocol/OperationSetFileTransfer.java
index 451c3c3..0c02846 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetFileTransfer.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetFileTransfer.java
@@ -65,22 +65,20 @@ public interface OperationSetFileTransfer
                 IllegalArgumentException;
 
     /**
-     * Adds the given <tt>FileTransferRequestListener</tt> that would listen for
-     * <tt>FileTransferRequestEvent</tt>-s and that should be notified every
-     * time a file transfer request has been received.
+     * Adds the given <tt>FileTransferListener</tt> that would listen for
+     * file transfer requests and created file transfers.
      * 
-     * @param listener the <tt>FileTransferRequestListener</tt> to add
+     * @param listener the <tt>FileTransferListener</tt> to add
      */
-    public void addFileTransferRequestListener(
+    public void addFileTransferListener(
         FileTransferListener listener);
 
     /**
-     * Removes the given <tt>FileTransferRequestListener</tt> that listens for
-     * <tt>FileTransferRequestEvent</tt>-s and is notified every time a file
-     * transfer request has been received.
+     * Removes the given <tt>FileTransferListener</tt> that listens for
+     * file transfer requests and created file transfers.
      * 
-     * @param listener the <tt>FileTransferRequestListener</tt> to remove
+     * @param listener the <tt>FileTransferListener</tt> to remove
      */
-    public void removeFileTransferRequestListener(
+    public void removeFileTransferListener(
         FileTransferListener listener);
 }