[Zope3-checkins] CVS: Zope3/src/zope/app/utilities - configure.zcml:1.3.6.1 content.py:1.4.6.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/utilities
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/utilities

Modified Files:
      Tag: parentgeddon-branch
	configure.zcml content.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/utilities/configure.zcml 1.3 => 1.3.6.1 ===
--- Zope3/src/zope/app/utilities/configure.zcml:1.3	Mon Aug 18 14:55:37 2003
+++ Zope3/src/zope/app/utilities/configure.zcml	Fri Sep 12 15:15:38 2003
@@ -31,7 +31,7 @@
       permission="zope.ManageServices"
       interface="zope.app.interfaces.services.utility.IUtilityRegistration
                  zope.app.interfaces.container.IAddNotifiable
-                 zope.app.interfaces.container.IDeleteNotifiable"
+                 zope.app.interfaces.container.IRemoveNotifiable"
       set_schema="zope.app.interfaces.services.utility.IUtilityRegistration" />
   </content>
 
@@ -66,7 +66,7 @@
       permission="zope.ManageServices"
       interface="zope.app.interfaces.services.utility.IUtilityRegistration
                  zope.app.interfaces.container.IAddNotifiable
-                 zope.app.interfaces.container.IDeleteNotifiable"
+                 zope.app.interfaces.container.IRemoveNotifiable"
       set_schema="zope.app.interfaces.services.utility.IUtilityRegistration"
       />
   </content>


=== Zope3/src/zope/app/utilities/content.py 1.4.6.1 => 1.4.6.2 ===
--- Zope3/src/zope/app/utilities/content.py:1.4.6.1	Mon Sep  8 14:21:52 2003
+++ Zope3/src/zope/app/utilities/content.py	Fri Sep 12 15:15:38 2003
@@ -96,11 +96,11 @@
         sm = zapi.getServiceManager(self.context)
         # Get the default package and add a menu service called 'Menus-1'
         default = zapi.traverse(sm, 'default')
-        default.setObject('Menus-1', LocalBrowserMenuService())
+        default['Menus-1'] = LocalBrowserMenuService()
         # Register the service and set it to active
         path = "%s/default/%s" % (zapi.getPath(sm), 'Menus-1')
         reg = ServiceRegistration(BrowserMenu, path, sm)
-        key = default.getRegistrationManager().setObject("", reg)
+        key = default.getRegistrationManager().addRegistration(reg)
         reg = zapi.traverse(default.getRegistrationManager(), key)
         reg.status = ActiveStatus
         return zapi.traverse(default, 'Menus-1')    
@@ -112,11 +112,11 @@
         menu = LocalBrowserMenu()
         sm = zapi.getServiceManager(self.context)
         default = zapi.traverse(sm, 'default')
-        default.setObject(self.menuId, menu)
+        default[self.menuId] = menu
         # Register th emenu as a utility and activate it.
         path = "%s/default/%s" % (zapi.getPath(sm), self.menuId)
         reg = UtilityRegistration(self.menuId, ILocalBrowserMenu, path)
-        key = default.getRegistrationManager().setObject("", reg)
+        key = default.getRegistrationManager().addRegistration(reg)
         reg = zapi.traverse(default.getRegistrationManager(), key)
         reg.status = ActiveStatus
         return zapi.traverse(default, self.menuId)    
@@ -166,7 +166,7 @@
         for name in ('interface', 'action', 'title', 'description',
                      'permission', 'filter_string'):
             setattr(item, name, getattr(self, name))
-        self._data['menuItemId'] = menu.setObject('something', item)
+        self._data['menuItemId'] = menu.addItem(item)
 
 
     def removeMenuItem(self):