Changeset 1362

Timestamp:

06/12/07 01:00:25 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Added register and unregister methods to application.py for adapters, subscription adapters and handlers. Those methods should replace zope.components' provide* methods.

Also modified services, so they unregister their handlers properly.

Files:

• gaphor/trunk/gaphor/application.py (modified) (5 diffs)
• gaphor/trunk/gaphor/services/actionmanager.py (modified) (2 diffs)
• gaphor/trunk/gaphor/services/copyservice.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/undomanager.py (modified) (3 diffs)
• gaphor/trunk/gaphor/tests/test_application.py (modified) (1 diff)
• gaphor/trunk/gaphor/ui/diagramtoolbox.py (modified) (1 diff)

gaphor/trunk/gaphor/application.py

@@ -18 +18 @@
-
-class _Application(object):
+    """
+    The Gaphor application is started from the Application instance. It behaves
+    as a singleton in many ways.
+
+    The Application is responsible for loading services and plugins. Services
+    are registered as "utilities" in a global registry.
+
+    Methods are provided that wrap zope.component's handle, adapter and
+    subscription registrations. In addition to registration methods also
+    unregister methods are provided. This way services can be properly
+    unregistered on shutdown for example.
+    """
-
-    # interface.implements(IApplication)
@@ -23 +35 @@
-    def __init__(self):
-        self._uninitialized_services = {}
+        self.globalSiteManager = component.getGlobalSiteManager()
-
-    def init(self, services=None):
@@ -65 +78 @@
-            log.info('initializing service service.%s' % name)
-            srv.init(self)
-component.provide
-component
+self.globalSiteManager.register
+self
-            return srv
-
@@ -74 +87 @@
-    def get_service(self, name):
-        try:
-component
+self.globalSiteManager
-        except component.ComponentLookupError:
-            return self.init_service(name)
@@ -83 +96 @@
-
-    def shutdown(self):
-component
+self.globalSiteManager
-            srv.shutdown()
-
+
+
-
-        # Re-initialize Zope's global site manager
-        # (cleanup adapters and utilities):
-        try:
-
-
+
-        except Exception, e:
-            log.error('Re-initialization of the Zope SiteManager failed', e)
-        self.__init__()
+
+    # Wrap zope.component's SiteManager methods
+
+    def registerAdapter(self, factory, adapts=None, provides=None, name=''):
+        """
+        Register an adapter (factory) that adapts objects to a specific
+        interface. A name can be used to distinguish between different adapters
+        that adapt to the same interfaces.
+        """
+        self.globalSiteManager.registerAdapter(factory, adapts, provides,
+                              name, event=False)
+
+    def unregisterAdapter(self, factory=None,
+                          required=None, provided=None, name=u''):
+        """
+        Unregister a previously registered adapter.
+        """
+        self.globalSiteManager.unregisterAdapter(factory,
+                              required, provided, name)
+
+    def registerSubscriptionAdapter(self, factory, adapts=None, provides=None):
+        """
+        Register a subscription adapter. See registerAdapter().
+        """
+        self.globalSiteManager.registerSubscriptionAdapter(factory, adapts,
+                              provides, event=False)
+
+    def unregisterSubscriptionAdapter(self, factory=None,
+                          required=None, provided=None, name=u''):
+        """
+        Unregister a previously registered subscription adapter.
+        """
+        self.globalSiteManager.unregisterSubscriptionAdapter(factory,
+                              required, provided, name)
+
+    def registerHandler(self, factory, adapts=None):
+        """
+        Register a handler. Handlers are triggered (executed) when specific
+        events are emited through the handle() method.
+        """
+        self.globalSiteManager.registerHandler(factory, adapts, event=False)
+
+    def unregisterHandler(self, factory=None, required=None):
+        """
+        Unregister a previously registered handler.
+        """
+        self.globalSiteManager.unregisterHandler(factory, required)
+ 
+    def handle(self, *objects):
+        """
+        Send event notifications to registered handlers.
+        """
+        self.globalSiteManager.handle(*objects)
-
-# Make sure there is only one!

gaphor/trunk/gaphor/services/actionmanager.py

@@ -20 +20 @@
-
-    def init(self, app):
+        self._app = app
-        self.ui_manager = gtk.UIManager()
-        log.info('Loading not yet registered action provider services')
@@ -27 +28 @@
-                self.register_action_provider(service)
-
-component.provide
+app.register
-
-    def shutdown(self):
-pass
+self._app.unregisterHandler(self._service_initialized_handler)
-
-    def execute(self, action_id, active=None):

gaphor/trunk/gaphor/services/copyservice.py

@@ -50 +50 @@
-
-    def init(self, app):
+        self._app = app
-        self.action_group.get_action('edit-copy').props.sensitive = False
-        self.action_group.get_action('edit-paste').props.sensitive = False
-        
-component.provide
+app.register
-
-    def shutdown(self):
-        self.copy_buffer = set()
+        self._app.unregisterHandler(self._update)
-
-    @component.adapter(IDiagramSelectionChange)

gaphor/trunk/gaphor/services/undomanager.py

@@ -108 +108 @@
-        self._current_transaction = None
-        self._transaction_depth = 0
+        self.action_group = build_action_group(self)
-
-    def init(self, app):
-        self._app = app
-
-
-
-
-
-
+
+
+
+
+
-        self._action_executed(None)
-
-    def shutdown(self):
-
+
+
+
+
+
-
-    def clear_undo_stack(self):
@@ -254 +258 @@
-    ##
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        #
@@ -267 +274 @@
-        state.observers.add(state.revert_handler)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    @component.adapter(IElementCreateEvent)

gaphor/trunk/gaphor/tests/test_application.py

@@ -22 +22 @@
-        Application.load_services()
-        assert Application.get_service('undo_manager')
-plugin
+file
-
-        # After that, services are also available as Utilities:
-        assert component.queryUtility(IService, 'undo_manager')
-plugin
+file
-
-

gaphor/trunk/gaphor/ui/diagramtoolbox.py

@@ -95 +95 @@
-        """
-        tool = list(itemiter(TOOLBOX_ACTIONS))[id][0]
-        log.info('Selected item %d: %s' % (id, tool))
-        getattr(self, tool.replace('-', '_'))()
-