sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix unit tests.

Browse Source
cusax-fix
Yana Stamcheva 16 years ago
parent a1f74ad638
commit 7393be5cfb
9 changed files with 122 additions and 69 deletions
Show Stats Download Patch File Download Diff File

BIN
resources/images/impl/gui/common/incomingCall.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1023 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
resources/images/impl/gui/common/missedCall.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/images/impl/gui/common/outgoingCall.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

67
resources/images/impl/gui/common/src/incomingCall.svg
Unescape View File

@ -32,7 +32,7 @@
<stop
id="stop13637"
offset="0"
style="stop-color:#bf0913;stop-opacity:0.98823529;" />
style="stop-color:#f1a6aa;stop-opacity:0.98823529;" />
<stop
style="stop-color:white;stop-opacity:1;"
offset="1"
@ -138,7 +138,7 @@
xlink:href="#linearGradient15050"
id="linearGradient13654"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.460625,-0.392816,-0.346379,0.406163,249.5826,327.0912)"
gradientTransform="matrix(0.460625,-0.392816,0.346379,0.406163,91.22985,327.0912)"
x1="-34.269634"
y1="250.85629"
x2="-8.8196745"
@ -148,7 +148,7 @@
xlink:href="#linearGradient13635-6"
id="linearGradient13657"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.658391,-0.561477,-0.484531,0.56816,280.0423,280.8889)"
gradientTransform="matrix(0.658391,-0.561477,0.484531,0.56816,60.77015,280.8889)"
x1="-32.972176"
y1="253.71817"
x2="-6.5696635"
@ -185,7 +185,7 @@
xlink:href="#linearGradient15050-9"
id="linearGradient13654-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.460625,-0.392816,-0.346379,0.406163,285.53351,327.21874)"
gradientTransform="matrix(0.460625,-0.392816,0.346379,0.406163,127.18076,327.21874)"
x1="-34.269634"
y1="250.85629"
x2="-1.3157908"
@ -242,7 +242,8 @@
y1="420.99265"
x2="215.59256"
y2="445.39755"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,412.71427,0)" />
</defs>
<sodipodi:namedview
id="base"
@ -255,7 +256,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.4472044"
inkscape:cx="206.52909"
inkscape:cx="152.86241"
inkscape:cy="618.66359"
inkscape:document-units="px"
inkscape:current-layer="layer1"
@ -290,9 +291,9 @@
y="420.86053"
rx="6.9999971"
ry="6.9999971"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/incomingCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/incomingCall.png"
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<rect
style="opacity:0.98999999;fill:url(#linearGradient13660);fill-opacity:1;stroke:none;stroke-width:1.47956574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect12738"
@ -302,25 +303,25 @@
y="422.92633"
rx="6.9999971"
ry="6.9999971"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/incomingCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/incomingCall.png"
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<path
style="fill:url(#linearGradient13657);fill-opacity:1.0;fill-rule:evenodd;stroke:#ffd24a;stroke-width:0.56267327000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 178.35631,433.59705 L 179.36031,444.45935 L 168.5839,444.98867 L 171.58005,441.40948 L 161.45214,432.84952 L 165.34516,428.28456 L 175.4677,436.95565 L 178.35631,433.59705 z "
style="fill:url(#linearGradient13657);fill-opacity:1;fill-rule:evenodd;stroke:#ffd24a;stroke-width:0.56267327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 162.45614,433.59705 -1.004,10.8623 10.77641,0.52932 -2.99615,-3.57919 10.12791,-8.55996 -3.89302,-4.56496 -10.12254,8.67109 -2.88861,-3.3586 z"
id="path12740"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/incomingCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/incomingCall.png"
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<path
style="fill:url(#linearGradient13654);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65629596;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 176.63826,436.04285 L 177.2653,443.73068 L 169.65277,444.18682 L 171.92116,441.25238 L 162.91733,433.68184 L 165.90907,429.9422 L 175.08668,437.7689 L 176.63826,436.04285 z "
style="fill:url(#linearGradient13654);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 164.17419,436.04285 -0.62704,7.68783 7.61253,0.45614 -2.26839,-2.93444 9.00383,-7.57054 -2.99174,-3.73964 -9.17761,7.8267 -1.55158,-1.72605 z"
id="path12742"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/incomingCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/incomingCall.png"
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<rect
style="opacity:0.98999999000000005;fill:#bf0913;fill-opacity:1;stroke:none"
id="rect12736-4"
@ -331,8 +332,8 @@
rx="6.9999971"
ry="6.9999971"
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/missedCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<rect
style="opacity:0.98999999;fill:url(#linearGradient13660-4);fill-opacity:1;stroke:none"
id="rect12738-1"
@ -343,23 +344,23 @@
rx="6.9999971"
ry="6.9999971"
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/missedCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<path
style="fill:url(#linearGradient7442);fill-opacity:1;fill-rule:evenodd;stroke:#bf0913;stroke-width:0.56267327000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.98823529000000021;stroke-dasharray:none"
d="m 214.30722,433.72459 1.004,10.8623 -10.77641,0.52932 2.99615,-3.57919 -10.12791,-8.55996 3.89302,-4.56496 10.12254,8.67109 2.88861,-3.3586 z"
style="fill:url(#linearGradient7442);fill-opacity:1;fill-rule:evenodd;stroke:#bf0913;stroke-width:0.56267327;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.98823529;stroke-dasharray:none"
d="m 198.40705,433.72459 -1.004,10.8623 10.77641,0.52932 -2.99615,-3.57919 10.12791,-8.55996 -3.89302,-4.56496 -10.12254,8.67109 -2.88861,-3.3586 z"
id="path12740-9"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/missedCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
<path
style="fill:url(#linearGradient13654-5);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 212.58917,436.17039 0.62704,7.68783 -7.61253,0.45614 2.26839,-2.93444 -9.00383,-7.57054 2.99174,-3.73964 9.17761,7.8267 1.55158,-1.72605 z"
d="m 200.1251,436.17039 -0.62704,7.68783 7.61253,0.45614 -2.26839,-2.93444 9.00383,-7.57054 -2.99174,-3.73964 -9.17761,7.8267 -1.55158,-1.72605 z"
id="path12742-0"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/missedCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-xdpi="78.75"
inkscape:export-ydpi="78.75" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

