[CMF-checkins] CVS: CMF/CMFDefault - MetadataTool.py:1.18 PropertiesTool.py:1.9

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv21496/CMFDefault

Modified Files:
	MetadataTool.py PropertiesTool.py 
Log Message:
Merged yuppie-collector096-branch:
- Cleaned up Interfaces and API Help. (Collector #96)
- Removed deprecated 'register' module and interface.

=== CMF/CMFDefault/MetadataTool.py 1.17 => 1.18 ===
--- CMF/CMFDefault/MetadataTool.py:1.17	Sat Aug  3 22:31:31 2002
+++ CMF/CMFDefault/MetadataTool.py	Mon Jan  6 15:41:55 2003
@@ -10,9 +10,9 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" CMFDefault portal_metadata tool.
 
-"""\
-CMFDefault portal_metadata tool.
+$Id$
 """
 
 from OFS.SimpleItem import SimpleItem
@@ -28,6 +28,10 @@
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from utils import _dtmldir
 
+from Products.CMFCore.interfaces.portal_metadata \
+        import portal_metadata as IMetadataTool
+
+
 class MetadataElementPolicy( SimpleItem ):
     """
         Represent a type-specific policy about a particular DCMI element.
@@ -197,6 +201,8 @@
 
 class MetadataTool( UniqueObject, SimpleItem, ActionProviderBase ):
 
+    __implements__ = (IMetadataTool, ActionProviderBase.__implements__)
+
     id              = 'portal_metadata'
     meta_type       = 'Default Metadata Tool'
 
@@ -254,13 +260,6 @@
 
     security.declareProtected(ManagePortal, 'propertiesForm')
     propertiesForm = DTMLFile( 'metadataProperties', _dtmldir )
-
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return actions provided via tool.
-        """
-        return self._actions
 
     security.declareProtected(ManagePortal, 'editProperties')
     def editProperties( self


=== CMF/CMFDefault/PropertiesTool.py 1.8 => 1.9 ===
--- CMF/CMFDefault/PropertiesTool.py:1.8	Sat Aug  3 22:31:31 2002
+++ CMF/CMFDefault/PropertiesTool.py	Mon Jan  6 15:41:55 2003
@@ -28,8 +28,14 @@
 from Products.CMFCore.CMFCorePermissions import ManagePortal
 from utils import _dtmldir
 
+from Products.CMFCore.interfaces.portal_properties \
+        import portal_properties as IPropertiesTool
+
 
 class PropertiesTool(UniqueObject, SimpleItem, ActionProviderBase):
+
+    __implements__ = (IPropertiesTool, ActionProviderBase.__implements__)
+
     id = 'portal_properties'
     meta_type = 'Default Properties Tool'
     _actions = [ActionInformation(id='configPortal'
@@ -60,13 +66,6 @@
     #
     #   'portal_properties' interface methods
     #
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return actions provided by tool.
-        """
-        return self._actions
-
     security.declareProtected(ManagePortal, 'editProperties')
     def editProperties(self, props):
         '''Change portal settings'''