From 71d0a3cf0b6c47dafe32275d9f10567117df8cf9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Ciezkowski Date: Fri, 26 Jun 2015 10:22:06 +0200 Subject: [PATCH] [TVWindow] Format code, fix logs Change-Id: Ia8d40b433302718f473ef55dc2eed040f83cdd65 Signed-off-by: Przemyslaw Ciezkowski (cherry picked from commit e31ed3228f6ddfaaa70dd4fd2c8f6069a034dbba) --- src/tvwindow/tvwindow_api.js | 24 +++++++++--------------- src/tvwindow/tvwindow_extension.h | 10 +++++----- src/tvwindow/tvwindow_instance.cc | 17 ++--------------- src/tvwindow/tvwindow_instance.h | 2 -- src/tvwindow/tvwindow_manager.cc | 6 +++--- src/tvwindow/tvwindow_manager.h | 12 ++++++------ 6 files changed, 25 insertions(+), 46 deletions(-) diff --git a/src/tvwindow/tvwindow_api.js b/src/tvwindow/tvwindow_api.js index 077aa260..5fd5215a 100644 --- a/src/tvwindow/tvwindow_api.js +++ b/src/tvwindow/tvwindow_api.js @@ -14,9 +14,9 @@ * limitations under the License. */ -extension.setMessageListener(function(msg) { - -}); +var native = new xwalk.utils.NativeManager(extension); +var validator = xwalk.utils.validator; +var validatorTypes = xwalk.utils.validator.Types; //TVWindowManager interface function TVWindowManager() { @@ -26,33 +26,27 @@ function TVWindowManager() { } -TVWindowManager.prototype.getAvailableWindows = function(successCallback, errorCallback) - { +TVWindowManager.prototype.getAvailableWindows = function(successCallback, errorCallback) { return undefined; }; -TVWindowManager.prototype.setSource = function(videosource, successCallback, errorCallback, type) - { +TVWindowManager.prototype.setSource = function(videosource, successCallback, errorCallback, type) { return undefined; }; -TVWindowManager.prototype.getSource = function(type) - { +TVWindowManager.prototype.getSource = function(type) { return undefined; }; -TVWindowManager.prototype.show = function(successCallback, errorCallback, rectangle, type) - { +TVWindowManager.prototype.show = function(successCallback, errorCallback, rectangle, type) { return undefined; }; -TVWindowManager.prototype.hide = function(successCallback, errorCallback, type) - { +TVWindowManager.prototype.hide = function(successCallback, errorCallback, type) { return undefined; }; -TVWindowManager.prototype.getRect = function(successCallback, errorCallback, unit, type) - { +TVWindowManager.prototype.getRect = function(successCallback, errorCallback, unit, type) { return undefined; }; diff --git a/src/tvwindow/tvwindow_extension.h b/src/tvwindow/tvwindow_extension.h index fc9acd0f..398d46a7 100644 --- a/src/tvwindow/tvwindow_extension.h +++ b/src/tvwindow/tvwindow_extension.h @@ -25,14 +25,14 @@ namespace tvwindow { class TVWindowExtension : public common::Extension { public: - TVWindowExtension(); - virtual ~TVWindowExtension(); + TVWindowExtension(); + virtual ~TVWindowExtension(); - TVWindowManager& manager(); + TVWindowManager& manager(); private: - // common::Extension implementation. - virtual common::Instance* CreateInstance(); + // common::Extension implementation. + virtual common::Instance* CreateInstance(); }; } // namespace tvwindow diff --git a/src/tvwindow/tvwindow_instance.cc b/src/tvwindow/tvwindow_instance.cc index 5e7b4e10..1d7c0c69 100644 --- a/src/tvwindow/tvwindow_instance.cc +++ b/src/tvwindow/tvwindow_instance.cc @@ -23,24 +23,11 @@ namespace extension { namespace tvwindow { TVWindowInstance::TVWindowInstance(TVWindowExtension const& extension) { - LOGD("Entered"); + LoggerD("Entered"); } TVWindowInstance::~TVWindowInstance() { - LOGD("Entered"); -} - -void TVWindowInstance::HandleMessage(const char* msg) { - // this is stub, no async messages - LOGD("Entered"); -} - -void TVWindowInstance::HandleSyncMessage(const char* msg) { - LOGD("Entered %s", msg); - picojson::object answer; - answer["answer"] = picojson::value(true); - - SendSyncReply(picojson::value(answer).serialize().c_str()); + LoggerD("Entered"); } } // namespace tvwindow diff --git a/src/tvwindow/tvwindow_instance.h b/src/tvwindow/tvwindow_instance.h index 1a9f9ef4..e9c48973 100644 --- a/src/tvwindow/tvwindow_instance.h +++ b/src/tvwindow/tvwindow_instance.h @@ -33,8 +33,6 @@ class TVWindowInstance : public common::ParsedInstance { virtual ~TVWindowInstance(); private: - virtual void HandleMessage(const char* msg); - virtual void HandleSyncMessage(const char* msg); }; } // namespace tvwindow diff --git a/src/tvwindow/tvwindow_manager.cc b/src/tvwindow/tvwindow_manager.cc index 11789e04..696e31e4 100644 --- a/src/tvwindow/tvwindow_manager.cc +++ b/src/tvwindow/tvwindow_manager.cc @@ -20,12 +20,12 @@ namespace extension { namespace tvwindow { TVWindowManager::TVWindowManager() { - LOGD("Enter"); + LoggerD("Enter"); } TVWindowManager& TVWindowManager::getInstance() { - static TVWindowManager manager; - return manager; + static TVWindowManager manager; + return manager; } } // namespace tvwindow } // namespace extension diff --git a/src/tvwindow/tvwindow_manager.h b/src/tvwindow/tvwindow_manager.h index f9231ead..3c951b64 100644 --- a/src/tvwindow/tvwindow_manager.h +++ b/src/tvwindow/tvwindow_manager.h @@ -24,14 +24,14 @@ namespace tvwindow { class TVWindowManager { public: - static TVWindowManager& getInstance(); + static TVWindowManager& getInstance(); private: - TVWindowManager(); - // Not copyable, assignable, movable - TVWindowManager(TVWindowManager const&); - void operator=(TVWindowManager const&); - TVWindowManager(TVWindowManager &&); + TVWindowManager(); + // Not copyable, assignable, movable + TVWindowManager(TVWindowManager const&); + void operator=(TVWindowManager const&); + TVWindowManager(TVWindowManager &&); }; } // namespace tvwindow -- 2.34.1