Author: ygrego Date: 2015-05-06 15:45:38 +0000 (Wed, 06 May 2015) New Revision: 1329 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1329 Log: Rename a property and call of the method "createMetadataManager" in constructor. Reimplementation of method "createMetadataManager". Addition of a log message in each method. Modified: oipf/js/impl/model/ModelFactory.js Modified: oipf/js/impl/model/ModelFactory.js =================================================================== --- oipf/js/impl/model/ModelFactory.js 2015-05-06 15:24:59 UTC (rev 1328) +++ oipf/js/impl/model/ModelFactory.js 2015-05-06 15:45:38 UTC (rev 1329) @@ -8,30 +8,32 @@ init: function(metadataObject) { this.metadataObject = metadataObject; - this.metadaManager = null; + this.metadataManager = null; this.xmlTvData = null; this.createXmlTvData(); + this.createMetadataManager(); }, createXmlTvData: function() { - - return this.return("xmlTvData") || + console.log("Method createXmlTvData"); + return this.getProperty("xmlTvData") || this.setProperty("xmlTvData", new XmlTvData(this.metadataObject)); }, getXmlTvData: function() { - return this.xmlTvData; + console.log("Method createXmlTvData"); + return this.getProperty("xmlTvData"); }, - /* * FIXME: Yannis - 06/05/2015 - Get a method to find an available number for * randomIndex. */ getAProgrammeFromXmlTvData: function() { - + console.log("Method createXmlTvData"); + var randomIndex = 150; if (this.xmlTvData && this.xmlTvData.programmes[randomIndex]) { @@ -41,24 +43,40 @@ }, createScheduledRecording: function() { + console.log("Method createScheduledRecording"); return new ScheduledRecording(this.getAPrgrammeFromXmlTvData()); }, createRecording: function() { + console.log("Method createRecording"); return new Recording(this.createScheduledRecording()); }, createMetadataManager: function() { - return this.return("metadaManager") || - this.setProperty("metadaManager", - new MetadataManager()); + console.log("Method createMetadataManager"); + + if (this.getProperty("metadataManager")) { + return this.getProperty("metadataManager"); + } + + this.setProperty("metadataManager", new MetadataManager()); + this.getProperty("metadataManager").addMetadata(this.getXmlTvData()); + + return this.getProperty("metadataManager"); }, + getMetadataManager: function() { + console.log("Method getMetadataManager"); + return this.getProperty("metadataManager"); + }, + getProperty: function(propertyName) { + console.log("Method getProperty"); return this[propertyName]; }, setProperty: function(propertyName, value) { + console.log("Method setProperty"); this[propertyName] = value; }