[Zope3-checkins] CVS: Zope3/src/zope/app/browser/container - contents.py:1.19

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/container
In directory cvs.zope.org:/tmp/cvs-serv29737/src/zope/app/browser/container

Modified Files:
	contents.py 
Log Message:
Renamed the getAnnotation and hasAnnotation methods of principal
annotation services to getAnnotations and hasAnnotations.


=== Zope3/src/zope/app/browser/container/contents.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/browser/container/contents.py:1.18	Tue May 27 05:47:18 2003
+++ Zope3/src/zope/app/browser/container/contents.py	Thu May 29 14:15:55 2003
@@ -87,7 +87,7 @@
 
         user = self.request.user
         annotationsvc = getService(self.context, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
         clipboard.clearContents()
         items = []
@@ -103,7 +103,7 @@
 
         user = self.request.user
         annotationsvc = getService(self.context, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
         clipboard.clearContents()
         items = []
@@ -120,7 +120,7 @@
 
         user = self.request.user
         annotationsvc = getService(self.context, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
         items = clipboard.getContents()
         for item in items:
@@ -143,7 +143,8 @@
         user = self.request.user
 
         annotationsvc = getService(self.context, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
+        
         clipboard = getAdapter(annotations, IPrincipalClipboard)
 
         if clipboard.getContents():