From 160bd718bf01a8df0221a13d4fa46e2708cc44ee Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Sun, 9 Aug 2009 21:44:42 +0000
Subject: [PATCH] Renames occurrences of callParticipant to callPeer so that it
 would better reflect our new Call architecture that also includes
 conferencing and ConferenceMembers

---
 .../impl/gui/main/call/DialPanel.java         |  6 +++---
 .../impl/gui/main/call/HoldButton.java        | 21 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
index 63cc949ac..dca0a3559 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
@@ -49,7 +49,7 @@ public class DialPanel
             GuiActivator.getResources()
                 .getSettingsInt("impl.gui.DIAL_PAD_VERTICAL_GAP")));
 
-    private final java.util.List<CallPeer> callParticipantsList =
+    private final java.util.List<CallPeer> callPeersList =
         new LinkedList<CallPeer>();
 
     private MainCallPanel parentCallPanel;
@@ -80,7 +80,7 @@ public DialPanel(Iterator<CallPeer> callParticipants)
         // presses a dial button, so we put the iterator into a list.
         while (callParticipants.hasNext())
         {
-            this.callParticipantsList.add(callParticipants.next());
+            this.callPeersList.add(callParticipants.next());
         }
 
         this.init();
@@ -410,7 +410,7 @@ public void actionPerformed(ActionEvent e)
     private void sendDtmfTone(DTMFTone dtmfTone)
     {
         Iterator<CallPeer> callParticipants
-            = this.callParticipantsList.iterator();
+            = this.callPeersList.iterator();
 
         try
         {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
index 7e20f02f8..0c183feee 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
@@ -27,7 +27,7 @@ public class HoldButton
 
     /**
      * Initializes a new <tt>HoldButton</tt> instance which is to put a specific
-     * <tt>CallParticipant</tt> on/off hold.
+     * <tt>CallPeer</tt> on/off hold.
      *
      * @param call the <tt>Call</tt> to be associated with
      *            the new instance and to be put on/off hold upon performing its
@@ -40,7 +40,7 @@ public HoldButton(Call call)
 
     /**
      * Initializes a new <tt>HoldButton</tt> instance which is to put a specific
-     * <tt>CallParticipant</tt> on/off hold.
+     * <tt>CallPeer</tt> on/off hold.
      *
      * @param call  the <tt>Call</tt> to be associated with
      *              the new instance and to be put on/off hold upon performing
@@ -85,7 +85,7 @@ public HoldButton(  Call call,
 
     /**
      * Represents the model of a toggle button that puts an associated
-     * <tt>CallParticipant</tt> on/off hold.
+     * <tt>CallPeer</tt> on/off hold.
      */
     private static class HoldButtonModel
         extends ToggleButtonModel
@@ -93,14 +93,14 @@ private static class HoldButtonModel
     {
 
         /**
-         * The <tt>CallParticipant</tt> whose state is being adapted for the
+         * The <tt>CallPeer</tt> whose state is being adapted for the
          * purposes of depicting as a toggle button.
          */
         private final Call call;
 
         /**
          * Initializes a new <tt>HoldButtonModel</tt> instance to represent
-         * the state of a specific <tt>CallParticipant</tt> as a toggle
+         * the state of a specific <tt>CallPeer</tt> as a toggle
          * button.
          *
          * @param call
@@ -122,19 +122,18 @@ public void actionPerformed(ActionEvent evt)
                     (OperationSetBasicTelephony) call.getProtocolProvider()
                         .getOperationSet(OperationSetBasicTelephony.class);
 
-                Iterator<CallPeer> participants
-                    = call.getCallPeers();
+                Iterator<CallPeer> peers = call.getCallPeers();
 
-                while (participants.hasNext())
+                while (peers.hasNext())
                 {
-                    CallPeer callParticipant = participants.next();
+                    CallPeer callPeer = peers.next();
 
                     try
                     {
                         if (isSelected())
-                            telephony.putOnHold(callParticipant);
+                            telephony.putOnHold(callPeer);
                         else
-                            telephony.putOffHold(callParticipant);
+                            telephony.putOffHold(callPeer);
                     }
                     catch (OperationFailedException ex)
                     {