[Zope-Checkins] CVS: CMF/CMFCore - SkinsTool.py:1.20 TypesTool.py:1.47

[Yvo Schubbe]

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

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

=== CMF/CMFCore/SkinsTool.py 1.19 => 1.20 ===
--- CMF/CMFCore/SkinsTool.py:1.19	Sat Nov  9 14:41:17 2002
+++ CMF/CMFCore/SkinsTool.py	Mon Jan  6 15:37:06 2003
@@ -43,6 +43,8 @@
 except ImportError:
     SUPPORTS_PAGE_TEMPLATES=0
 
+from interfaces.portal_skins import portal_skins as ISkinsTool
+
 
 def modifiedOptions():
     # Remove the existing "Properties" option and add our own.
@@ -61,6 +63,8 @@
     This tool is used to supply skins to a portal.
     '''
 
+    __implements__ = (ISkinsTool, ActionProviderBase.__implements__)
+
     id = 'portal_skins'
     meta_type = 'CMF Skins Tool'
     _actions = []
@@ -94,14 +98,6 @@
     request_varname = 'portal_skin'
     allow_any = 0
     selections = None
-
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return a list of actions information instances
-        provided by the tool.
-        """
-        return self._actions
 
     security.declareProtected(ManagePortal, 'manage_propertiesForm')
     manage_propertiesForm = DTMLFile('dtml/skinProps', globals())


=== CMF/CMFCore/TypesTool.py 1.46 => 1.47 ===
--- CMF/CMFCore/TypesTool.py:1.46	Mon Aug  5 17:20:04 2002
+++ CMF/CMFCore/TypesTool.py	Mon Jan  6 15:37:06 2003
@@ -33,12 +33,16 @@
 from CMFCorePermissions import ManagePortal
 from CMFCorePermissions import AccessContentsInformation
 
+from interfaces.portal_types import ContentTypeInformation as ITypeInformation
+from interfaces.portal_types import portal_types as ITypesTool
+
 _marker = []  # Create a new marker.
 
 class TypeInformation (SimpleItemWithProperties):
     """
     Base class for information about a content type.
     """
+
     _isTypeInformation = 1
 
     manage_options = (SimpleItemWithProperties.manage_options[:1] +
@@ -428,6 +432,9 @@
     """
     Portal content factory.
     """
+
+    __implements__ = ITypeInformation
+
     meta_type = 'Factory-based Type Information'
     security = ClassSecurityInfo()
 
@@ -522,6 +529,9 @@
     """
     Invokes a script rather than a factory to create the content.
     """
+
+    __implements__ = ITypeInformation
+
     meta_type = 'Scriptable Type Information'
     security = ClassSecurityInfo()
 
@@ -599,6 +609,9 @@
     """
         Provides a configurable registry of portal content types.
     """
+
+    __implements__ = (ITypesTool, ActionProviderBase.__implements__)
+
     id = 'portal_types'
     meta_type = 'CMF Types Tool'
     _actions = []
@@ -616,14 +629,6 @@
     #
     security.declareProtected(ManagePortal, 'manage_overview')
     manage_overview = DTMLFile( 'explainTypesTool', _dtmldir )
-
-    security.declarePrivate('listActions')
-    def listActions(self, info=None):
-        """
-        Return a list of action information instances
-        for actions provided via tool
-        """
-        return self._actions
 
     def all_meta_types(self):
         """Adds TypesTool-specific meta types."""