February 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r895 - oipf/js/impl
by ygrego＠users.nuiton.org 28 Feb '15

28 Feb '15

Author: ygrego Date: 2015-02-28 22:11:45 +0000 (Sat, 28 Feb 2015) New Revision: 895 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/895 Log: A channel must have a identifer type at her instanciation so this information is added now. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-02-28 22:06:22 UTC (rev 894) +++ oipf/js/impl/ChannelConfig.js 2015-02-28 22:11:45 UTC (rev 895) @@ -98,10 +98,11 @@ var channelType = "TYPE_TV"; var channelName = "ARTE"; - var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + var channelIdType = 12; + var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1)); + var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); this.currentChannel = channelArte; this.channelList = new ChannelList(channelArte, channelFrance5);

1 0

r894 - oipf/js/impl/model
by ygrego＠users.nuiton.org 28 Feb '15

28 Feb '15

Author: ygrego Date: 2015-02-28 22:06:22 +0000 (Sat, 28 Feb 2015) New Revision: 894 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/894 Log: A new parameter is added to constructor. Modified: oipf/js/impl/model/Channel.js Modified: oipf/js/impl/model/Channel.js =================================================================== --- oipf/js/impl/model/Channel.js 2015-02-28 21:35:30 UTC (rev 893) +++ oipf/js/impl/model/Channel.js 2015-02-28 22:06:22 UTC (rev 894) @@ -84,10 +84,11 @@ sid: null, - init: function (name, channelType, channelId) { + init: function (name, channelType, channelId, idType) { this.name = name; this.channelType = CHANNEL_CONSTANT[channelType]; this.channelId = channelId; + this.idType = idType; } }); \ No newline at end of file

1 0

r893 - oipf/js/impl
by ygrego＠users.nuiton.org 28 Feb '15

28 Feb '15

