Minor refactor

Removing wrappers for Observer template.
Fix missing debugs, and Null checks in SelectActivity.

Change-Id: If7b4d843e63b4bebed9696be2660228178430365

diff --git a/src/ActivityChangeRequestObserver.hpp b/src/ActivityChangeRequestObserver.hpp
deleted file mode 100644 (file)
index d55fc5c..0000000
--- a/src/ActivityChangeRequestObserver.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef ACTIVITY_CHANGE_REQUEST_OBSERVER_HPP
-#define ACTIVITY_CHANGE_REQUEST_OBSERVER_HPP
-
-#include "Observer.hpp"
-#include "ActivityChangeRequest.hpp"
-
-class ActivityChangeRequestObserver : public Observer<ActivityChangeRequest>
-{
-
-};
-
-#endif

diff --git a/src/DBusInterface.cpp b/src/DBusInterface.cpp
index 585e966..733c1d8 100644 (file)
--- a/src/DBusInterface.cpp
+++ b/src/DBusInterface.cpp
@@ -6,7 +6,7 @@
 #include "localization.hpp"
 #include "eldbus.hpp"
 #include "CompositeSwitchProvider.hpp"
-#include "SwitchObserver.hpp"
+#include "Switch.hpp"
 #include "ConditionAll.hpp"
 #include "Window.hpp"
 
@@ -235,7 +235,7 @@ public:
                return reply;
        }
 
-       class DBusSwitchObserver : public SwitchObserver, public std::enable_shared_from_this<DBusSwitchObserver>
+       class DBusSwitchObserver : public Observer<Switch>, public std::enable_shared_from_this<DBusSwitchObserver>
        {
        public:
                DBusSwitchObserver(Eldbus_Message *reply, Eldbus_Connection *connection)

diff --git a/src/SelectActivity.cpp b/src/SelectActivity.cpp
index ea5c77c..b9860c6 100644 (file)
--- a/src/SelectActivity.cpp
+++ b/src/SelectActivity.cpp
@@ -91,6 +91,7 @@ SelectActivity::~SelectActivity()
 
 bool SelectActivity::process()
 {
+       DEBUG("Select - process called");
        if (completed)
                return true;
 
@@ -110,6 +111,7 @@ bool SelectActivity::process()
 
 void SelectActivity::update(const std::shared_ptr<UIElement> &elem)
 {
+       DEBUG("Select - updated with new element");
        if (realUiElement) {
                elem->activate(); /*elem is popup menu item*/
                return;
@@ -336,14 +338,16 @@ Optional<telephony_call_state_e>  SelectActivity::getPhoneCallState()
 bool SelectActivity::isRealUIElementSlider() //TODO: Use Atspi wrapper functions when available
 {
        if (!realUiElementIsSlider)
-               realUiElementIsSlider = atspi_accessible_get_role(realUiElement->getObject().get(), nullptr) == ATSPI_ROLE_SLIDER;
+               realUiElementIsSlider = realUiElement->getObject() &&
+                                                               atspi_accessible_get_role(realUiElement->getObject().get(), nullptr) == ATSPI_ROLE_SLIDER;
        return *realUiElementIsSlider;
 }
 
 bool SelectActivity::hasRealUIElementEditableTextIface() //TODO: Use Atspi wrapper functions when available
 {
        if (!realUiElementHasEditableText) {
-               auto editableTextIface = std::unique_ptr<AtspiEditableText, void(*)(gpointer)> (atspi_accessible_get_editable_text_iface(realUiElement->getObject().get()), g_object_unref);
+               auto editableTextIface = realUiElement->getObject() &&
+                                                                std::unique_ptr<AtspiEditableText, void(*)(gpointer)> (atspi_accessible_get_editable_text_iface(realUiElement->getObject().get()), g_object_unref);
                realUiElementHasEditableText = editableTextIface ? true : false;
        }
 

diff --git a/src/SwitchConfigurationItemObserver.hpp b/src/SwitchConfigurationItemObserver.hpp
deleted file mode 100644 (file)
index b3410d6..0000000
--- a/src/SwitchConfigurationItemObserver.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef SWITCH_CONFIGURATION_ITEM_OBSERVER_HPP
-#define SWITCH_CONFIGURATION_ITEM_OBSERVER_HPP
-
-#include "Observer.hpp"
-#include "SwitchConfigurationItem.hpp"
-
-class SwitchConfigurationItemObserver : public Observer<SwitchConfigurationItem>
-{
-
-};
-
-#endif // SWITCH_CONFIGURATION_ITEM_OBSERVER_HPP

diff --git a/src/SwitchManager.hpp b/src/SwitchManager.hpp
index f3ad3ef..1369d7e 100644 (file)
--- a/src/SwitchManager.hpp
+++ b/src/SwitchManager.hpp
@@ -1,19 +1,19 @@
 #ifndef SWITCH_MANAGER_HPP
 #define SWITCH_MANAGER_HPP
 
-#include "SwitchConfigurationItemObserver.hpp"
-#include "SwitchObserver.hpp"
+#include "SwitchConfigurationItem.hpp"
 #include "SwitchProvider.hpp"
 #include "Configuration.hpp"
 #include "Condition.hpp"
 #include "ActivityFactory.hpp"
 #include "Activity.hpp"
-#include "ActivityChangeRequestObserver.hpp"
+#include "ActivityChangeRequest.hpp"
 
 #include <memory>
 #include <stack>
 
-class SwitchManager : public SwitchConfigurationItemObserver, public SwitchObserver, public std::enable_shared_from_this<SwitchManager>, public ActivityChangeRequestObserver, public Observer<SwitchProvider>
+class SwitchManager : public std::enable_shared_from_this<SwitchManager>,
+       public Observer<SwitchConfigurationItem>, public Observer<Switch>, public Observer<ActivityChangeRequest>, public Observer<SwitchProvider>
 {
 public:
        void update(const std::shared_ptr<SwitchConfigurationItem> &item) override;

diff --git a/src/SwitchObserver.hpp b/src/SwitchObserver.hpp
deleted file mode 100644 (file)
index 744b134..0000000
--- a/src/SwitchObserver.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef SWITCH_OBSERVER_HPP
-#define SWITCH_OBSERVER_HPP
-
-#include "Observer.hpp"
-#include "Switch.hpp"
-
-class SwitchObserver : public Observer<Switch>
-{
-
-};
-
-#endif

diff --git a/src/UIActivity.hpp b/src/UIActivity.hpp
index a0c91a5..c0fe788 100644 (file)
--- a/src/UIActivity.hpp
+++ b/src/UIActivity.hpp
@@ -2,12 +2,11 @@
 #define UI_ACTIVITY_HPP
 
 #include "Activity.hpp"
-#include "UIElementObserver.hpp"
 #include "UIElement.hpp"
 
 #include <memory>
 
-class UIActivity : public Activity, public UIElementObserver, public std::enable_shared_from_this<UIActivity>
+class UIActivity : public Activity, public Observer<UIElement>, public std::enable_shared_from_this<UIActivity>
 {
 public:
        UIActivity(const std::string &type);

diff --git a/src/UIElementObserver.hpp b/src/UIElementObserver.hpp
deleted file mode 100644 (file)
index 06f75b2..0000000
--- a/src/UIElementObserver.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef UIELEMENT_OBSERVER_HPP
-#define UIELEMENT_OBSERVER_HPP
-
-#include "Observer.hpp"
-#include "UIElement.hpp"
-
-class UIElementObserver : public Observer<UIElement>
-{
-public:
-       virtual ~UIElementObserver() = default;
-};
-
-#endif