[Zope3-checkins] CVS: Zope3/src/zope/app/index/interfaces - field.py:1.3 keyword.py:1.3 text.py:1.2

[Stephan Richter]

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

Modified Files:
	field.py keyword.py text.py 
Log Message:


Interchanged PerissionField and InterfaceField with Choice and Sequence.




=== Zope3/src/zope/app/index/interfaces/field.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/index/interfaces/field.py:1.2	Wed Mar 17 12:59:29 2004
+++ Zope3/src/zope/app/index/interfaces/field.py	Sat Apr 24 19:17:57 2004
@@ -16,16 +16,16 @@
 $Id$
 """
 from zope.interface import Interface
-from zope.schema import BytesLine
-from zope.app.component.interfacefield import InterfaceField
+from zope.schema import BytesLine, Choice
 
 
 class IUIFieldCatalogIndex(Interface):
     """Interface for creating a FieldIndex in a catalog from the ZMI."""
 
-    interface = InterfaceField(
+    interface = Choice(
                 title=u"Interface",
                 description=u"Objects will be adapted to this interface",
+                vocabulary="Interfaces",
                 required=False)
 
     field_name = BytesLine(


=== Zope3/src/zope/app/index/interfaces/keyword.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/index/interfaces/keyword.py:1.2	Wed Mar 17 12:59:29 2004
+++ Zope3/src/zope/app/index/interfaces/keyword.py	Sat Apr 24 19:17:57 2004
@@ -17,17 +17,17 @@
 
 $Id$
 """
-
 from zope.interface import Interface
-from zope.schema import BytesLine
-from zope.app.component.interfacefield import InterfaceField
+from zope.schema import BytesLine, Choice
+
 
 class IUIKeywordCatalogIndex(Interface):
     """Interface for creating a KeywordIndex in a catalog from the ZMI."""
 
-    interface = InterfaceField(
+    interface = Choice(
         title=u"Interface",
         description=u"Objects will be adapted to this interface",
+        vocabulary="Interfaces",
         required=False)
 
     field_name = BytesLine(


=== Zope3/src/zope/app/index/interfaces/text.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/index/interfaces/text.py:1.1	Tue Mar  2 09:40:10 2004
+++ Zope3/src/zope/app/index/interfaces/text.py	Sat Apr 24 19:17:57 2004
@@ -16,11 +16,10 @@
 $Id$
 """
 from zope.interface import Interface
-from zope.schema import BytesLine
-from zope.app.component.interfacefield import InterfaceField
-
+from zope.schema import BytesLine, Choice
 from zope.index.interfaces import IStatistics
 
+
 class ISearchableText(Interface):
 
     """Interface that text-indexable objects should implement."""
@@ -38,9 +37,10 @@
 class IUITextCatalogIndex(IStatistics):
     """Interface for creating a TextIndex inside a catalog"""
 
-    interface = InterfaceField(
+    interface = Choice(
                 title=u"Interface", 
                 description=u"Objects will be adapted to this interface",
+                vocabulary="Interfaces",
                 required=False,
                 default=ISearchableText)