From ef884edaecfc02db63ca6c0bba12cb866a6721b2 Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Sun, 9 Aug 2009 21:37:08 +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/CallDialog.java | 2 +- .../impl/gui/main/call/CallManager.java | 4 +- .../gui/main/call/CallParticipantPanel.java | 2 +- .../main/call/GuiCallParticipantRecord.java | 86 ------------------- .../impl/gui/main/call/GuiCallRecord.java | 12 +-- 5 files changed, 10 insertions(+), 96 deletions(-) delete mode 100644 src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java index f4abbadef..9d87642b2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java @@ -52,7 +52,7 @@ public CallDialog(Call call, String callType) GuiActivator.getResources().getI18NString("service.gui.CALL")); this.callPanel - = new CallPanel(this, call, GuiCallParticipantRecord.INCOMING_CALL); + = new CallPanel(this, call, GuiCallPeerRecord.INCOMING_CALL); this.setPreferredSize(new Dimension(500, 400)); diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java index 50d231a8e..e4b98ba32 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java @@ -93,7 +93,7 @@ public void outgoingCallCreated(CallEvent event) CallDialog callDialog = CallManager.openCallDialog(sourceCall, - GuiCallParticipantRecord.OUTGOING_CALL); + GuiCallPeerRecord.OUTGOING_CALL); activeCalls.put(sourceCall, callDialog); } @@ -147,7 +147,7 @@ public void actionPerformed(ActionEvent e) public static void answerCall(final Call call) { CallManager.openCallDialog(call, - GuiCallParticipantRecord.INCOMING_CALL); + GuiCallPeerRecord.INCOMING_CALL); new AnswerCallThread(call).start(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java index b1a49405b..a196b8548 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java @@ -844,7 +844,7 @@ public String getCallType() if (callDuration != null) return callType; else - return GuiCallParticipantRecord.INCOMING_CALL; + return GuiCallPeerRecord.INCOMING_CALL; } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java deleted file mode 100644 index a56549cfe..000000000 --- a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package net.java.sip.communicator.impl.gui.main.call; - -import java.util.*; - -import net.java.sip.communicator.service.callhistory.*; -import net.java.sip.communicator.util.*; - -/** - * The GuiCallParticipantRecord is meant to be used in the call history - * to represent a history call participant record. It wraps a - * CallParticipant or a CallParticipantRecord object. - * - * @author Yana Stamcheva - */ -public class GuiCallParticipantRecord -{ - public static final String INCOMING_CALL = "IncomingCall"; - - public static final String OUTGOING_CALL = "OutgoingCall"; - - private String direction; - - private String participantName; - - private Date startTime; - - private Date callDuration; - - public GuiCallParticipantRecord(String participantName, - String direction, - Date startTime, - Date callDuration) - { - this.direction = direction; - - this.participantName = participantName; - - this.startTime = startTime; - - this.callDuration = callDuration; - } - - public GuiCallParticipantRecord(CallPeerRecord participantRecord, - String direction) - { - this.direction = direction; - - this.participantName = participantRecord.getPeerAddress(); - - this.startTime = participantRecord.getStartTime(); - - this.callDuration = GuiUtils.substractDates( - participantRecord.getEndTime(), startTime); - } - - public String getDirection() - { - return direction; - } - - /** - * Returns the duration of the contained participant call. - * - * @return the duration of the contained participant call - */ - public Date getDuration() - { - return callDuration; - } - - public String getParticipantName() - { - return participantName; - } - - public Date getStartTime() - { - return startTime; - } -} 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 7e1c7e233..8942cc53c 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 @@ -19,7 +19,7 @@ */ public class GuiCallRecord { - private Vector participants; + private Vector participants; private Date startTime; @@ -32,7 +32,7 @@ public class GuiCallRecord * @param startTime call start time * @param endTime call end time */ - public GuiCallRecord(Vector guiParticipantRecords, + public GuiCallRecord(Vector guiParticipantRecords, Date startTime, Date endTime) { @@ -55,7 +55,7 @@ public GuiCallRecord(CallRecord callRecord) this.endTime = callRecord.getEndTime(); - this.participants = new Vector(); + this.participants = new Vector(); Iterator records = callRecord.getPeerRecords().iterator(); @@ -63,8 +63,8 @@ public GuiCallRecord(CallRecord callRecord) CallPeerRecord record = records.next(); - GuiCallParticipantRecord newRecord - = new GuiCallParticipantRecord( + GuiCallPeerRecord newRecord + = new GuiCallPeerRecord( record, callRecord.getDirection()); this.participants.add(newRecord); @@ -76,7 +76,7 @@ public Date getEndTime() return endTime; } - public Iterator getParticipants() + public Iterator getParticipants() { return participants.iterator(); }