Author: ygrego Date: 2015-02-10 10:29:07 +0000 (Tue, 10 Feb 2015) New Revision: 779 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/779 Log: Creation of method 'initChannel' into 'init.js', deletion of current channel creation into oipfObjectFactory constructor and this one disappeared from channel config object instanciation. Modified: oipf/js/impl/OipfObjectFactory.js oipf/js/initObj/init.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-02-10 09:54:42 UTC (rev 778) +++ oipf/js/impl/OipfObjectFactory.js 2015-02-10 10:29:07 UTC (rev 779) @@ -29,10 +29,7 @@ //this.applicationManagerObject = new ApplicationManagerObject(); //this.capabilitiesObject = new CapabilitiesObject(); //this.codManagerObject = new CodManagerObject(); - var currentChannelType = "TYPE_TV"; - var currentChannelName = "ARTE"; - var currentChannel = new Channel(currentChannelName, currentChannelType); - this.channelConfig = new ChannelConfig(null, currentChannel); + this.channelConfig = new ChannelConfig(); //this.imsObject = new IMSObecjet(); //this.mdtfObject = new MDTFObject(); //this.notifSocketObject = new NotifSocket(); Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-02-10 09:54:42 UTC (rev 778) +++ oipf/js/initObj/init.js 2015-02-10 10:29:07 UTC (rev 779) @@ -6,5 +6,22 @@ extends: "object" }); +function initChannel(oipfObjFact){ + var channelConfig = oipfObjectFactory.createChannelConfig(); + + var channelType = "TYPE_TV"; + var channelName = "ARTE"; + var channel1 = new Channel(channelName, channelType); + + channelName = "FRANCE_5"; + var channel2 = new Channel(channelName, channelType); + + channelConfig.currentChannel = channel; + channelConfig.channelList = [channel1, channel2]; +} + var oipfObjectFactory = new OipfObjectFactory(); +initChannel(); + var metadata = data; +