diff options
Diffstat (limited to 'src/components/application_manager/src/commands/mobile/set_display_layout_request.cc')
-rw-r--r-- | src/components/application_manager/src/commands/mobile/set_display_layout_request.cc | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc index f3d9e28c04..6cb6318791 100644 --- a/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc +++ b/src/components/application_manager/src/commands/mobile/set_display_layout_request.cc @@ -32,26 +32,23 @@ */ #include "application_manager/commands/mobile/set_display_layout_request.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/application_impl.h" +#include "application_manager/application_impl.h" namespace application_manager { namespace commands { SetDisplayLayoutRequest::SetDisplayLayoutRequest( - const MessageSharedPtr& message) - : CommandRequestImpl(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : CommandRequestImpl(message, application_manager) {} -SetDisplayLayoutRequest::~SetDisplayLayoutRequest() { -} +SetDisplayLayoutRequest::~SetDisplayLayoutRequest() {} void SetDisplayLayoutRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); ApplicationConstSharedPtr app = - ApplicationManagerImpl::instance()->application(connection_key()); + application_manager_.application(connection_key()); if (!app) { LOG4CXX_ERROR(logger_, "Application is not registered"); @@ -61,8 +58,8 @@ void SetDisplayLayoutRequest::Run() { (*message_)[strings::msg_params][strings::app_id] = app->app_id(); SendHMIRequest(hmi_apis::FunctionID::UI_SetDisplayLayout, - &((*message_)[strings::msg_params]), true); - + &((*message_)[strings::msg_params]), + true); } void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { @@ -74,21 +71,25 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { LOG4CXX_INFO(logger_, "Received UI_SetDisplayLayout event"); mobile_apis::Result::eType result_code = - static_cast<mobile_apis::Result::eType>( - message[strings::params][hmi_response::code].asInt()); + static_cast<mobile_apis::Result::eType>( + message[strings::params][hmi_response::code].asInt()); bool response_success = mobile_apis::Result::SUCCESS == result_code; smart_objects::SmartObject msg_params = message[strings::msg_params]; if (response_success) { HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities(); // in case templates_available is empty copy from hmi capabilities if (msg_params.keyExists(hmi_response::display_capabilities)) { - if (0 == msg_params[hmi_response::display_capabilities][hmi_response::templates_available].length()) { - msg_params[hmi_response::display_capabilities][hmi_response::templates_available] = - hmi_capabilities.display_capabilities()->getElement(hmi_response::templates_available); + if (0 == + msg_params[hmi_response::display_capabilities] + [hmi_response::templates_available].length()) { + msg_params[hmi_response::display_capabilities] + [hmi_response::templates_available] = + hmi_capabilities.display_capabilities()->getElement( + hmi_response::templates_available); } } } @@ -96,7 +97,7 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { break; } default: { - LOG4CXX_ERROR(logger_,"Received unknown event" << event.id()); + LOG4CXX_ERROR(logger_, "Received unknown event" << event.id()); return; } } |