[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser - FolderContents.py:1.1.4.3.2.1 LoadedFolderContents.py:1.1.4.2.4.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv12181/lib/python/Zope/App/OFS/Content/Folder/Views/Browser

Modified Files:
      Tag: Zope3InWonderland-branch
	FolderContents.py LoadedFolderContents.py 
Log Message:
- Added permission_id attribute to adapter and utility directives.

- Got rid of old getView, getResource, and getDefaultViewName.
  Renamed getRequestView to getView (and so on).

  Changed view interface to use context, rather than getContext.

  Introduced notion of presentation types (e.g. IBrowserPresentation, 
  which is cleaner than IBrowserPublisher).

- Began converting to get/queryFoo, which is much nicer.

- Many formatting fixups.



=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/FolderContents.py 1.1.4.3 => 1.1.4.3.2.1 ===
 
         sm = ServiceManager()
-        if self.getContext().hasServiceManager():
+        if self.context.hasServiceManager():
             raise 'HasServiceManager', (
                   'This folder already contains a service manager')
-        self.getContext().setServiceManager(sm)
+        self.context.setServiceManager(sm)
         if REQUEST is not None:
             return self.index(REQUEST)
 


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/LoadedFolderContents.py 1.1.4.2 => 1.1.4.2.4.1 ===
     def moveObjectsUp(self, ids, REQUEST = None):
         '''See interface IOrderedContainer'''
-        self.getContext().moveObjectsUp(ids)
+        self.context.moveObjectsUp(ids)
 
         if REQUEST is not None:
             # for unit tests
@@ -39,7 +39,7 @@
 
     def moveObjectsDown(self, ids, REQUEST = None):
         '''See interface IOrderedContainer'''
-        self.getContext().moveObjectsDown(ids)
+        self.context.moveObjectsDown(ids)
 
         if REQUEST is not None:
             # for unit tests
@@ -48,7 +48,7 @@
 
     def moveObjectsToTop(self, ids, REQUEST = None):
         '''See interface IOrderedContainer'''
-        self.getContext().moveObjectsToTop(ids)
+        self.context.moveObjectsToTop(ids)
 
         if REQUEST is not None:
             # for unit tests
@@ -57,7 +57,7 @@
 
     def moveObjectsToBottom(self, ids, REQUEST = None):
         '''See interface IOrderedContainer'''
-        self.getContext().moveObjectsToBottom(ids)
+        self.context.moveObjectsToBottom(ids)
 
         if REQUEST is not None:
             # for unit tests