[CMF-checkins] CVS: CMF/CMFCore - ActionsTool.py:1.35.8.1 CatalogTool.py:1.37.8.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv10638/CMFCore

Modified Files:
      Tag: yuppie-collector096-branch
	ActionsTool.py CatalogTool.py 
Log Message:
ActionProvider interface cleanup:
- Removed listActions() from Contentish and portal_workflow interface.
- Removed redundant or 'None' overriding of listActions().

=== CMF/CMFCore/ActionsTool.py 1.35 => 1.35.8.1 ===
--- CMF/CMFCore/ActionsTool.py:1.35	Fri Aug 30 11:19:13 2002
+++ CMF/CMFCore/ActionsTool.py	Wed Dec 18 16:41:33 2002
@@ -40,6 +40,9 @@
         Weave together the various sources of "actions" which are apropos
         to the current user and context.
     """
+
+    __implements__ = ActionProviderBase.__implements__
+
     id = 'portal_actions'
     _actions = [ActionInformation(id='folderContents'
                                 , title='Folder contents'
@@ -116,16 +119,6 @@
         if REQUEST is not None:
             return self.manage_actionProviders(self , REQUEST
                           , manage_tabs_message='Providers changed.')
-
-    #
-    #   ActionProvider interface
-    #
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return a list of actions available through the tool.
-        """
-        return self._actions
 
     #
     #   Programmatically manipulate the list of action providers


=== CMF/CMFCore/CatalogTool.py 1.37 => 1.37.8.1 ===
--- CMF/CMFCore/CatalogTool.py:1.37	Thu Oct 17 15:38:35 2002
+++ CMF/CMFCore/CatalogTool.py	Wed Dec 18 16:41:33 2002
@@ -71,6 +71,9 @@
 class CatalogTool (UniqueObject, ZCatalog, ActionProviderBase):
     '''This is a ZCatalog that filters catalog queries.
     '''
+
+    __implements__ = ActionProviderBase.__implements__
+
     id = 'portal_catalog'
     meta_type = 'CMF Catalog'
     security = ClassSecurityInfo()
@@ -96,14 +99,6 @@
     #
     #   Subclass extension interface
     #
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return a list of action information instances 
-        provided via tool
-        """
-        return self._actions
-
     security.declarePublic( 'enumerateIndexes' ) # Subclass can call
     def enumerateIndexes( self ):
         #   Return a list of ( index_name, type ) pairs for the initial