From 2f74f41f3dd99a0e9f73bca8af4f9fdef7eab9be Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Mon, 23 Oct 2006 10:13:51 +0000 Subject: [PATCH] save the start call time and the call duration instead of start date and end date --- .../impl/gui/main/call/CallListCellRenderer.java | 5 +---- .../communicator/impl/gui/main/call/CallPanel.java | 2 +- .../impl/gui/main/call/CallParticipantPanel.java | 13 +++++-------- .../gui/main/call/GuiCallParticipantRecord.java | 14 ++++++++------ 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/call/CallListCellRenderer.java index cee9789a4..e9cc4bdea 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallListCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallListCellRenderer.java @@ -109,10 +109,7 @@ public Component getListCellRendererComponent(JList list, Object value, this.durationLabel.setText( Messages.getString("duration") + " " + - GuiUtils.formatTime( - GuiUtils.substractDates( - participant.getEndTime(), - participant.getStartTime()))); + GuiUtils.formatTime(participant.getCallTime())); //this.nameLabel.setIcon(listModel // .getMetaContactStatusIcon(contactItem)); diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java index 15f03a140..e354d9793 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java @@ -163,7 +163,7 @@ public void callParticipantRemoved(CallParticipantEvent evt) participantPanel.getParticipantName(), participantPanel.getCallType(), participantPanel.getStartTime(), - participantPanel.getEndTime()); + participantPanel.getTime()); callManager.getMainFrame().getCallListManager().addCallRecord( 0, participantRecord); 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 67e09cbf4..1e6cd05a8 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 @@ -38,7 +38,7 @@ public class CallParticipantPanel extends JPanel private Date startDate; - private Date endDate; + private Date callTime = new Date(0); private Timer timer; @@ -121,7 +121,7 @@ public void actionPerformed(ActionEvent e) new Date(System.currentTimeMillis()), startDate); - endDate = time; + callTime = time; timeLabel.setText(GuiUtils.formatTime(time)); } } @@ -141,12 +141,9 @@ public Date getStartTime() * * @return the start time of the contained participant call */ - public Date getEndTime() - { - if(endDate == null) - endDate = startDate; - - return endDate; + public Date getTime() + { + return callTime; } /** 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 index 04562f2bf..963fafbc5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallParticipantRecord.java @@ -8,6 +8,7 @@ import java.util.*; +import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.callhistory.*; /** @@ -29,12 +30,12 @@ public class GuiCallParticipantRecord private Date startTime; - private Date endTime; + private Date callTime; public GuiCallParticipantRecord(String participantName, String direction, Date startTime, - Date endTime) + Date callTime) { this.direction = direction; @@ -42,7 +43,7 @@ public GuiCallParticipantRecord(String participantName, this.startTime = startTime; - this.endTime = endTime; + this.callTime = callTime; } public GuiCallParticipantRecord(CallParticipantRecord participantRecord, @@ -54,7 +55,8 @@ public GuiCallParticipantRecord(CallParticipantRecord participantRecord, this.startTime = participantRecord.getStartTime(); - this.endTime = participantRecord.getEndTime(); + this.callTime = GuiUtils.substractDates( + participantRecord.getEndTime(), startTime); } public String getDirection() @@ -62,9 +64,9 @@ public String getDirection() return direction; } - public Date getEndTime() + public Date getCallTime() { - return endTime; + return callTime; } public String getParticipantName()