49
resources/images/impl/gui/common/src/outgoingCall.svg
Unescape View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@ -13,10 +14,10 @@
height="1052.3622047"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.46"
sodipodi:docbase="/home/yana/images"
inkscape:version="0.47 r22583"
sodipodi:docname="outgoingCall.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs4">
<inkscape:perspective
@ -97,7 +98,7 @@
xlink:href="#linearGradient15050"
id="linearGradient7412"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.438973,0.374357,0.330097,-0.387072,142.9729,539.0856)"
gradientTransform="matrix(-0.438973,0.374357,-0.330097,-0.387072,294.73657,539.0856)"
x1="-33.99184"
y1="251.34933"
x2="-13.660458"
@ -107,7 +108,7 @@
xlink:href="#linearGradient20674"
id="linearGradient7415"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.63168,0.538698,0.464872,-0.54511,113.6667,584.4578)"
gradientTransform="matrix(-0.63168,0.538698,-0.464872,-0.54511,324.04277,584.4578)"
x1="-25.239761"
y1="254.02179"
x2="-9.0964222"
@ -189,10 +190,11 @@
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1280"
inkscape:window-height="800"
inkscape:window-height="778"
inkscape:window-x="0"
inkscape:window-y="22"
showgrid="false" />
showgrid="false"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
@ -201,6 +203,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -217,9 +220,9 @@
y="419.6701"
rx="7.0000005"
ry="7.0000005"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/outgoingCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/outgoingCall.png"
inkscape:export-xdpi="78.306297"
inkscape:export-ydpi="78.306297" />
<rect
style="opacity:0.98999999;fill:url(#linearGradient15439);fill-opacity:1;stroke:none;stroke-width:1.47956574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect15437"
@ -229,24 +232,24 @@
y="421.07907"
rx="6.9999971"
ry="6.9999971"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/outgoingCall.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/outgoingCall.png"
inkscape:export-xdpi="78.306297"
inkscape:export-ydpi="78.306297" />
<path
style="fill:url(#linearGradient7415);fill-opacity:1;fill-rule:evenodd;stroke:#335c99;stroke-width:0.53984565;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 211.22716,437.94503 L 210.26392,427.52338 L 220.60311,427.01556 L 217.72853,430.44952 L 227.44555,438.66221 L 223.71046,443.04198 L 213.9986,434.72267 L 211.22716,437.94503 z "
style="fill:url(#linearGradient7415);fill-opacity:1;fill-rule:evenodd;stroke:#335c99;stroke-width:0.53984565;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 226.48231,437.94503 0.96324,-10.42165 -10.33919,-0.50782 2.87458,3.43396 -9.71702,8.21269 3.73509,4.37977 9.71186,-8.31931 2.77144,3.22236 z"
id="path6507"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/outgoingCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/outgoingCall.png"
inkscape:export-xdpi="78.306297"
inkscape:export-ydpi="78.306297" />
<path
style="fill:url(#linearGradient7412);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.65629596;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 212.48871,435.2549 L 211.89114,427.92839 L 219.33726,427.58939 L 217.1107,430.1451 L 226.07415,437.85679 L 222.71365,441.06882 L 213.96737,433.60997 L 212.48871,435.2549 z "
style="fill:url(#linearGradient7412);fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 225.22076,435.2549 0.59757,-7.32651 -7.44612,-0.339 2.22656,2.55571 -8.96345,7.71169 3.3605,3.21203 8.74628,-7.45885 1.47866,1.64493 z"
id="path6509"
sodipodi:nodetypes="cccccccc"
inkscape:export-filename="/home/yana/workspace/sip-communicator-1-0-draft/src/net/java/sip/communicator/impl/gui/resources/common/outgoingCall.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000" />
inkscape:export-filename="/Users/yanastamcheva/workspace/filter/resources/images/impl/gui/common/outgoingCall.png"
inkscape:export-xdpi="78.306297"
inkscape:export-ydpi="78.306297" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

