Partial re-refactor of the accessibles registration code.

[platform/core/uifw/at-spi2-atk.git] / pyatspi / factory.py

diff --git a/pyatspi/factory.py b/pyatspi/factory.py
index 4227a24..4b02320 100644 (file)
--- a/pyatspi/factory.py
+++ b/pyatspi/factory.py
@@ -15,48 +15,14 @@
 #------------------------------------------------------------------------------
 
 class AccessibleFactory(object):
-       __accessible_interfaces = {}
-
-       def create_accessible(self, cache, app_name, acc_path, parent, interface, dbus_object=None, connection=None):
-               class_ = self.__accessible_interfaces[interface]
-               return class_(cache,
-                             app_name,
-                             acc_path,
-                             parent,
-                             interface,
-                             dbus_object=dbus_object,
-                             connection=connection)
-
-       def add_accessible_class(self, name, cls):
-               self.__accessible_interfaces[name] = cls
-
-_factory = AccessibleFactory()
-
-def create_accessible(cache, app_name, acc_path, parent, interface, dbus_object=None, connection=None):
-       """
-       Used to create different python classes for each of the accessible interfaces.
-
-       The decision on which class to create is based on the name of the
-       accessible interface.
-
-       cache - ApplicationCache, where the cached data for the accessible can be obtained.
-       app_name - D-Bus bus name of the application this accessible belongs to.
-       acc_path - D-Bus object path of the server side accessible object.
-       app_parent - D-Bus bus name of the parent objects application.
-       acc_parent - D-Bus object path of the parent accessible.
-       interface - D-Bus interface of the object. Used to decide which accessible class to instanciate.
-       dbus_object(kwarg) - The D-Bus proxy object used by the accessible for D-Bus method calls.
-       connection(kwarg) - Client side D-Bus connection, provided if no D-Bus proxy is available.
-       """
-       return _factory.create_accessible(cache,
-                                         app_name,
-                                         acc_path,
-                                         parent,
-                                         interface,
-                                         dbus_object=dbus_object,
-                                         connection=connection)
-
-def add_accessible_class(name, cls):
-       _factory.add_accessible_class(name, cls)
+        __accessible_interfaces = {}
+
+        def register_accessible_class(self, name, cls):
+                self.__accessible_interfaces[name] = cls
+
+        def get_accessible_class(self, name):
+                return self.__accessible_interfaces[name]
+
+accessible_factory = AccessibleFactory()
 
 #END----------------------------------------------------------------------------