From c6c5d80549cc89b7377677306d6eb897bfdab5db Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Sun, 9 Aug 2009 21:47:23 +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/GuiCallRecord.java | 58 +++++++++---------- .../event/CallPeerSecurityMessageEvent.java | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java index 8942cc53c..b0a197f94 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java @@ -14,78 +14,78 @@ * The GuiCallRecord is meant to be used in the call history to * represent a history call record. It wraps a Call or a * CallRecord object. - * + * * @author Yana Stamcheva */ public class GuiCallRecord { - private Vector participants; - + private Vector peers; + private Date startTime; - + private Date endTime; - + /** * Creates an instance of GuiCallRecord. - * @param guiParticipantRecords participant records contained in this call + * @param guiPeerRecords peer records contained in this call * record * @param startTime call start time * @param endTime call end time */ - public GuiCallRecord(Vector guiParticipantRecords, + public GuiCallRecord(Vector guiPeerRecords, Date startTime, Date endTime) - { + { this.startTime = startTime; - + this.endTime = endTime; - - participants = guiParticipantRecords; + + peers = guiPeerRecords; } - + /** * Creates a GuiCallRecord from a CallRecord. The * GuiCallRecord will be used in the call history. - * - * @param callRecord the CallParticipantRecord + * + * @param callRecord the CallPeerRecord */ public GuiCallRecord(CallRecord callRecord) - { + { this.startTime = callRecord.getStartTime(); - + this.endTime = callRecord.getEndTime(); - - this.participants = new Vector(); - + + this.peers = new Vector(); + Iterator records = callRecord.getPeerRecords().iterator(); - + while(records.hasNext()) { CallPeerRecord record = records.next(); - + GuiCallPeerRecord newRecord = new GuiCallPeerRecord( record, callRecord.getDirection()); - - this.participants.add(newRecord); + + this.peers.add(newRecord); } } - + public Date getEndTime() { return endTime; } - public Iterator getParticipants() + public Iterator getPeers() { - return participants.iterator(); + return peers.iterator(); } - public int getParticipantsCount() + public int getPeersCount() { - return participants.size(); + return peers.size(); } - + public Date getStartTime() { return startTime; diff --git a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java index 34036e80f..d69f00b7c 100644 --- a/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java +++ b/src/net/java/sip/communicator/service/protocol/event/CallPeerSecurityMessageEvent.java @@ -11,7 +11,7 @@ import net.java.sip.communicator.service.protocol.*; /** - * The CallParticipantSecurityFailedEvent is triggered whenever + * The CallPeerSecurityFailedEvent is triggered whenever * a problem has occurred during call security process. * * @author Yana Stamcheva