[Tizen][AT-SPI] Add Value::GetValueText()

[platform/core/uifw/dali-adaptor.git] / dali / internal / accessibility / bridge / bridge-value.cpp

diff --git a/dali/internal/accessibility/bridge/bridge-value.cpp b/dali/internal/accessibility/bridge/bridge-value.cpp
index ee2fc50..37e752b 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-value.cpp
+++ b/dali/internal/accessibility/bridge/bridge-value.cpp
@@ -18,9 +18,6 @@
 // CLASS HEADER
 #include <dali/internal/accessibility/bridge/bridge-value.h>
 
-// EXTERNAL INCLUDES
-#include <iostream>
-
 using namespace Dali::Accessibility;
 
 BridgeValue::BridgeValue()
@@ -29,39 +26,45 @@ BridgeValue::BridgeValue()
 
 void BridgeValue::RegisterInterfaces()
 {
-  DBus::DBusInterfaceDescription desc{AtspiDbusInterfaceValue};
+  DBus::DBusInterfaceDescription desc{Accessible::GetInterfaceName(AtspiInterface::VALUE)};
   AddGetSetPropertyToInterface(desc, "CurrentValue", &BridgeValue::GetCurrentValue, &BridgeValue::SetCurrentValue);
+  AddGetPropertyToInterface(desc, "Text", &BridgeValue::GetCurrentValueText);
   AddGetPropertyToInterface(desc, "MaximumValue", &BridgeValue::GetMaximumValue);
   AddGetPropertyToInterface(desc, "MinimumIncrement", &BridgeValue::GetMinimumIncrement);
   AddGetPropertyToInterface(desc, "MinimumValue", &BridgeValue::GetMinimumValue);
-  dbusServer.addInterface("/", desc, true);
+  mDbusServer.addInterface("/", desc, true);
 }
 
 Value* BridgeValue::FindSelf() const
 {
-  auto s = BridgeBase::FindSelf();
-  assert(s);
-  auto s2 = dynamic_cast<Value*>(s);
-  if(!s2)
-    throw std::domain_error{"object " + s->GetAddress().ToString() + " doesn't have Value interface"};
-  return s2;
+  return FindCurrentObjectWithInterface<Dali::Accessibility::AtspiInterface::VALUE>();
 }
+
 double BridgeValue::GetCurrentValue()
 {
   return FindSelf()->GetCurrent();
 }
-void BridgeValue::SetCurrentValue(double new_value)
+
+void BridgeValue::SetCurrentValue(double newValue)
 {
-  FindSelf()->SetCurrent(new_value);
+  FindSelf()->SetCurrent(newValue);
 }
+
+std::string BridgeValue::GetCurrentValueText()
+{
+  return FindSelf()->GetValueText();
+}
+
 double BridgeValue::GetMaximumValue()
 {
   return FindSelf()->GetMaximum();
 }
+
 double BridgeValue::GetMinimumIncrement()
 {
   return FindSelf()->GetMinimumIncrement();
 }
+
 double BridgeValue::GetMinimumValue()
 {
   return FindSelf()->GetMinimum();