[Zope3-checkins] CVS: Zope3/src/zope/app/schemacontent - instance.py:1.2 interfaces.py:1.2

[Stephan Richter]

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

Modified Files:
	instance.py interfaces.py 
Log Message:


Interchanged PerissionField and InterfaceField with Choice and Sequence.




=== Zope3/src/zope/app/schemacontent/instance.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/schemacontent/instance.py:1.1	Tue Mar  9 19:57:59 2004
+++ Zope3/src/zope/app/schemacontent/instance.py	Sat Apr 24 19:17:58 2004
@@ -17,9 +17,8 @@
 """
 from persistent import Persistent
 from persistent.dict import PersistentDict
-from zope.app.component.interfacefield import InterfaceField
 from zope.interface import directlyProvides, implements, Interface
-from zope.schema import getFields, TextLine
+from zope.schema import getFields, TextLine, Choice
 from zope.security.checker import CheckerPublic, Checker, defineChecker
 
 
@@ -31,9 +30,10 @@
         description=u"""This is the name of the document type.""",
         required=True)
 
-    __schema__ = InterfaceField(
+    __schema__ = Choice(
         title=u"Schema",
         description=u"Specifies the schema that characterizes the document.",
+        vocabulary="Interfaces",
         required=True)
 
 


=== Zope3/src/zope/app/schemacontent/interfaces.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/schemacontent/interfaces.py:1.1	Tue Mar  9 19:57:59 2004
+++ Zope3/src/zope/app/schemacontent/interfaces.py	Sat Apr 24 19:17:58 2004
@@ -16,11 +16,10 @@
 $Id$
 """
 from zope.app.container.interfaces import IAdding
-from zope.app.component.interfacefield import InterfaceField
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.publisher.interfaces.browser import IBrowserMenuItem
 from zope.interface import Interface, Attribute
-from zope.schema import TextLine, Bool
+from zope.schema import TextLine, Bool, Choice
 
 
 class IContentComponentMenuItem(IBrowserMenuItem):
@@ -35,9 +34,10 @@
     will be created locally.
     """
 
-    interface = InterfaceField(
+    interface = Choice(
         title=_('interface-component', "Interface"),
         description=_("Specifies the interface this menu item is for."),
+        vocabulary="Interfaces",
         default=IAdding,
         required=True)
     
@@ -74,9 +74,10 @@
         description=_("This is the name of the document type."),
         required=True)
 
-    schema = InterfaceField(
+    schema = Choice(
         title=_('schema-component', "Schema"),
         description=_("Specifies the schema that characterizes the document."),
+        vocabulary="Interfaces",
         required=True)
 
     copySchema = Bool(
@@ -105,7 +106,8 @@
         description=_("This is the name of the document type."),
         required=True)
 
-    __schema__ = InterfaceField(
+    __schema__ = Choice(
         title=_('schema-component', "Schema"),
         description=_("Specifies the schema that characterizes the document."),
+        vocabulary="Interfaces",
         required=True)