Renames occurrences of callParticipant to callPeer so that it would better reflect our new Call architecture that also includes conferencing and ConferenceMembers

src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java

@@ -37,9 +37,9 @@ public class CallPanel
 {
     private final TransparentPanel mainPanel = new TransparentPanel();
 
-    private final Hashtable<CallPeer, CallParticipantPanel>
+    private final Hashtable<CallPeer, CallPeerPanel>
         participantsPanels =
-            new Hashtable<CallPeer, CallParticipantPanel>();
+            new Hashtable<CallPeer, CallPeerPanel>();
 
     private String title;
 
@@ -85,16 +85,16 @@ public CallPanel(CallDialog callDialog, Call call, String callType)
      * @param participant the call participant
      * @param callType the type of call - INCOMING of OUTGOING
      */
-    private CallParticipantPanel addCallParticipant(
+    private CallPeerPanel addCallParticipant(
         CallPeer participant, String callType)
     {
-        CallParticipantPanel participantPanel =
+        CallPeerPanel participantPanel =
             getParticipantPanel(participant);
 
         if (participantPanel == null)
         {
             participantPanel
-                = new CallParticipantPanel(callDialog, participant);
+                = new CallPeerPanel(callDialog, participant);
 
             this.mainPanel.add(participantPanel);
 
@@ -154,7 +154,7 @@ public void callPeerRemoved(CallPeerEvent evt)
         {
             CallPeer participant = evt.getSourceCallPeer();
 
-            CallParticipantPanel participantPanel =
+            CallPeerPanel participantPanel =
                 getParticipantPanel(participant);
 
             if (participantPanel != null)
@@ -196,7 +196,7 @@ public void peerStateChanged(CallPeerChangeEvent evt)
         if (sourceParticipant.getCall() != call)
             return;
 
-        CallParticipantPanel participantPanel =
+        CallPeerPanel participantPanel =
             getParticipantPanel(sourceParticipant);
 
         Object newState = evt.getNewValue();
@@ -274,7 +274,7 @@ public void securityOn(CallPeerSecurityOnEvent securityEvent)
     {
         CallPeer participant =
             (CallPeer) securityEvent.getSource();
-        CallParticipantPanel participantPanel =
+        CallPeerPanel participantPanel =
             getParticipantPanel(participant);
 
         participantPanel.setSecured(true);
@@ -300,7 +300,7 @@ public void securityOff(CallPeerSecurityOffEvent securityEvent)
     {
         CallPeer participant =
             (CallPeer) securityEvent.getSource();
-        CallParticipantPanel participantPanel =
+        CallPeerPanel participantPanel =
             getParticipantPanel(participant);
 
         participantPanel.setSecured(false);
@@ -386,7 +386,7 @@ public RemoveParticipantPanelListener(CallPeer participant)
 
         public void actionPerformed(ActionEvent e)
         {
-            CallParticipantPanel participantPanel =
+            CallPeerPanel participantPanel =
                 participantsPanels.get(participant);
 
             mainPanel.remove(participantPanel);
@@ -402,7 +402,7 @@ public void actionPerformed(ActionEvent e)
      * @return an <tt>Iterator</tt> over a list of all participant panels
      *         contained in this call panel
      */
-    public Iterator<CallParticipantPanel> getParticipantPanels()
+    public Iterator<CallPeerPanel> getParticipantPanels()
     {
         return participantsPanels.values().iterator();
     }
@@ -425,9 +425,9 @@ public int getParticipantCount()
      * @return the <tt>CallParticipantPanel</tt>, which correspond to the given
      *         participant
      */
-    public CallParticipantPanel getParticipantPanel(CallPeer participant)
+    public CallPeerPanel getParticipantPanel(CallPeer participant)
     {
-        for (Map.Entry<CallPeer, CallParticipantPanel> participantEntry :
+        for (Map.Entry<CallPeer, CallPeerPanel> participantEntry :
                 participantsPanels.entrySet())
         {
             CallPeer entryParticipant = participantEntry.getKey();
@@ -494,7 +494,7 @@ public void propertyChange(PropertyChangeEvent evt)
             if (sourceParticipant.getCall() != call)
                 return;
 
-            CallParticipantPanel participantPanel =
+            CallPeerPanel participantPanel =
                 getParticipantPanel(sourceParticipant);
 
             if (isMute)

src/net/java/sip/communicator/impl/gui/main/call/CallPeerPanel.java

@@ -28,11 +28,11 @@
  * @author Yana Stamcheva
  * @author Lubomir Marinov
  */
-public class CallParticipantPanel
+public class CallPeerPanel
     extends TransparentPanel
 {
     private static final Logger logger =
-        Logger.getLogger(CallParticipantPanel.class);
+        Logger.getLogger(CallPeerPanel.class);
 
     private final JLabel callStatusLabel = new JLabel();
 
@@ -88,7 +88,7 @@ public class CallParticipantPanel
      *
      * @param callParticipant a call participant
      */
-    public CallParticipantPanel(CallDialog callDialog,
+    public CallPeerPanel(CallDialog callDialog,
                                 CallPeer callParticipant)
     {
         this.callDialog = callDialog;

src/net/java/sip/communicator/impl/gui/main/call/SecurityStatusLabel.java

@@ -16,9 +16,9 @@
 public class SecurityStatusLabel
     extends JLabel
 {
-    private final CallParticipantPanel callParticipantPanel;
+    private final CallPeerPanel callParticipantPanel;
 
-    public SecurityStatusLabel( CallParticipantPanel callParticipantPanel,
+    public SecurityStatusLabel( CallPeerPanel callParticipantPanel,
                                 Icon icon,
                                 int alignment)
     {