aurum: changed name in order to solve a keyword collision issue in Java.

Change-Id: Ia24909309fb1bacf51cf17f9a3a347d5edd0a253

diff --git a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
index b2e19b11d8baa4c71ff0c89e980aa7d1448de94d..e9b27f24fbeb2ba794a084901a7b8e1b448a3e82 100644 (file)
--- a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc
@@ -35,7 +35,7 @@ std::shared_ptr<ISearchable> FindElementCommand::getSearchableTop(void)
 {
     std::shared_ptr<ISearchable> searchableObj{nullptr};
 
-    if (mRequest->_elementid_case() != 0) {
+    if (mRequest->reqElementid_case() != 0) {
         searchableObj = mObjMap->getElement(mRequest->elementid());
     }
     if (!searchableObj) searchableObj = UiDevice::getInstance();
@@ -47,32 +47,32 @@ std::shared_ptr<UiSelector> FindElementCommand::getSelector(void)
 {
     auto sel = std::make_shared<UiSelector>();
 
-    if(mRequest->_elementid_case())        sel->id(mRequest->elementid());
-    if(mRequest->_automationid_case())     sel->automationid(mRequest->automationid());
-    if(mRequest->_textfield_case())        sel->text(mRequest->textfield());
-    if(mRequest->_widgettype_case())       sel->type(mRequest->widgettype());
-    if(mRequest->_widgetstyle_case())      sel->style(mRequest->widgetstyle());
-    if(mRequest->_ischecked_case())        sel->isChecked(mRequest->ischecked());
-    if(mRequest->_ischeckable_case())      sel->isCheckable(mRequest->ischeckable());
-    if(mRequest->_isclickable_case())      sel->isClickable(mRequest->isclickable());
-    if(mRequest->_isenabled_case())        sel->isEnabled(mRequest->isenabled());
-    if(mRequest->_isfocused_case())        sel->isFocused(mRequest->isfocused());
-    if(mRequest->_isfocusable_case())      sel->isFocusable(mRequest->isfocusable());
-    if(mRequest->_isscrollable_case())     sel->isScrollable(mRequest->isscrollable());
-    if(mRequest->_isselected_case())       sel->isSelected(mRequest->isselected());
-    if(mRequest->_isshowing_case())        sel->isShowing(mRequest->isshowing());
-    if(mRequest->_isactive_case())         sel->isActive(mRequest->isactive());
-    if(mRequest->_mindepth_case())         sel->minDepth(mRequest->mindepth());
-    if(mRequest->_maxdepth_case())         sel->maxDepth(mRequest->maxdepth());
-    if(mRequest->_packagename_case())      sel->pkg(mRequest->packagename());
-    if(mRequest->_textpartialmatch_case()) sel->textPartialMatch(mRequest->textpartialmatch());
-    if(mRequest->_xpath_case())            sel->xpath(mRequest->xpath());
-    if(mRequest->_ocrtext_case())          sel->ocrText(mRequest->ocrtext());
-    if(mRequest->_geometry_case())         sel->geometry(Rect<int>{mRequest->geometry().x(), mRequest->geometry().y(), mRequest->geometry().x() + mRequest->geometry().width(), mRequest->geometry().y() + mRequest->geometry().height()}, true);
-    if(mRequest->_isvisible_case())        sel->isVisible(mRequest->isvisible());
-    if(mRequest->_isselectable_case())     sel->isSelectable(mRequest->isselectable());
-    if(mRequest->_ishighlightable_case())  sel->isHighlightable(mRequest->ishighlightable());
-    if(mRequest->_description_case())      sel->description(mRequest->description());
+    if(mRequest->reqElementid_case())        sel->id(mRequest->elementid());
+    if(mRequest->reqAutomationid_case())     sel->automationid(mRequest->automationid());
+    if(mRequest->reqTextfield_case())        sel->text(mRequest->textfield());
+    if(mRequest->reqWidgettype_case())       sel->type(mRequest->widgettype());
+    if(mRequest->reqWidgetstyle_case())      sel->style(mRequest->widgetstyle());
+    if(mRequest->reqIschecked_case())        sel->isChecked(mRequest->ischecked());
+    if(mRequest->reqIscheckable_case())      sel->isCheckable(mRequest->ischeckable());
+    if(mRequest->reqIsclickable_case())      sel->isClickable(mRequest->isclickable());
+    if(mRequest->reqIsenabled_case())        sel->isEnabled(mRequest->isenabled());
+    if(mRequest->reqIsfocused_case())        sel->isFocused(mRequest->isfocused());
+    if(mRequest->reqIsfocusable_case())      sel->isFocusable(mRequest->isfocusable());
+    if(mRequest->reqIsscrollable_case())     sel->isScrollable(mRequest->isscrollable());
+    if(mRequest->reqIsselected_case())       sel->isSelected(mRequest->isselected());
+    if(mRequest->reqIsshowing_case())        sel->isShowing(mRequest->isshowing());
+    if(mRequest->reqIsactive_case())         sel->isActive(mRequest->isactive());
+    if(mRequest->reqMindepth_case())         sel->minDepth(mRequest->mindepth());
+    if(mRequest->reqMaxdepth_case())         sel->maxDepth(mRequest->maxdepth());
+    if(mRequest->reqPackagename_case())      sel->pkg(mRequest->packagename());
+    if(mRequest->reqTextpartialmatch_case()) sel->textPartialMatch(mRequest->textpartialmatch());
+    if(mRequest->reqXpath_case())            sel->xpath(mRequest->xpath());
+    if(mRequest->reqOcrtext_case())          sel->ocrText(mRequest->ocrtext());
+    if(mRequest->reqGeometry_case())         sel->geometry(Rect<int>{mRequest->geometry().x(), mRequest->geometry().y(), mRequest->geometry().x() + mRequest->geometry().width(), mRequest->geometry().y() + mRequest->geometry().height()}, true);
+    if(mRequest->reqIsvisible_case())        sel->isVisible(mRequest->isvisible());
+    if(mRequest->reqIsselectable_case())     sel->isSelectable(mRequest->isselectable());
+    if(mRequest->reqIshighlightable_case())  sel->isHighlightable(mRequest->ishighlightable());
+    if(mRequest->reqDescription_case())      sel->description(mRequest->description());
 
     return sel;
 }

diff --git a/org.tizen.aurum-bootstrap/src/Commands/FindElementsCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FindElementsCommand.cc
index a45e90d961ba88fb5cf321def76e727fcf844219..ce95b5e01291a4e0514949740e719e8edd1c03a7 100644 (file)
--- a/org.tizen.aurum-bootstrap/src/Commands/FindElementsCommand.cc
+++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementsCommand.cc
@@ -35,7 +35,7 @@ std::shared_ptr<ISearchable> FindElementsCommand::getSearchableTop(void)
 {
     std::shared_ptr<ISearchable> searchableObj{nullptr};
 
-    if (mRequest->_elementid_case() != 0) {
+    if (mRequest->reqElementid_case() != 0) {
         searchableObj = mObjMap->getElement(mRequest->elementid());
     }
     if (!searchableObj) searchableObj = UiDevice::getInstance();
@@ -47,32 +47,32 @@ std::vector<std::shared_ptr<UiSelector>> FindElementsCommand::getSelectors(void)
 {
     auto sel = std::make_shared<UiSelector>();
 
-    if(mRequest->_elementid_case())        sel->id(mRequest->elementid());
-    if(mRequest->_automationid_case())     sel->automationid(mRequest->automationid());
-    if(mRequest->_textfield_case())        sel->text(mRequest->textfield());
-    if(mRequest->_widgettype_case())       sel->type(mRequest->widgettype());
-    if(mRequest->_widgetstyle_case())      sel->style(mRequest->widgetstyle());
-    if(mRequest->_ischecked_case())        sel->isChecked(mRequest->ischecked());
-    if(mRequest->_ischeckable_case())      sel->isCheckable(mRequest->ischeckable());
-    if(mRequest->_isclickable_case())      sel->isClickable(mRequest->isclickable());
-    if(mRequest->_isenabled_case())        sel->isEnabled(mRequest->isenabled());
-    if(mRequest->_isfocused_case())        sel->isFocused(mRequest->isfocused());
-    if(mRequest->_isfocusable_case())      sel->isFocusable(mRequest->isfocusable());
-    if(mRequest->_isscrollable_case())     sel->isScrollable(mRequest->isscrollable());
-    if(mRequest->_isselected_case())       sel->isSelected(mRequest->isselected());
-    if(mRequest->_isshowing_case())        sel->isShowing(mRequest->isshowing());
-    if(mRequest->_isactive_case())         sel->isActive(mRequest->isactive());
-    if(mRequest->_mindepth_case())         sel->minDepth(mRequest->mindepth());
-    if(mRequest->_maxdepth_case())         sel->maxDepth(mRequest->maxdepth());
-    if(mRequest->_packagename_case())      sel->pkg(mRequest->packagename());
-    if(mRequest->_textpartialmatch_case()) sel->textPartialMatch(mRequest->textpartialmatch());
-    if(mRequest->_xpath_case())            sel->xpath(mRequest->xpath());
-    if(mRequest->_ocrtext_case())          sel->ocrText(mRequest->ocrtext());
-    if(mRequest->_geometry_case())         sel->geometry(Rect<int>{mRequest->geometry().x(), mRequest->geometry().y(), mRequest->geometry().x() + mRequest->geometry().width(), mRequest->geometry().y() + mRequest->geometry().height()}, false);
-    if(mRequest->_isvisible_case())        sel->isVisible(mRequest->isvisible());
-    if(mRequest->_isselectable_case())     sel->isSelectable(mRequest->isselectable());
-    if(mRequest->_ishighlightable_case())  sel->isHighlightable(mRequest->ishighlightable());
-    if(mRequest->_description_case())      sel->description(mRequest->description());
+    if(mRequest->reqElementid_case())        sel->id(mRequest->elementid());
+    if(mRequest->reqAutomationid_case())     sel->automationid(mRequest->automationid());
+    if(mRequest->reqTextfield_case())        sel->text(mRequest->textfield());
+    if(mRequest->reqWidgettype_case())       sel->type(mRequest->widgettype());
+    if(mRequest->reqWidgetstyle_case())      sel->style(mRequest->widgetstyle());
+    if(mRequest->reqIschecked_case())        sel->isChecked(mRequest->ischecked());
+    if(mRequest->reqIscheckable_case())      sel->isCheckable(mRequest->ischeckable());
+    if(mRequest->reqIsclickable_case())      sel->isClickable(mRequest->isclickable());
+    if(mRequest->reqIsenabled_case())        sel->isEnabled(mRequest->isenabled());
+    if(mRequest->reqIsfocused_case())        sel->isFocused(mRequest->isfocused());
+    if(mRequest->reqIsfocusable_case())      sel->isFocusable(mRequest->isfocusable());
+    if(mRequest->reqIsscrollable_case())     sel->isScrollable(mRequest->isscrollable());
+    if(mRequest->reqIsselected_case())       sel->isSelected(mRequest->isselected());
+    if(mRequest->reqIsshowing_case())        sel->isShowing(mRequest->isshowing());
+    if(mRequest->reqIsactive_case())         sel->isActive(mRequest->isactive());
+    if(mRequest->reqMindepth_case())         sel->minDepth(mRequest->mindepth());
+    if(mRequest->reqMaxdepth_case())         sel->maxDepth(mRequest->maxdepth());
+    if(mRequest->reqPackagename_case())      sel->pkg(mRequest->packagename());
+    if(mRequest->reqTextpartialmatch_case()) sel->textPartialMatch(mRequest->textpartialmatch());
+    if(mRequest->reqXpath_case())            sel->xpath(mRequest->xpath());
+    if(mRequest->reqOcrtext_case())          sel->ocrText(mRequest->ocrtext());
+    if(mRequest->reqGeometry_case())         sel->geometry(Rect<int>{mRequest->geometry().x(), mRequest->geometry().y(), mRequest->geometry().x() + mRequest->geometry().width(), mRequest->geometry().y() + mRequest->geometry().height()}, false);
+    if(mRequest->reqIsvisible_case())        sel->isVisible(mRequest->isvisible());
+    if(mRequest->reqIsselectable_case())     sel->isSelectable(mRequest->isselectable());
+    if(mRequest->reqIshighlightable_case())  sel->isHighlightable(mRequest->ishighlightable());
+    if(mRequest->reqDescription_case())      sel->description(mRequest->description());
 
 
     return std::vector<std::shared_ptr<UiSelector>>{sel};

diff --git a/protocol/aurum.proto b/protocol/aurum.proto
index ee93d0a0c51b5baa10de09c555fd746d78f16beb..9dc8fb60d55689be431b9f7bd425cd232ade193e 100644 (file)
--- a/protocol/aurum.proto
+++ b/protocol/aurum.proto
@@ -128,106 +128,106 @@ message LaunchData {
 // ------------------------------------ //
 
 message ReqFindElement {
-   oneof _elementid {
+   oneof reqElementid {
       string elementId = 1;
    }
 
-   oneof _automationid {
+   oneof reqAutomationid {
       string automationId = 2;
    }
 
-   oneof _textfield {
+   oneof reqTextfield {
       string textField = 3;
    }
 
-   oneof _widgettype {
+   oneof reqWidgettype {
       string widgetType = 4;
    }
 
-   oneof _widgetstyle {
+   oneof reqWidgetstyle {
       string widgetStyle = 5;
    }
 
-   oneof _ischecked {
+   oneof reqIschecked {
       bool isChecked = 6;
    }
 
-   oneof _ischeckable {
+   oneof reqIscheckable {
       bool isCheckable= 7;
    }
 
-   oneof _isclickable {
+   oneof reqIsclickable {
       bool isClickable = 8;
    }
 
-   oneof _isenabled {
+   oneof reqIsenabled {
       bool isEnabled = 9;
    }
 
-   oneof _isfocused {
+   oneof reqIsfocused {
       bool isFocused = 10;
    }
 
-   oneof _isfocusable {
+   oneof reqIsfocusable {
       bool isFocusable = 11;
    }
 
-   oneof _isscrollable {
+   oneof reqIsscrollable {
       bool isScrollable = 12;
    }
 
-   oneof _isselected {
+   oneof reqIsselected {
       bool isSelected = 13;
    }
 
-   oneof _isshowing {
+   oneof reqIsshowing {
       bool isShowing = 14;
    }
 
-   oneof _isactive {
+   oneof reqIsactive {
       bool isActive = 15;
    }
 
-   oneof _mindepth {
+   oneof reqMindepth {
       int32 minDepth = 16;
    }
 
-   oneof _maxdepth {
+   oneof reqMaxdepth {
       int32 maxDepth = 17;
    }
 
-   oneof _packagename {
+   oneof reqPackagename {
       string packageName = 18;
    }
 
-   oneof _textpartialmatch {
+   oneof reqTextpartialmatch {
       string textPartialMatch = 19;
    }
 
-   oneof _xpath {
+   oneof reqXpath {
       string xpath = 20;
    }
 
-   oneof _ocrtext {
+   oneof reqOcrtext {
       string ocrText = 21;
    }
 
-   oneof _geometry {
+   oneof reqGeometry {
      Rect geometry = 22;
    }
-   oneof _isvisible {
+   oneof reqIsvisible {
       bool isVisible = 23;
    }
 
-   oneof _isselectable {
+   oneof reqIsselectable {
       bool isSelectable = 24;
    }
 
-   oneof _ishighlightable {
+   oneof reqIshighlightable {
       bool isHighlightable = 25;
    }
 
-   oneof _description {
+   oneof reqDescription {
       string description = 26;
    }
 
@@ -240,107 +240,106 @@ message RspFindElement {
 }
 
 message ReqFindElements {
-   oneof _elementid {
+   oneof reqElementid {
       string elementId = 1;
    }
 
-   oneof _automationid {
+   oneof reqAutomationid {
       string automationId = 2;
    }
 
-   oneof _textfield {
+   oneof reqTextfield {
       string textField = 3;
    }
 
-   oneof _widgettype {
+   oneof reqWidgettype {
       string widgetType = 4;
    }
 
-   oneof _widgetstyle {
+   oneof reqWidgetstyle {
       string widgetStyle = 5;
    }
 
-   oneof _ischecked {
+   oneof reqIschecked {
       bool isChecked = 6;
    }
 
-   oneof _ischeckable {
+   oneof reqIscheckable {
       bool isCheckable= 7;
    }
 
-   oneof _isclickable {
+   oneof reqIsclickable {
       bool isClickable = 8;
    }
 
-   oneof _isenabled {
+   oneof reqIsenabled {
       bool isEnabled = 9;
    }
 
-   oneof _isfocused {
+   oneof reqIsfocused {
       bool isFocused = 10;
    }
 
-   oneof _isfocusable {
+   oneof reqIsfocusable {
       bool isFocusable = 11;
    }
 
-   oneof _isscrollable {
+   oneof reqIsscrollable {
       bool isScrollable = 12;
    }
 
-   oneof _isselected {
+   oneof reqIsselected {
       bool isSelected = 13;
    }
 
-   oneof _isshowing {
+   oneof reqIsshowing {
       bool isShowing = 14;
    }
 
-   oneof _isactive {
+   oneof reqIsactive {
       bool isActive = 15;
    }
 
-   oneof _mindepth {
+   oneof reqMindepth {
       int32 minDepth = 16;
    }
 
-   oneof _maxdepth {
+   oneof reqMaxdepth {
       int32 maxDepth = 17;
    }
 
-   oneof _packagename {
+   oneof reqPackagename {
       string packageName = 18;
    }
 
-   oneof _textpartialmatch {
+   oneof reqTextpartialmatch {
       string textPartialMatch = 19;
    }
 
-   oneof _xpath {
+   oneof reqXpath {
       string xpath = 20;
    }
 
-   oneof _ocrtext {
+   oneof reqOcrtext {
       string ocrText = 21;
    }
 
-   oneof _geometry {
-      Rect geometry = 22;
+   oneof reqGeometry {
+     Rect geometry = 22;
    }
-
-   oneof _isvisible {
+   oneof reqIsvisible {
       bool isVisible = 23;
    }
 
-   oneof _isselectable {
+   oneof reqIsselectable {
       bool isSelectable = 24;
    }
 
-   oneof _ishighlightable {
+   oneof reqIshighlightable {
       bool isHighlightable = 25;
    }
 
-   oneof _description {
+   oneof reqDescription {
       string description = 26;
    }