Author: ygrego Date: 2015-02-28 21:35:30 +0000 (Sat, 28 Feb 2015) New Revision: 893 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/893 Log: It is necessary to do absolute for the index calculation of previous/next element in a list because this calculation can be negative.(Into method "_findChannel") Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-28 21:02:50 UTC (rev 892) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-28 21:35:30 UTC (rev 893) @@ -410,6 +410,7 @@ channelCollection = channelConfig.currentFavouriteLists; } var previousChannel = this._findChannel(channelCollection, this.currentChannel, - 1); + console.log(previousChannel, channelCollection, this.currentChannel); var tunerFound = this._verifyASuitableTunerAvailable(previousChannel.idType); if (tunerFound) { //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. @@ -535,7 +536,7 @@ _findChannel: function(channelCollection, channel, step) { for (var keys = Object.keys(channelCollection) in channelCollection) { if (channelCollection[keys] == channel) { - return channelCollection[(keys%channelCollection.length)+step]; + return channelCollection[Math.abs((keys%(channelCollection.length))+step)]; } } return null;

1 0

r892 - oipf/js/impl
by ygrego＠users.nuiton.org 28 Feb '15

28 Feb '15

Author: ygrego Date: 2015-02-28 21:02:50 +0000 (Sat, 28 Feb 2015) New Revision: 892 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/892 Log: Change the name of variable "channelList" (became "channelCollection") in method prevChannel to a better understanding. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-27 17:05:01 UTC (rev 891) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-28 21:02:50 UTC (rev 892) @@ -404,12 +404,12 @@ */ if (channelConfig.currentFavouriteList.length == 0) { //Find the previous channel into channel list - var channelsList = channelConfig.channelLists; + var channelCollection = channelConfig.channelList; } else { //Find the previous channel into the current favourite list - channelsList = channelConfig.currentFavouriteList; + channelCollection = channelConfig.currentFavouriteLists; } - var previousChannel = this._findChannel(channelsList, this.currentChannel, - 1); + var previousChannel = this._findChannel(channelCollection, this.currentChannel, - 1); var tunerFound = this._verifyASuitableTunerAvailable(previousChannel.idType); if (tunerFound) { //ToDO: Error handling, if the switch fail, this instruction correspond to channel switch. @@ -533,7 +533,6 @@ }, _findChannel: function(channelCollection, channel, step) { - for (var keys = Object.keys(channelCollection) in channelCollection) { if (channelCollection[keys] == channel) { return channelCollection[(keys%channelCollection.length)+step];

1 0

r891 - oipf/js/test
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 17:05:01 +0000 (Fri, 27 Feb 2015) New Revision: 891 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/891 Log: Deletion of test dependance between tests. For each test a "videoBroadcastObject" are created. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-27 17:01:19 UTC (rev 890) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-27 17:05:01 UTC (rev 891) @@ -4,8 +4,8 @@ * */ var VideoBroadcastTest = TestCase.extend({ - error: [ - { + error: { + 0: "channel not supported by tuner", 1: "cannot tune to given transport stream (e.g. no signal)", 2: "tuner locked by other object.", @@ -20,9 +20,8 @@ 11: "insufficient resources are available to present the given channel (e.g. a lack of available codec resources).", 12: "specified channel not found in transport stream.", 100: "unidentified error." - } - ], - videoBroadcastObject: null, + + }, init: function () { }, /* @@ -33,9 +32,9 @@ console.log("***************************************************************************************************************************"); console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); - this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - if (this.assertNotNull(this.videoBroadcastObject) && this.assertNotUndefined(this.videoBroadcastObject)) { + if (this.assertNotNull(videoBroadcastObject) && this.assertNotUndefined(videoBroadcastObject)) { console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Successfull"); resolve("Successfull"); } else { @@ -54,15 +53,16 @@ console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); var self = this; - this.videoBroadcastObject.onPlayStateChange = function (state, error) { + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + videoBroadcastObject.onPlayStateChange = function (state, error) { var wantedPlayState; var VerifWantedPlayStateRes; - switch (self.videoBroadcastObject.playstate) { + switch (videoBroadcastObject.playstate) { case 0: wantedPlayState = 2; - VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState, reject); + VerifWantedPlayStateRes = self.verifWantedPlayState(self, videoBroadcastObject, state, wantedPlayState); //TODO Verfication of binding to the necesssary ressources have achieved with success. break; @@ -76,7 +76,7 @@ case 3: wantedPlayState = 1; - VerifWantedPlayStateRes = self.verifWantedPlayState(self, state, wantedPlayState, reject); + VerifWantedPlayStateRes = self.verifWantedPlayState(self, videoBroadcastObject, state, wantedPlayState); //TODO Verify that video and audio presentation is enabled break; @@ -84,13 +84,15 @@ var success; success = VerifWantedPlayStateRes[0]; - var errorPlayState = ""; + var errorPlayState = " "; if (!success) { errorPlayState = VerifWantedPlayStateRes[1]; + } else { + videoBroadcastObject.playstate = 2; } - var errorBind = ""; - if (self.assertEquals(self.videoBroadcastObject.currentChannel, currentChann)) { + var errorBind = " "; + if (self.assertEquals(videoBroadcastObject.currentChannel, currentChann)) { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); success = true; } else { @@ -109,12 +111,58 @@ }; - var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); + var currentChann = videoBroadcastObject.bindToCurrentChannel(); }, - verifWantedPlayState: function (object, receivedPlayState, wantedPlayState, reject) { - if (object.assertEquals(receivedPlayState, wantedPlayState)) { - object.videoBroadcastObject.playstate = receivedPlayState; + + testPrevChannel: function(resolve, reject) { + console.log("***************************************************************************************************************************"); + + console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Pending"); + var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); + videoBroadcastObject.playstate = 2; + videoBroadcastObject.currentChannel = videoBroadcastObject.getChannelConfig().currentChannel; + videoBroadcastObject.prevChannel(); + + var self = this; + videoBroadcastObject.onPlayStateChange = function(state, error) { + + videoBroadcastObject.playstate = state; + + if (error) { + var errorText = self.error[error]; + console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); + + reject("Failure:" + errorText); + } + + }; + + videoBroadcastObject.onChannelChangeError = function(channel, error) { + var errorText = self.error[error]; + console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); + + reject("Failure:" + errorText); + }; + + videoBroadcastObject.onChannelChangeSucceeded = function(channel) { + if (self.assertNotNull(channel)) { + console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Successful"); + resolve("Successfull"); + } else { + console.log("[TEST-RUNNING][Info] Id: vbTestPrevChannel, Label: Switch to precedent channel in channel list, State: Failure"); + reject("Failure : The channel is null because a unknown reason."); + } + + }; + console.log("***************************************************************************************************************************"); + + + }, + + verifWantedPlayState: function (currentObject, object,receivedPlayState, wantedPlayState) { + if (currentObject.assertEquals(receivedPlayState, wantedPlayState)) { + object.playstate = receivedPlayState; return true; } else { console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure");

1 0

r890 - oipf/view
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 17:01:19 +0000 (Fri, 27 Feb 2015) New Revision: 890 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/890 Log: New stylesheet for page "test.html" Added: oipf/view/tableaux.html Added: oipf/view/tableaux.html =================================================================== --- oipf/view/tableaux.html (rev 0) +++ oipf/view/tableaux.html 2015-02-27 17:01:19 UTC (rev 890) @@ -0,0 +1,175 @@ +<!DOCTYPE html> + +<html> + <head> + <title>OIPF Tests</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <LINK rel="stylesheet" type="text/css" href="css/tableaux.css"> + <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/utils/Calculation.js" type="text/javascript"></script> + <script src="../js/utils/ChannelTools.js" type="text/javascript"></script> + <script src="../js/lib/Collection.js" type="text/javascript"></script> + <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> + <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> + <script src="../data/data.js" type="text/javascript"></script> + <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> + <script src="../js/impl/model/Query.js" type="text/javascript"></script> + <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> + <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> + <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> + <script src="../js/impl/model/Channel.js" type="text/javascript"></script> + <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> + <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> + <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> + <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> + <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> + <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> + <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> + <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> + <script src="../js/test/TestCase.js" type="text/javascript"></script> + <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> + <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> + <script src="../js/test/Test.js" type="text/javascript"></script> + <script src="../js/initObj/init.js" type="text/javascript"></script> + + <script> + var tests = new Test(); + function start() { + + tests.displayArrayLayout(); + document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); + } + function hideOrShowTestSection(sectionId) { + var style = document.getElementById(sectionId).style; + style.display = (style.display == "none") ? "block" : "none"; + } + </script> + </head> + <body onload="start()"> + <table id="demo-table"> + <CAPTION>Les océans</CAPTION> + + <THEAD> + <TR> + <TH></TH> + <TH>Surface</TH> + <TH>Profondeur moyenne</TH> + </TR> + <TR> + <TH></TH> + <TH>millions de km<SUP>2</SUP></TH> + <TH>m</TH> + </TR> + </THEAD> + + <TBODY> + <TR> + <TH>Arctique</TH> + <TD>13 000</TD> + <TD>1 200</TD> + </TR> + <TR> + <TH>Atlantique</TH> + <TD>87 000</TD> + <TD>3 900</TD> + </TR> + <TR> + <TH>Pacifique</TH> + <TD>180 000</TD> + <TD>4 000</TD> + </TR> + <TR> + <TH>Indien</TH> + <TD>75 000</TD> + <TD>3 900</TD> + </TR> + <TR> + <TH>Antarctique</TH> + <TD>20 000</TD> + <TD>4 500</TD> + </TR> + </TBODY> + + <TFOOT> + <TR> + <TH>Total</TH> + <TD>361 000</TD> + <TD></TD> + </TR> + <TR> + <TH>Moyenne</TH> + <TD>72 000</TD> + <TD>3 800</TD> + </TR> + </TFOOT> + + </table> + + <table id="demo-table1"> + <CAPTION>Les océans</CAPTION> + +  + + <TBODY> + <TR> + <TH>Arctique</TH> + <TD>13 000</TD> + <TD>1 200</TD> + </TR> + <TR> + <TH>Atlantique</TH> + <TD>87 000</TD> + <TD>3 900</TD> + </TR> + <TR> + <TH>Pacifique</TH> + <TD>180 000</TD> + <TD>4 000</TD> + </TR> + <TR> + <TH>Indien</TH> + <TD>75 000</TD> + <TD>3 900</TD> + </TR> + <TR> + <TH>Antarctique</TH> + <TD>20 000</TD> + <TD>4 500</TD> + </TR> + </TBODY> + + <TFOOT> + <TR> + <TH>Total</TH> + <TD>361 000</TD> + <TD></TD> + </TR> + <TR> + <TH>Moyenne</TH> + <TD>72 000</TD> + <TD>3 800</TD> + </TR> + </TFOOT> + + </table> + + </body> + +</html>

1 0

r889 - oipf/view
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 17:00:24 +0000 (Fri, 27 Feb 2015) New Revision: 889 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/889 Log: Deletion of stylesheet "test.css". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-02-27 16:59:15 UTC (rev 888) +++ oipf/view/test.html 2015-02-27 17:00:24 UTC (rev 889) @@ -9,7 +9,6 @@ <title>OIPF Tests</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="css/test.css"/> <link rel="stylesheet" type="text/css" href="css/tableaux.css"/> <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script>

1 0

r888 - oipf/js/test
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:59:15 +0000 (Fri, 27 Feb 2015) New Revision: 888 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/888 Log: Addition of method "displayArrayLayout" to display tests cases as a table. Modify method "display" in order to all tests sections are contained into one tag "div". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-27 16:53:24 UTC (rev 887) +++ oipf/js/test/Test.js 2015-02-27 16:59:15 UTC (rev 888) @@ -25,13 +25,13 @@ label: "Switch to precedent channel in channel list.", method: "testPrevChannel", impl: true - }/*, + }, { id: "vbTestNextChannel", label: "Switch to next channel in channel list.", method:"testNextChannel", impl: false - }*/ + } ]},{ name: "SearchManagerTest", object: new SearchManagerTest(), @@ -50,10 +50,10 @@ } ] }], - init: function () { + init: function() { }, - runAll: function () { + runAll: function() { for (var i = 0; i < this.testsObjects.length; i++) { var element = this.testsObjects[i]; @@ -70,8 +70,8 @@ } }, //Use the innerHTML property to achieve display - display: function () { - var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button></div>"; + display: function() { + var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; var testsObjects = this.testsObjects; for (var i = 0; i < testsObjects.length; i++) { @@ -102,8 +102,50 @@ content += "</div>"; document.body.innerHTML = content; }, - updateTestResult: function (currentTest, object) { + + //Use the innerHTML property to achieve display + displayArrayLayout: function() { + var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; + var testsObjects = this.testsObjects; + for (var i = 0; i < testsObjects.length; i++) { + var currentObject = testsObjects[i]; + var sectionName = currentObject["name"]; + content += "<div id='" + sectionName + "SectionTitle" + "'>" + sectionName + " <button id='" + sectionName + "Btn' onclick='hideOrShowTestSection(\"" + sectionName + "\")'>Hide/Show</button>"; + content += "<div id='" + sectionName + "'>"; + var tests = currentObject["tests"]; + for (var j = 0; j < tests.length; j++) { + + var currentTest = tests[j]; + //content += "<div id='" + currentTest["id"] + "'>"; + content += "<table id='" + currentTest["id"] + "Table'>"; + content += "<caption>" + currentTest["id"] + "<caption/>"; + content += "<tbody>"; + content += "<tr><th>Tested method</th><td>" + currentTest["method"] + "</td></tr>"; + content += "<tr><th>Label</th><td>" + currentTest["label"] + "</td></tr>"; + var impl = currentTest["impl"]; + content += "<tr><th>Implementation State</th><td>" + impl + "</td></tr>"; + content += "</tbody>"; + ////TFOOT + content += "<tfoot>"; + if (impl) { + content += "<tr><th>Result</th><td id='" + currentTest["id"] + "Res'>Test has not been launch. Click on button \"Run\" below.</td></tr>"; + content += "<tr><th>Test launching</th><td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td></tr>"; + } else { + content += "<tr><th>Result</th><td id='" + currentTest["id"] + "Res'>Any result will be available for the moment, test has not been implemented.</td></tr>"; + content += "<tr><th>Test launching</th><td><button id='" + currentTest["id"] + "Btn" + "' disabled>Run</button></td></tr>"; + } + content += "</tfoot>"; + content += "</table>"; + } + + content += "</div>"; + } + content += "</div>"; + document.body.innerHTML = content; + }, + updateTestResult: function(currentTest, object) { + var promise = new Promise(object[currentTest["method"]].bind(object)); promise.then(function (val) { document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val;

1 0

r887 - oipf/view
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:53:24 +0000 (Fri, 27 Feb 2015) New Revision: 887 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/887 Log: Addition of new stylesheet for the page and method "hideOrShowTestSection", call method "displayArrayLayout" in start method. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-02-27 16:47:19 UTC (rev 886) +++ oipf/view/test.html 2015-02-27 16:53:24 UTC (rev 887) @@ -10,6 +10,7 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" type="text/css" href="css/test.css"/> + <link rel="stylesheet" type="text/css" href="css/tableaux.css"/> <script src="../js/lib/Class.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> <script src="../js/utils/ChannelTools.js" type="text/javascript"></script> @@ -41,9 +42,13 @@ <script> function start() { var tests = new Test(); - tests.display(); + tests.displayArrayLayout(); document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); } + function hideOrShowTestSection(sectionId) { + var style = document.getElementById(sectionId).style; + style.display = (style.display == "none") ? "block" : "none"; + } </script> </head> <body onload="start()">

1 0

r886 - oipf/js/impl/model
by ygrego＠users.nuiton.org 27 Feb '15

27 Feb '15

Author: ygrego Date: 2015-02-27 16:47:19 +0000 (Fri, 27 Feb 2015) New Revision: 886 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/886 Log: "FavouriteListCollection" will manage severals lists of favourites channels. Each class concerned here, extend to javascript class "Array" and call her method "push" in their constructor to simulate an array creation if arguments present when the constructor is called. Added: oipf/js/impl/model/FavouriteListCollection.js Modified: oipf/js/impl/model/FavouriteList.js oipf/js/impl/model/IntegerCollection.js oipf/js/impl/model/TunerCollection.js Modified: oipf/js/impl/model/FavouriteList.js =================================================================== --- oipf/js/impl/model/FavouriteList.js 2015-02-27 16:38:33 UTC (rev 885) +++ oipf/js/impl/model/FavouriteList.js 2015-02-27 16:47:19 UTC (rev 886) @@ -5,10 +5,10 @@ * In order to preserve backwards compatibility with already existing DAE content the JavaScript toString() method * SHALL return the FavouriteList.id for FavouriteList objects. */ -var FavouriteList = Collection.extend({ +var FavouriteList = Array.extend({ - init: function(elements) { - this.super.init(elements); + init: function() { + this.push.apply(this, arguments); } }); Added: oipf/js/impl/model/FavouriteListCollection.js =================================================================== --- oipf/js/impl/model/FavouriteListCollection.js (rev 0) +++ oipf/js/impl/model/FavouriteListCollection.js 2015-02-27 16:47:19 UTC (rev 886) @@ -0,0 +1,25 @@ +/* Description; + * The FavouriteListCollection class represents a collection of FavouriteList objects. See Annex K for the + * definition of the collection template. In addition to the methods and properties defined for generic collections, the + * FavouriteListCollection class supports the additional methods defined below. + */ +var FavouriteListCollection = Array.extend({ + + init: function() { + this.push.apply(this, arguments); + }, + /* + * Description: + * Return the first favourite list in the collection with the given favListID. + * + * Arguments: + * - favID: The ID of a favourite list. + * + * Return: FavouriteList + */ + getFavouriteList: function(favID) { + + } + + +}); Modified: oipf/js/impl/model/IntegerCollection.js =================================================================== --- oipf/js/impl/model/IntegerCollection.js 2015-02-27 16:38:33 UTC (rev 885) +++ oipf/js/impl/model/IntegerCollection.js 2015-02-27 16:47:19 UTC (rev 886) @@ -4,12 +4,9 @@ * */ -var IntegerCollection = Collection.extend({ - - init: function(elements) { - if (elements) { - this.super.init(elements); - } - } +var IntegerCollection = Array.extend({ + init: function() { + this.push.apply(this, arguments); + } }); Modified: oipf/js/impl/model/TunerCollection.js =================================================================== --- oipf/js/impl/model/TunerCollection.js 2015-02-27 16:38:33 UTC (rev 885) +++ oipf/js/impl/model/TunerCollection.js 2015-02-27 16:47:19 UTC (rev 886) @@ -1,13 +1,11 @@ /* -* Description: -* The TunerCollection class represents a collection of Tuner objects. See Annex K for the definition of the collection template. -* -*/ -var TunerCollection = Collection.extend({ - - init : function(elements) { - - this.super.init(elements); + * Description: + * The TunerCollection class represents a collection of Tuner objects. See Annex K for the definition of the collection template. + * + */ +var TunerCollection = Array.extend({ + init: function() { + this.push.apply(this, arguments); } }); \ No newline at end of file

1 0