[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - removed unused ICatalogAware and IWorkflowAware methods

[Yvo Schubbe]

Log message for revision 102743:
  - removed unused ICatalogAware and IWorkflowAware methods

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-08-13 20:17:07 UTC (rev 102742)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-08-13 20:27:25 UTC (rev 102743)
@@ -4,6 +4,8 @@
 2.2.0 (unreleased)
 ------------------
 
+- PortalFolder: Removed unused ICatalogAware and IWorkflowAware methods.
+
 - CMFCatalogAware: Split up CMFCatalogAware mixin.
   CatalogAware, WorkflowAware and OpaqueItemManager are now separate mixins.
 

Modified: Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py	2009-08-13 20:17:07 UTC (rev 102742)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py	2009-08-13 20:27:25 UTC (rev 102743)
@@ -29,7 +29,7 @@
 from zope.component.factory import Factory
 from zope.interface import implements
 
-from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
+from Products.CMFCore.CMFCatalogAware import OpaqueItemManager
 from Products.CMFCore.DynamicType import DynamicType
 from Products.CMFCore.exceptions import AccessControl_Unauthorized
 from Products.CMFCore.exceptions import BadRequest
@@ -48,7 +48,7 @@
 from Products.CMFCore.utils import getToolByName
 
 
-class PortalFolderBase(DynamicType, CMFCatalogAware, Folder):
+class PortalFolderBase(DynamicType, OpaqueItemManager, Folder):
 
     """Base class for portal folder.
     """
@@ -65,7 +65,6 @@
                      + ({'label': 'Components Folder',
                          'action': '++etc++site/manage_main'},)
                      + Folder.manage_options[1:]
-                     + CMFCatalogAware.manage_options
                      )
 
     def __init__(self, id, title='', description=''):
@@ -117,7 +116,9 @@
         """
         self.setTitle( title )
         self.setDescription( description )
-        self.reindexObject()
+        # BBB: for ICatalogAware subclasses
+        if getattr(self, 'reindexObject', None) is not None:
+            self.reindexObject()
 
     security.declarePublic('allowedContentTypes')
     def allowedContentTypes( self ):
@@ -257,21 +258,6 @@
         """
         return None
 
-    # Ensure pure PortalFolders don't get cataloged.
-    # XXX We may want to revisit this.
-
-    def indexObject(self):
-        pass
-
-    def unindexObject(self):
-        pass
-
-    def reindexObject(self, idxs=[]):
-        pass
-
-    def reindexObjectSecurity(self, skip_self=False):
-        pass
-
     def PUT_factory( self, name, typ, body ):
         """ Factory for PUT requests to objects which do not yet exist.