28
src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
Unescape View File

@ -345,7 +345,10 @@ private History getHistory(Contact localContact, Contact remoteContact)
if (this.historyService.isHistoryExisting(historyId))
{
retVal = this.historyService.getHistory(historyId);
} else {
retVal.setHistoryRecordsStructure(recordStructure);
}
else
{
retVal = this.historyService.createHistory(historyId,
recordStructure);
}
@ -891,12 +894,15 @@ public void peerStateChanged(CallPeerChangeEvent evt)
* @param callPeer CallPeer
* @param srcCall Call
*/
private void handlePeerRemoved(CallPeer callPeer,
Call srcCall)
private void handlePeerRemoved( CallPeer callPeer,
Call srcCall)
{
CallRecord callRecord = findCallRecord(srcCall);
String pAddress = callPeer.getAddress();
if (callRecord == null)
return;
CallPeerRecordImpl cpRecord =
(CallPeerRecordImpl)callRecord.findPeerRecord(pAddress);
@ -1105,17 +1111,17 @@ public void callStateChanged(CallChangeEvent evt)
if (callRecord == null)
return;
if (evt.getNewValue().equals(CallState.CALL_ENDED)
&& evt.getOldValue().equals(CallState.CALL_INITIALIZATION))
if (evt.getNewValue().equals(CallState.CALL_ENDED))
{
callRecord.setEndTime(callRecord.getStartTime());
}
else
callRecord.setEndTime(new Date());
if(evt.getOldValue().equals(CallState.CALL_INITIALIZATION))
callRecord.setEndTime(callRecord.getStartTime());
else
callRecord.setEndTime(new Date());
writeCall(callRecord, null, null);
writeCall(callRecord, null, null);
currentCallRecords.remove(callRecord);
currentCallRecords.remove(callRecord);
}
}
}

37
src/net/java/sip/communicator/impl/history/HistoryImpl.java
Unescape View File

@ -41,6 +41,15 @@ public class HistoryImpl implements History {
private SortedMap<String, Object> historyDocuments
= new TreeMap<String, Object>();
/**
* Creates an instance of <tt>HistoryImpl</tt> by specifying the history
* identifier, the directory, the <tt>HistoryRecordStructure</tt> to use
* and the parent <tt>HistoryServiceImpl</tt>.
* @param id the identifier
* @param directory the directory
* @param historyRecordStructure the structure
* @param historyServiceImpl the parent history service
*/
protected HistoryImpl(HistoryID id, File directory,
HistoryRecordStructure historyRecordStructure,
HistoryServiceImpl historyServiceImpl)
@ -68,16 +77,44 @@ protected HistoryImpl(HistoryID id, File directory,
}
}
/**
* Returns the identifier of this history.
* @return the identifier of this history
*/
public HistoryID getID()
{
return this.id;
}
/**
* Returns the current <tt>HistoryRecordStructure</tt>.
* @return the current <tt>HistoryRecordStructure</tt>
*/
public HistoryRecordStructure getHistoryRecordsStructure()
{
return this.historyRecordStructure;
}
/**
* Sets the given <tt>structure</tt> to be the new history records
* structure used in this history implementation.
* @param structure the new <tt>HistoryRecordStructure</tt> to use
*/
public void setHistoryRecordsStructure(HistoryRecordStructure structure)
{
this.historyRecordStructure = structure;
try
{
File dbDatFile = new File(directory, HistoryServiceImpl.DATA_FILE);
DBStructSerializer dbss = new DBStructSerializer(historyServiceImpl);
dbss.writeHistory(dbDatFile, this);
}
catch (IOException e)
{
log.debug("Could not create new history structure");
}
}
public HistoryReader getReader()
{
if (this.reader == null)

6
src/net/java/sip/communicator/service/history/History.java
Unescape View File

@ -35,4 +35,10 @@ public interface History {
*/
HistoryRecordStructure getHistoryRecordsStructure();
/**
* Sets the given <tt>structure</tt> to be the new history records
* structure used in this history implementation.
* @param structure the new <tt>HistoryRecordStructure</tt> to use
*/
void setHistoryRecordsStructure(HistoryRecordStructure struct);
}

4
test/net/java/sip/communicator/slick/callhistory/TestCallHistoryService.java
Unescape View File

@ -317,12 +317,12 @@ public void checkRecordCompleteness()
Collection<CallRecord> lastCall = callHistoryService.findLast(1);
assertEquals("There must be 1 Call", lastCall.size(), 1);
assertEquals("There must be 1 Call", 1, lastCall.size());
CallRecord callRecord = lastCall.iterator().next();
assertEquals("There must be 2 participants in the call",
callRecord.getPeerRecords().size(), 2);
2, callRecord.getPeerRecords().size());
CallPeerRecord callP1 =
callRecord.findPeerRecord(partAddresses[0]);

Write Preview
Loading…
Cancel
Save