Author: ygrego Date: 2015-03-24 17:06:57 +0000 (Tue, 24 Mar 2015) New Revision: 968 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/968 Log: -Assignment of well mime-type in method "createNotifSocket" and "createParentalControlManagerObject". -The method "isObjectSupported" has been modified in order to just return a simple boolean. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-03-24 17:01:23 UTC (rev 967) +++ oipf/js/impl/OipfObjectFactory.js 2015-03-24 17:06:57 UTC (rev 968) @@ -123,28 +123,29 @@ isObjectSupported: function(mimeType) { var mimeType_method = { - "application/notifsocket" : "createNotifSocketObject", - "application/oipfApplicationManager" : "createApplicationManagerObject", - "application/oipfCapabilities" : "createCapabilitiesObject", - "application/oipfCodManager" : "createCodManagerObject", - "application/oipfCommunicationServices" : "createCommunicationServicesObject", - "application/oipfConfiguration" : "createConfigurationObject", - "application/oipfDownloadManager" : "createDownloadManagerObject", - "application/oipfDownloadTrigger" : "createDownloadTriggerObject", - "application/oipfDrmAgent" : "createDrmAgentObject", - "application/oipfGatewayInfo" : "createGatewayInfoObject", - "application/oipfMDTF" : "createMDTFObject", - "application/oipfParentalControlManager" : "createParentalControlManagerObject", - "application/oipfRecordingScheduler" : "createRecordingSchedulerObject", - "application/oipfRemoteControlFunction" : "createRemoteControlFunctionObject", - "application/oipfRemoteManagement" : "createRemoteManagementObject", - "application/oipfSearchManager" : "createSearchManagerObject", - "application/oipfStatusView" : "createStatusViewObject", - "video/broadcast" : "createVideoBroadcastObject", - "video/mpeg" : "createVideoMpegObject" + "channelConfig" : true, + "application/notifsocket" : false, + "application/oipfApplicationManager" : false, + "application/oipfCapabilities" : false, + "application/oipfCodManager" : false, + "application/oipfCommunicationServices" : false, + "application/oipfConfiguration" : true, + "application/oipfDownloadManager" : false, + "application/oipfDownloadTrigger" : false, + "application/oipfDrmAgent" : false, + "application/oipfGatewayInfo" : false, + "application/oipfMDTF" : false, + "application/oipfParentalControlManager" : false, + "application/oipfRecordingScheduler" : false, + "application/oipfRemoteControlFunction" : false, + "application/oipfRemoteManagement" : false, + "application/oipfSearchManager" : true, + "application/oipfStatusView" : false, + "video/broadcast" : true, + "video/mpeg" : false }; - return this[mimeType_method[mimeType]]; + return mimeType_method[mimeType]; }, /*! @@ -463,7 +464,7 @@ * implements the interface for the specified object. */ createNotifSocketObject: function() { - if (this.isObjectSupported(NotifSocketObject)) { + if (this.isObjectSupported(NOTIF_SOCKET_DAE_MIME_TYPE)) { console.log("[INFO] createNotifSocketObject() of OipfObjectFactory class called."); return this.notifSocketObject; } else { @@ -484,8 +485,8 @@ * If the object is supported, the method SHALL return a JavaScript Object which * implements the interface for the specified object. */ - createParentalControlManagerObject: function(PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE) { - if (this.isObjectSupported("video/broadcast")) { + createParentalControlManagerObject: function() { + if (this.isObjectSupported(PARENTAL_CONTROL_MANAGER_DAE_MIME_TYPE)) { console.log("[INFO] createParentalControlManangerObject() of OipfObjectFactory class called."); return this.parentalControlManagerObject; } else {