libaurum: Add ISearchable interface for common methods

Implement the ISearchable abstract class in UiObject and UiDevice
to improve code readability and maintainability by separating interface from implementation.

Change-Id: I2ef4d467024f0971622b7f97bba1a6daee30b15a

diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h
index d48fdcf032549ae781c7836bc31d80b3c8752e11..aff1e56d5bc0f43234738e115a773345e5a06cc6 100644 (file)
--- a/libaurum/inc/Interface/ISearchable.h
+++ b/libaurum/inc/Interface/ISearchable.h
@@ -79,6 +79,38 @@ public:
      */
     virtual std::vector<std::shared_ptr<UiObject>> findObjects(
         const std::shared_ptr<UiSelector> selector) const = 0;
+
+    /**
+     * @brief Get the Matches object that satisfied with the selector condition in the object tree.
+     *        This method is similar to findObjects, but getMatches is more faster than findObjects.
+     *        A single dbus method call occurs internally and retrieves a list of objects
+     *        that satisfy the selector specified in uifw.
+     *
+     * @param[in] selector @UiSelector
+     * @param[in] earlyReturn boolean Returns immediately when a matched object is found
+     *
+     * @return the list of found UiObject pointer vector
+     *
+     * @since_tizen 8.0
+     */
+    virtual std::vector<std::shared_ptr<UiObject>> getMatches(
+        const std::shared_ptr<UiSelector> selector, const bool earlyReturn) const = 0;
+
+    /**
+     * @brief Get the object that satisfied with both condition in the object tree.
+     *        Additional object detection is performed using the second selector for the object
+     *        found in the first selector.
+     *
+     * @param[in] firstSelector @UiSelector
+     * @param[in] secondSelector @UiSelector
+     * @param[in] earlyReturn boolean Returns immediately when a matched object is found
+     *
+     * @return the list of found UiObject pointer vector
+     *
+     * @since_tizen 8.0
+     */
+    virtual std::vector<std::shared_ptr<UiObject>> getMatchesInMatches(
+        const std::shared_ptr<UiSelector> firstSelector, const std::shared_ptr<UiSelector> secondSelector, const bool earlyReturn) const = 0;
 };
 
 }

diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h
index 75a9b4c7358059f96b388264bcf6bce7b495ad53..d952f3d1d827fb11398083a708a8177d8f19f4ce 100644 (file)
--- a/libaurum/inc/UiDevice.h
+++ b/libaurum/inc/UiDevice.h
@@ -314,32 +314,16 @@ public:
         const std::shared_ptr<UiSelector> selector) const override;
 
     /**
-     * @brief Get the Matches object that satisfied with the selector condition in the object tree.
-     *        This method is similar to findObjects, but getMatches is more faster than findObjects.
-     *
-     * @param[in] selector @UiSelector
-     * @param[in] earlyReturn boolean
-     *
-     * @return the list of found UiObject pointer vector
-     *
-     * @since_tizen 8.0
+     * @copydoc ISearchable::getMatches()
      */
     std::vector<std::shared_ptr<UiObject>> getMatches(
-        const std::shared_ptr<UiSelector> selector, const bool earlyReturn) const;
+        const std::shared_ptr<UiSelector> selector, const bool earlyReturn) const override;
 
     /**
-     * @brief Get the object that satisfied with both condition in the object tree.
-     *
-     * @param[in] firstSelector @UiSelector
-     * @param[in] secondSelector @UiSelector
-     * @param[in] earlyReturn boolean
-     *
-     * @return the list of found UiObject pointer vector
-     *
-     * @since_tizen 8.0
+     * @copydoc ISearchable::getMatchesInMatches()
      */
     std::vector<std::shared_ptr<UiObject>> getMatchesInMatches(
-        const std::shared_ptr<UiSelector> firstSelector, const std::shared_ptr<UiSelector> secondSelector, const bool earlyReturn) const;
+        const std::shared_ptr<UiSelector> firstSelector, const std::shared_ptr<UiSelector> secondSelector, const bool earlyReturn) const override;
 
     /**
      * TODO

diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h
index 4b586023275aaef3b4f1d70b316f74af2d57ba8e..5ec7aa4b76de0fe25be193b0a98fb406a6b9fbc4 100644 (file)
--- a/libaurum/inc/UiObject.h
+++ b/libaurum/inc/UiObject.h
@@ -23,6 +23,7 @@
 #include "Accessible.h"
 #include "ISearchable.h"
 #include "IObject.h"
+
 #include "UiSelector.h"
 #include "Waiter.h"
 
@@ -139,32 +140,16 @@ public:
         const std::shared_ptr<UiSelector> selector) const override;
 
     /**
-     * @brief Get the Matches object that satisfied with the selector condition in the object tree.
-     *        This method is similar to findObjects, but getMatches is more faster than findObjects.
-     *
-     * @param[in] selector @UiSelector
-     * @param[in] earlyReturn boolean
-     *
-     * @return the list of found UiObject pointer vector
-     *
-     * @since_tizen 8.0
+     * @copydoc ISearchable::getMatches()
      */
     std::vector<std::shared_ptr<UiObject>> getMatches(
-        const std::shared_ptr<UiSelector> selector, const bool earlyReturn) const;
+        const std::shared_ptr<UiSelector> selector, const bool earlyReturn) const override;
 
     /**
-     * @brief Get the object that satisfied with both condition in the object tree.
-     *
-     * @param[in] firstSelector @UiSelector
-     * @param[in] secondSelector @UiSelector
-     * @param[in] earlyReturn boolean
-     *
-     * @return the list of found UiObject pointer vector
-     *
-     * @since_tizen 8.0
+     * @copydoc ISearchable::getMatchesInMatches()
      */
     std::vector<std::shared_ptr<UiObject>> getMatchesInMatches(
-        const std::shared_ptr<UiSelector> firstSelector, const std::shared_ptr<UiSelector> secondSelector, const bool earlyReturn) const;
+        const std::shared_ptr<UiSelector> firstSelector, const std::shared_ptr<UiSelector> secondSelector, const bool earlyReturn) const override;
 
     /**
      * TODO