From e78e5511ba469780c4f7820808a8d041aa1ef226 Mon Sep 17 00:00:00 2001
From: Jihoon Chung <jihoon.chung@samsaung.com>
Date: Sun, 4 Aug 2013 18:39:38 +0900
Subject: [PATCH] Implement disposition element parser

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Implement disposition element parser
disposition element is sub-element of tizen:app-control.
element name : tizen:disposition
value :
  inline - application running with submode
  window - application running with normal state
example :
  <tizen:app-control>
    <tizen:src name="test.html"/>
    <tizen:operation name="http://tizen.org/appcontrol/operation/test"/>
    <tizen:disposition name="inline"/>
  </tizen:app-control>
dispostion element requires platform level
[SCMRequest] N/A

Change-Id: Ia957cd0f5921e3a3ab25eb6394395c00f951de82
---
 modules/widget_dao/dao/widget_dao.cpp                          | 8 ++++----
 modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/widget_dao/dao/widget_dao.cpp b/modules/widget_dao/dao/widget_dao.cpp
index ed66aa2..f50016e 100644
--- a/modules/widget_dao/dao/widget_dao.cpp
+++ b/modules/widget_dao/dao/widget_dao.cpp
@@ -717,11 +717,11 @@ void WidgetDAO::registerAppControl(DbWidgetHandle widgetHandle,
     // appControlList
     FOREACH(appControl_it, widgetConfigurationInfo.appControlList)
     {
-        DPL::String src       = appControl_it->m_src;
+        DPL::String src = appControl_it->m_src;
         DPL::String operation = appControl_it->m_operation;
-        unsigned index        = appControl_it->m_index;
-        unsigned disposition  = appControl_it->m_disposition ==
-            ConfigParserData::AppControlInfo::Disposition::INLINE ? 1 : 0;
+        unsigned index = appControl_it->m_index;
+        unsigned disposition =
+            static_cast<unsigned>(appControl_it->m_disposition);
 
         if (!appControl_it->m_uriList.empty())
         {
diff --git a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
index 399cbde..3069fa0 100644
--- a/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
+++ b/modules/widget_dao/include/dpl/wrt-dao-ro/config_parser_data.h
@@ -160,11 +160,13 @@ class ConfigParserData
     struct AppControlInfo
     {
         enum class Disposition {
-            WINDOW = 0,
-            INLINE
+            UNDEFINE = 0,
+            WINDOW   = 1,
+            INLINE   = 2
         };
         AppControlInfo(const DPL::String& operation) :
             m_operation(operation),
+            m_disposition(Disposition::UNDEFINE),
             m_index(0)
         {}
         DPL::String m_src;
-- 
2.7.4