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

[Sidnei da Silva]

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

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	configure.zcml content.py 
Log Message:
Fixed (hopefully) all missing imports

=== Zope3/src/zope/app/browser/utilities/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/utilities/configure.zcml:1.1.2.1	Fri Aug 15 10:04:41 2003
+++ Zope3/src/zope/app/browser/utilities/configure.zcml	Fri Aug 15 13:11:33 2003
@@ -10,7 +10,7 @@
 
   <view
       name="+"
-      for="zope.app.interfaces.utilities.IMutableSchema"
+      for="zope.app.interfaces.utilities.schema.IMutableSchema"
       class=".schema.SchemaAdding"
       permission="zope.ManageContent"
       allowed_attributes="addingInfo"
@@ -19,16 +19,16 @@
     <page name="index.html"  template="add.pt" />
     <page name="action.html" attribute="action" />
 
-  </browser:view>
+  </view>
 
   <addform
       label="New Mutable Schema Registration"
-      for="zope.app.interfaces.utilities.ISchemaUtility"
+      for="zope.app.interfaces.utilities.schema.ISchemaUtility"
       name="addRegistration.html"
       schema="zope.app.interfaces.services.utility.IUtilityRegistration"
       class="zope.app.browser.services.utility.AddRegistration"
       permission="zope.ManageServices"
-      content_factory=".schema.SchemaRegistration"
+      content_factory="zope.app.utilities.schema.SchemaRegistration"
       arguments="name interface componentPath"
       set_after_add="status"
       fields="name interface componentPath permission status" />
@@ -56,15 +56,15 @@
 
 
   <defaultView
-      for="zope.app.interfaces.utilities.IMutableSchema"
+      for="zope.app.interfaces.utilities.schema.IMutableSchema"
       name="editschema.html" />
 
   <page
       name="editschema.html"
       menu="zmi_views" title="Edit Schema"
-      for="zope.app.interfaces.utilities.IMutableSchema"
+      for="zope.app.interfaces.utilities.schema.IMutableSchema"
       permission="zope.ManageServices"
-      class="zope.app.utilities.schema.EditSchema"
+      class="zope.app.browser.utilities.schema.EditSchema"
       attribute="edit"
    />
 
@@ -72,26 +72,26 @@
 
   <page
       class="zope.app.browser.component.interfacewidget.InterfaceWidget"
-      for="zope.app.interfaces.utilities.IMutableSchemaField"
+      for="zope.app.interfaces.utilities.schema.IMutableSchemaField"
       name="edit"
       permission="zope.Public" />
 
   <page
       class="zope.app.browser.component.interfacewidget.InterfaceDisplayWidget"
-      for="zope.app.interfaces.utilities.IMutableSchemaField"
+      for="zope.app.interfaces.utilities.schema.IMutableSchemaField"
       name="display"
       permission="zope.Public" />
 
   <page
       class="zope.app.browser.component.interfacewidget.MultiInterfaceWidget"
-      for="zope.app.interfaces.utilities.IMutableSchemasField"
+      for="zope.app.interfaces.utilities.schema.IMutableSchemasField"
       name="edit"
       permission="zope.Public" />
 
   <page
       class="
       zope.app.browser.component.interfacewidget.MultiInterfaceDisplayWidget"
-      for="zope.app.interfaces.utilities.IMutableSchemasField"
+      for="zope.app.interfaces.utilities.schema.IMutableSchemasField"
       name="display"
       permission="zope.Public" />
 
@@ -106,7 +106,7 @@
 
   <page
       name="_traverse"
-      for="zope.app.interfaces.utilities.IMutableSchema"
+      for="zope.app.interfaces.utilities.schema.IMutableSchema"
       class=".traversal.SchemaFieldTraverser"
       permission="zope.Public" />
 
@@ -120,7 +120,8 @@
       schema="zope.app.interfaces.services.utility.IUtilityRegistration"
       class="zope.app.browser.services.utility.AddRegistration"
       permission="zope.ManageServices"
-      content_factory="zope.app.utilities.content.ContentComponentRegistration"
+      content_factory="
+            zope.app.utilities.content.ContentComponentDefinitionRegistration"
       arguments="name interface componentPath"
       set_after_add="status"
       fields="name interface componentPath permission status" />
@@ -147,8 +148,8 @@
       />
 
   <editform
-      for=".definition.IContentComponent"
-      schema=".definition.IContentComponent"
+      for="zope.app.interfaces.utilities.content.IContentComponentDefinition"
+      schema="zope.app.interfaces.utilities.content.IContentComponentDefinition"
       name="edit.html"
       fields="schema"
       menu="zmi_views" title="Edit"
@@ -182,7 +183,7 @@
       menu="zmi_views" title="Edit"
       for="zope.app.interfaces.utilities.content.IContentComponentInstance"
       permission="zope.ManageContent"
-      class=".content.EditContentComponentView"
+      class=".content.EditContentComponentInstanceView"
       attribute="generated_form" />
 
   <!-- Directives to test the Content Component Instance -->
@@ -195,5 +196,10 @@
       arguments="__name__ __schema__"
       fields="__name__ __schema__" 
       menu="add_content" title="Schema-based Content"/>
+
+  <zope:adapter
+      factory=".traversal.SchemaFieldTraversable"
+      provides="zope.app.interfaces.traversing.ITraversable"
+      for="zope.app.interfaces.utilities.schema.IMutableSchema" />
 
 </configure>


=== Zope3/src/zope/app/browser/utilities/content.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/utilities/content.py:1.1.2.1	Fri Aug 15 10:04:41 2003
+++ Zope3/src/zope/app/browser/utilities/content.py	Fri Aug 15 13:11:33 2003
@@ -15,6 +15,8 @@
 
 $Id$
 """
+from zope.interface import implements
+
 from zope.app import zapi
 from zope.app.browser.form.add import AddView
 from zope.app.browser.form.editview import EditView
@@ -22,7 +24,7 @@
 from zope.app.form.utility import setUpWidget
 from zope.app.security.permission import PermissionField
 from zope.app.services.servicenames import Utilities
-from zope.app.utilities.definition import IContentComponent
+from zope.app.interfaces.utilities.content import IContentComponentDefinition
 from zope.component.exceptions import ComponentLookupError
 from zope.publisher.interfaces import IPublishTraverse
 
@@ -103,7 +105,7 @@
             self.context.contentName = content_name
 
         utilities = zapi.getService(self.context, Utilities)
-        matching = utilities.getRegisteredMatching(IContentComponent,
+        matching = utilities.getRegisteredMatching(IContentComponentDefinition,
                                                    type_name)
         if not (matching and matching[0][2].active()):
             raise ComponentLookupError, \
@@ -134,7 +136,7 @@
         if errors:
             raise WidgetsError(*errors)
 
-        return content        
+        return content
 
 
 class EditContentComponentInstanceView(EditView):
@@ -142,6 +144,6 @@
     def __init__(self, context, request):
         self.schema = context.getSchema()
         self.label = 'Edit %s' %context.__name__
-        super(EditContentComponentView, self).__init__(context, request)
+        super(EditContentComponentInstanceView, self).__init__(context, request)