[commits] (john) [11200] Remove displayName from kindInfo

Wed, 19 Jul 2006 09:58:33 -0700

Title: [commits] (john) [11200] Remove displayName from kindInfo

Diff

Modified: trunk/chandler/Chandler.py (11199 => 11200)

--- trunk/chandler/Chandler.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/Chandler.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -17,7 +17,6 @@
 Chandler startup
 """
 
-
 import os, PyLucene
 import application.Globals as Globals
 import application.Utility as Utility

Modified: trunk/chandler/application/Utility.py (11199 => 11200)

--- trunk/chandler/application/Utility.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/application/Utility.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -33,7 +33,7 @@
 # with your name (and some helpful text). The comment's really there just to
 # cause Subversion to warn you of a conflict when you update, in case someone 
 # else changes it at the same time you do (that's why it's on the same line).
-SCHEMA_VERSION = "218" #john: move bufferedDraw = True to ToolbarContainer block
+SCHEMA_VERSION = "219" #john: remove use of displayName from kindInfo
 
 logger = None # initialized in initLogging()

Modified: trunk/chandler/application/schema.py (11199 => 11200)

--- trunk/chandler/application/schema.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/application/schema.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -966,12 +966,10 @@
 
     The attributes defined by the keyword arguments will be set on the
     enclosing class' schema Item.  For example, the following class'
-    repository Kind will have a ``displayName`` of ``"Example Item"``, and
-    a ``displayAttribute`` of ``"someAttr"``::
+    repository Kind will have a ``displayAttribute`` of ``"someAttr"``::
 
         class SomeItem(schema.Item):
             schema.kindInfo(
-                displayName = u"Example Item",
                 displayAttribute = "someAttr",
             )

Modified: trunk/chandler/parcels/amazon/AmazonKinds.py (11199 => 11200)

--- trunk/chandler/parcels/amazon/AmazonKinds.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/amazon/AmazonKinds.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -186,8 +186,6 @@
 
 
 class AmazonCollection(ListCollection):
-    schema.kindInfo(displayName = u"Amazon Collection Kind")
-
     keywords = schema.One(schema.Text, displayName = u'Keywords')
 
     myKindID = None
@@ -278,8 +276,6 @@
 
 class AmazonItem(ContentItem):
 
-    schema.kindInfo(displayName = u"Amazon Item")
-
     amazonCollection = schema.One(
         AmazonCollection, displayName = u'Amazon Collection',
     )

Modified: trunk/chandler/parcels/flickr/__init__.py (11199 => 11200)

--- trunk/chandler/parcels/flickr/__init__.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/flickr/__init__.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -42,8 +42,6 @@
     """
     A mixin that adds flickr attributes to a Note item
     """
-    schema.kindInfo(displayName=u"Flickr Photo Mixin")
-
     flickrID = schema.One (schema.Text)
     imageURL = schema.One (schema.URL)
     datePosted = schema.One (schema.DateTime)
@@ -75,7 +73,7 @@
         self.importFromURL(self.imageURL)
 
 class FlickrPhoto(FlickrPhotoMixin, pim.Note):
-    schema.kindInfo(displayName = u"Flickr Photo")
+    pass
 
 class Tag(pim.ContentItem):
     """
@@ -83,8 +81,6 @@
     tag. This makes it easy to find all photos with a given tag or all tags belonging
     to a photo. Currently, there isn't any code that takes advantage of Tags.
     """
-    schema.kindInfo(displayName=u"Flickr Tag")
-
     itemsWithTag = schema.Sequence(FlickrPhotoMixin, inverse=FlickrPhotoMixin.tags)
 
     @classmethod
@@ -120,8 +116,6 @@
     """
     A ListCollection of FlickrPhotos
     """
-    schema.kindInfo(displayName=u"Collection of Flickr Photos")
-
     userName = schema.One (schema.Text, initialValue=u'')
     tag = schema.One (Tag, initialValue=None)
     fillInBackground = schema.One (schema.Boolean, defaultValue=False)

Modified: trunk/chandler/parcels/osaf/framework/blocks/ControlBlocks.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/framework/blocks/ControlBlocks.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/framework/blocks/ControlBlocks.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -1136,9 +1136,6 @@
     their presentation or behavior.
     """
 
-    schema.kindInfo(
-        displayName = _(u"Presentation Style")
-    )
     sampleText = schema.One(
         schema.Text,
         doc = 'Localized in-place sample text (optional); if "", will use the attr\'s displayName.',
@@ -1175,7 +1172,6 @@
        cause this to be reliable, but I think these problems can be fixed there.
     """
     schema.kindInfo(
-        displayName=u"Attribute Editor Block Kind",
         description="Block that instantiates an appropriate Attribute Editor."
     )

Modified: trunk/chandler/parcels/osaf/framework/certstore/certificate.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/framework/certstore/certificate.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/framework/certstore/certificate.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -43,7 +43,6 @@
     Type enumeration
     @see: U{model<../model/parcels/osaf/framework/certstore/typeEnum/index.html>}
     """
-    schema.kindInfo(displayName = u"Type Enumeration")
     values = constants.TYPE_ROOT, constants.TYPE_SITE
 
 class Certificate(pim.ContentItem):
@@ -53,8 +52,6 @@
     @see: U{model<../model/parcels/osaf/framework/certstore/Certificate/index.html>}
     """
 
-    schema.kindInfo(displayName = _(u"Certificate"))
-
     who = schema.One(redirectTo = 'displayName')
     displayName = schema.One(
         schema.Text, displayName = _(u'Display Name'),

Modified: trunk/chandler/parcels/osaf/framework/scripting/script.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/framework/scripting/script.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/framework/scripting/script.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -38,7 +38,7 @@
 
 class Script(pim.ContentItem):
     """ Persistent Script Item, to be executed. """
-    schema.kindInfo(displayName=_(u"Script"), displayAttribute="displayName")
+    schema.kindInfo(displayAttribute="displayName")
     lastRan = schema.One(schema.DateTime, displayName = _(u"last ran"))
     fkey = schema.One(schema.Text, initialValue = u'')
     test = schema.One(schema.Boolean, initialValue = False)

Modified: trunk/chandler/parcels/osaf/pim/__init__.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/__init__.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/__init__.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -49,13 +49,11 @@
 
 class MailedTask(tasks.TaskMixin, mail.MailMessage):
     schema.kindInfo(
-        displayName = u"Mailed Task",
         description = "A Task stamped as a Mail, or vica versa",
     )
 
 class MailedEvent(calendar.Calendar.CalendarEventMixin, mail.MailMessage):
     schema.kindInfo(
-        displayName = u"Mailed Event",
         description = "An Event stamped as a Mail, or vica versa",
     )
 
@@ -65,7 +63,6 @@
     calendar.Calendar.CalendarEvent
 ):
     schema.kindInfo(
-        displayName = u"Event Task",
         description = "A Task stamped as an Event, or vica versa",
     )
 
@@ -76,7 +73,6 @@
     mail.MailMessage
 ):
     schema.kindInfo(
-        displayName = u"Mailed Event Task",
         description = "A Task stamped as an Event stamped as Mail, in any sequence",
     )

Modified: trunk/chandler/parcels/osaf/pim/calendar/Calendar.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/calendar/Calendar.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/calendar/Calendar.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -54,14 +54,9 @@
 
     """
     
-    schema.kindInfo(
-        displayName=u"Time Transparency"
-    )
     values="confirmed", "tentative", "fyi"
 
 class ModificationEnum(schema.Enumeration):
-    """Unused, should be removed."""
-    schema.kindInfo(displayName=u"Modification")
     values="this", "thisandfuture"
 
 def _sortEvents(eventlist, reverse=False):
@@ -300,10 +295,6 @@
     
     """
     
-    schema.kindInfo(
-        displayName=u"Calendar Event Mixin Kind"
-    )
-
     startTime = schema.One(
         schema.DateTimeTZ,
         displayName=_(u"Start Time"),
@@ -1627,7 +1618,6 @@
 
 class CalendarEvent(CalendarEventMixin, Note):
     """An unstamped event."""
-    schema.kindInfo(displayName=u"Calendar Event")
 
     def __init__(self, *args, **kw):
         kw.setdefault('participants',[])
@@ -1637,13 +1627,11 @@
 class Calendar(ContentItem):
     """Unused, should be removed."""
     
-    schema.kindInfo(displayName=u"Calendar", displayAttribute="displayName")
 
 
 class Location(ContentItem):
     """Stub Kind for Location."""
     
-    schema.kindInfo(displayName=u"Location", displayAttribute="displayName")
 
     eventsAtLocation = schema.Sequence(
         CalendarEventMixin,
@@ -1687,5 +1675,3 @@
 class RecurrencePattern(ContentItem):
     """Unused, should be removed."""
     
-    schema.kindInfo(displayName=u"Recurrence Pattern")
-

Modified: trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/calendar/Recurrence.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -34,9 +34,6 @@
 
 class FrequencyEnum(schema.Enumeration):
     """The base frequency for a recurring event."""
-    schema.kindInfo(
-        displayName=u"Frequency"
-    )
     values="yearly","monthly","weekly","daily","hourly","minutely","secondly"
 
 
@@ -60,9 +57,6 @@
 
 class WeekdayEnum(schema.Enumeration):
     """The names of weekdays.  Values shouldn't be displayed directly."""
-    schema.kindInfo(
-        displayName=u"Weekdays"
-    )
     values="monday","tuesday","wednesday","thursday","friday", \
            "saturday","sunday"

Modified: trunk/chandler/parcels/osaf/pim/calendar/Reminders.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/calendar/Reminders.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/calendar/Reminders.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -20,10 +20,6 @@
 
 
 class Reminder(schema.Item):
-    schema.kindInfo(
-        displayName=u"A Reminder for one or more RemindableMixin items"
-    )
-
     delta = schema.One(
         schema.TimeDelta, 
         displayName=u"Delta",
@@ -76,10 +72,6 @@
         return result
 
 class RemindableMixin(ContentItem):
-    schema.kindInfo(
-        displayName=u"RemindableMixin",
-    )
-
     reminders = schema.Sequence(
         Reminder,
         displayName=u"Reminders",

Modified: trunk/chandler/parcels/osaf/pim/calendar/TimeZone.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/calendar/TimeZone.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/calendar/TimeZone.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -27,10 +27,6 @@
      - A list of "well-known" timezone names.
     """
 
-    schema.kindInfo(
-        displayName=u"TimeZone info"
-    )
-
     default = schema.One(
         schema.TimeZone,
         displayName = u'User Default Time Zone',

Modified: trunk/chandler/parcels/osaf/pim/collections.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/collections.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/collections.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -56,10 +56,6 @@
     an AbstractSet subclass instance or a RefList instance.
     """
 
-    schema.kindInfo(
-        displayName=u"ContentCollection"
-    )
-
     collectionList = schema.Sequence(
         'ContentCollection',
         doc="Views, e.g. the Calendar, that display collections need to know "
@@ -151,8 +147,6 @@
 
     set = schema.One(schema.TypeReference('//Schema/Core/AbstractSet'))
 
-    schema.kindInfo(displayName=u"KindCollection")
-
     kind = schema.One(schema.TypeReference('//Schema/Core/Kind'))
     recursive = schema.One(schema.Boolean, defaultValue=False)
 
@@ -178,8 +172,6 @@
     # must be named 'inclusions' to match AppCollection
     inclusions = schema.Sequence(otherName='collections', initialValue=[])
 
-    schema.kindInfo(displayName=u"ListCollection")
-
     def empty(self):
         for item in self:
             item.delete(True)
@@ -296,8 +288,6 @@
     instances to be differenced.
     """
 
-    schema.kindInfo(displayName=u"DifferenceCollection")
-
     def _sourcesChanged_(self):
 
         sources = self.sources
@@ -331,8 +321,6 @@
     ContentCollections.
     """
 
-    schema.kindInfo(displayName=u"UnionCollection")
-
     def _sourcesChanged_(self):
 
         sources = self.sources
@@ -361,8 +349,6 @@
     least two ContentCollections.
     """
 
-    schema.kindInfo(displayName=u"IntersectionCollection")
-
     def _sourcesChanged(self, op, item, attribute, sourceId):
 
         if op in ('add', 'remove'):
@@ -438,8 +424,6 @@
     Failure to provide this list will result in missing notifications.
     """
 
-    schema.kindInfo(displayName=u"FilteredCollection")
-
     filterExpression = schema.One(schema.Text)
     filterMethod = schema.One(schema.Tuple)
     filterAttributes = schema.Sequence(schema.Symbol, initialValue=[])

Modified: trunk/chandler/parcels/osaf/pim/contacts.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/contacts.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/contacts.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -44,8 +44,6 @@
     'Permissions I've given them', 'Items of mine they've subscribed to',
     'Items of theirs I've subscribed to', etc.
     """
-    schema.kindInfo(displayName=_(u"Contact"), displayAttribute="emailAddress")
-
     itemsCreated = schema.Sequence(
         displayName=u"Items Created",
         doc = "List of content items created by this user.",

Modified: trunk/chandler/parcels/osaf/pim/items.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/items.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/items.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -43,8 +43,6 @@
 
     __metaclass__ = schema.ItemClass
 
-    schema.kindInfo(displayName=u"Metakind 'Content Kind'")
-
     detailView = schema.One()   # Block
 
 
@@ -52,13 +50,9 @@
     """
     Importance Enum
     """
-    schema.kindInfo(
-        displayName=u"Importance Enum"
-    )
     values = "important", "normal", "fyi"
 
 class TriageEnum(schema.Enumeration):
-    schema.kindInfo(displayName=_(u"Triage Status Enum"))
     values = "now", "later", "done"
 
 class Calculated(property):
@@ -93,8 +87,6 @@
      - a Contact -- 'Terry Smith'
      - a Task -- 'mail 1040 to IRS'
     """
-    schema.kindInfo( displayName = u"Content Item" )
-
     displayName = schema.One(schema.Text, displayName=_(u"Title"), indexed=True)
     body = schema.One(
         schema.Text,
@@ -737,7 +729,6 @@
 class Tag(ContentItem):
 
     schema.kindInfo(
-        displayName = u"Tag",
         description =
             "A generic tag object that can be associated with any ContentItem"
     )
@@ -770,7 +761,6 @@
 class Project(ContentItem):
 
     schema.kindInfo(
-        displayName = u"Project",
         description =
             "Users can create projects to help organize their work. Users can "
             "take content items (like tasks and mail messages) and assign "
@@ -798,7 +788,6 @@
 class Group(ContentItem):
 
     schema.kindInfo(
-        displayName = u'"Playlist"/"Item Collection"',
         description =
             "See http://wiki.osafoundation.org/twiki/bin/view/Jungle/CollectionProject\n\n"
             "Issues:\n"
@@ -810,7 +799,6 @@
 class UserNotification(ContentItem):
 
     schema.kindInfo(
-        displayName = u'User Notification',
         description = "Notifications meant for the user to see"
     )
 
@@ -835,8 +823,6 @@
 
 
 class Principal(ContentItem):
-    schema.kindInfo(displayName=u'Access Control Principal')
-
     # @@@MOR These should be moved out so that authentication can be made
     # more general, but they're here for convenience for now.
     login = schema.One(schema.Text)

Modified: trunk/chandler/parcels/osaf/pim/mail.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/mail.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/mail.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -119,14 +119,12 @@
 
 
 class connectionSecurityEnum(schema.Enumeration):
-    schema.kindInfo(displayName=u"Connection Security Enumeration")
     values = "NONE", "TLS", "SSL"
 
 
 class AccountBase(items.ContentItem):
 
     schema.kindInfo(
-        displayName=u"Account base kind",
         description="The base kind for various account kinds, such as "
                     "IMAP, SMTP, WebDav"
     )
@@ -206,7 +204,6 @@
 class DownloadAccountBase(AccountBase):
 
     schema.kindInfo(
-        displayName=u"Download Account Base",
         description="Base Account for protocols that download mail",
     )
 
@@ -244,7 +241,6 @@
     accountType = "SMTP"
 
     schema.kindInfo(
-        displayName=_(u"SMTP Account"),
         description="An SMTP Account",
     )
 
@@ -294,7 +290,6 @@
     accountType = "IMAP"
 
     schema.kindInfo(
-        displayName = _(u"IMAP Account"),
         description = "An IMAP Account",
     )
 
@@ -320,7 +315,6 @@
     accountType = "POP"
 
     schema.kindInfo(
-        displayName = _(u"POP Account"),
         description = "An POP Account",
     )
     port = schema.One(
@@ -350,7 +344,6 @@
 class MailDeliveryError(items.ContentItem):
 
     schema.kindInfo(
-        displayName=u"Mail Delivery Error kind",
         description=
             "Contains the error data associated with a MailDelivery Type"
     )
@@ -375,7 +368,6 @@
 class MailDeliveryBase(items.ContentItem):
 
     schema.kindInfo(
-        displayName = u"Mail Delivery base kind",
         description =
             "Parent kind for delivery-specific attributes of a MailMessage"
     )
@@ -406,7 +398,6 @@
 class SMTPDelivery(MailDeliveryBase):
 
     schema.kindInfo(
-        displayName = u"SMTP Delivery",
         description = "Tracks the status of an outgoing message\n\n"
             "Issues:\n\n"
             "   Currently the parcel loader can't set a default value for the "
@@ -456,7 +447,6 @@
 class IMAPDelivery(MailDeliveryBase):
 
     schema.kindInfo(
-        displayName = u"IMAP Delivery",
         description = "Tracks the state of an inbound message",
     )
 
@@ -483,7 +473,6 @@
 class POPDelivery(MailDeliveryBase):
 
     schema.kindInfo(
-        displayName = u"POP Delivery",
         description = "Tracks the state of an inbound message",
     )
 
@@ -497,7 +486,6 @@
 
 class MIMEBase(items.ContentItem):
     schema.kindInfo(
-        displayName=u"MIME Base Kind",
         description="Super kind for MailMessage and the various MIME kinds",
     )
 
@@ -517,7 +505,6 @@
     # was removed from MIMENote's superKinds list
 
     schema.kindInfo(
-        displayName=u"MIME Note",
         description="MIMEBase and Note, rolled into one",
     )
 
@@ -533,8 +520,6 @@
 
 class MIMEContainer(MIMEBase):
 
-    schema.kindInfo(displayName=u"MIME Container Kind")
-
     hasMimeParts = schema.One(schema.Boolean, initialValue = False)
     mimeParts = schema.Sequence(
         MIMEBase,
@@ -557,9 +542,6 @@
       - Really not sure what to do with the 'downloadAccount' attribute
         and how it should be included in the cloud.  For now it's byValue.
     """
-    schema.kindInfo(
-        displayName=u"Mail Message Mixin"
-    )
     deliveryExtension = schema.One(
         MailDeliveryBase,
         initialValue = None,
@@ -732,7 +714,6 @@
 
 class MailMessage(MailMessageMixin, notes.Note):
     schema.kindInfo(
-        displayName = _(u"Mail Message"),
         displayAttribute = "subject",
         description = "MailMessageMixin, and Note, all rolled up into one",
     )
@@ -740,14 +721,11 @@
 
 class MIMEBinary(MIMENote):
 
-    schema.kindInfo(displayName = u"MIME Binary Kind")
     data = "" indexed=False)
 
 
 class MIMEText(MIMENote):
 
-    schema.kindInfo(displayName = u"MIME Text Kind")
-
     charset = schema.One(
         schema.Text,
         displayName = u'Character set encoding',
@@ -761,14 +739,11 @@
 
 
 class MIMESecurity(MIMEContainer):
+    pass
 
-    schema.kindInfo(displayName=u"MIME Security Kind")
-
-
 class EmailAddress(items.ContentItem):
 
     schema.kindInfo(
-        displayName = u"Email Address Kind",
         displayAttribute = "emailAddress",
         description = "An item that represents a simple email address, plus "
                       "all the info we might want to associate with it, like "

Modified: trunk/chandler/parcels/osaf/pim/notes.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/notes.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/notes.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -30,9 +30,6 @@
     ## Attribute declarations
     ##
 
-    # ensure that the displayName carries over
-    schema.kindInfo(displayName=_(u"Note"))
-
     # temporarily make this a real attribute instead of a redirection,
     # because we don't want to redirect this anywhere
     who = schema.One(

Modified: trunk/chandler/parcels/osaf/pim/tasks.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/pim/tasks.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/pim/tasks.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -28,7 +28,6 @@
 
 
 class TaskStatusEnum(schema.Enumeration):
-    schema.kindInfo(displayName=u"Task Status")
     values = "todo", "blocked", "done", "deferred"
 
 
@@ -42,7 +41,6 @@
     """
     
     schema.kindInfo(
-        displayName = u"Task Mixin Kind",
         description = 
             "This Kind is 'mixed in' to others kinds to create Kinds that "
             "can be instantiated"
@@ -127,7 +125,6 @@
     """
 
     schema.kindInfo(
-        displayName = u"Task Event Extra Mixin Kind",
         description =
             "The attributes specific to an item that is both a task and an "
             "event.  This is additional 'due by' information. "
@@ -181,5 +178,4 @@
 
       - Task should maybe have a 'Timezone' attribute.
     """
-    schema.kindInfo( displayName = u"Task" )

Modified: trunk/chandler/parcels/osaf/sharing/ICalendar.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/sharing/ICalendar.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/sharing/ICalendar.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -750,8 +750,6 @@
 
 class ICalendarFormat(Sharing.ImportExportFormat):
 
-    schema.kindInfo(displayName=u"iCalendar Import/Export Format Kind")
-    
     def fileStyle(self):
         return self.STYLE_SINGLE
 
@@ -849,8 +847,6 @@
     
 class FreeBusyFileFormat(ICalendarFormat):
     """Format for exporting/importing a monolithic freebusy file."""
-    schema.kindInfo(displayName=u"iCalendar Free/Busy Format Kind")
-
     def extension(self, item):
         return "ifb"

Modified: trunk/chandler/parcels/osaf/sharing/Sharing.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/sharing/Sharing.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/sharing/Sharing.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -363,7 +363,6 @@
 
 
 class modeEnum(schema.Enumeration):
-    schema.kindInfo(displayName=u"Mode Enumeration")
     values = "put", "get", "both"
 
 
@@ -374,7 +373,6 @@
     """
 
     schema.kindInfo(
-        displayName=u"Share Kind",
         description="Represents a shared collection",
     )
 
@@ -560,8 +558,6 @@
         super(ShareConduit, self).__init__(*args, **kw)
         self.itemsMarker = Item('itemsMarker', self, None)
 
-    schema.kindInfo(displayName = u"Share Conduit Kind")
-
     share = schema.One(Share, inverse = Share.conduit)
 
     sharePath = schema.One(
@@ -1264,9 +1260,6 @@
 
 class FileSystemConduit(ShareConduit):
 
-    schema.kindInfo(displayName=u"File System Share Conduit Kind")
-
-
     def __init__(self, *args, **kw):
         if 'shareName' not in kw:
             kw['shareName'] = unicode(UUID())
@@ -1417,8 +1410,6 @@
 
 class WebDAVConduit(ShareConduit):
 
-    schema.kindInfo(displayName=u"WebDAV Share Conduit Kind")
-
     account = schema.One('WebDAVAccount', inverse='conduits',initialValue=None)
     host = schema.One(schema.Text, initialValue=u"")
     port = schema.One(schema.Integer, initialValue=80)
@@ -2104,8 +2095,6 @@
     Useful for get-only subscriptions of remote .ics files
     """
 
-    schema.kindInfo(displayName=u"Simple HTTP Share Conduit Kind")
-
     lastModified = schema.One(schema.Text, initialValue = '')
 
     def _get(self, contentView, updateCallback=None):
@@ -2366,7 +2355,6 @@
 
 class WebDAVAccount(pim.ContentItem):
     schema.kindInfo(
-        displayName=messages.ACCOUNT % {'accountName': 'WebDAV Account'},
         description="A WebDAV 'Account'\n\n"
             "Issues:\n"
             "   Long term we're probably not going to treat WebDAV as an "
@@ -2479,8 +2467,6 @@
 
 class ImportExportFormat(pim.ContentItem):
 
-    schema.kindInfo(displayName=u"Import/Export Format Kind")
-
     share = schema.One(Share, inverse = Share.format)
 
     STYLE_SINGLE = 'single' # Share represented by monolithic file
@@ -2509,8 +2495,6 @@
 
 class CloudXMLFormat(ImportExportFormat):
 
-    schema.kindInfo(displayName=u"Cloud XML Import/Export Format Kind")
-
     cloudAlias = schema.One(schema.Text, initialValue='sharing')
 
     def fileStyle(self):

Modified: trunk/chandler/parcels/osaf/views/main/SideBar.py (11199 => 11200)

--- trunk/chandler/parcels/osaf/views/main/SideBar.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/osaf/views/main/SideBar.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -1124,7 +1124,7 @@
                     newKey = IntersectionCollection(itsView=self.itsView,
                                                     sources=[key, kindCollection])
                     UserCollection(newKey).dontDisplayAsCalendar = UserCollection(key).dontDisplayAsCalendar
-                    displayName += u" filtered by " + filterKind.displayName
+                    displayName += u" filtered by " + filterKind.itsName
                     key = newKey
 
                 # Finally, create a UI wrapper collection to manage

Modified: trunk/chandler/parcels/photos/Photos.py (11199 => 11200)

--- trunk/chandler/parcels/photos/Photos.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/parcels/photos/Photos.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -31,8 +31,7 @@
 logger = logging.getLogger(__name__)
 
 class PhotoMixin(pim.ContentItem):
-    schema.kindInfo(displayName=u"Photo Mixin Kind",
-                    displayAttribute="displayName")
+    schema.kindInfo(displayAttribute="displayName")
     dateTaken = schema.One(schema.DateTime, displayName=_(u"taken"))
     file = schema.One(schema.Text)
     exif = schema.Mapping(schema.Text, initialValue={})
@@ -111,7 +110,7 @@
 
 
 class Photo(PhotoMixin, pim.Note):
-    schema.kindInfo(displayName = u"Photo")
+    pass
 
 
 class NewImageEvent(NewItemEvent):

Modified: trunk/chandler/projects/Chandler-FeedsPlugin/feeds/channels.py (11199 => 11200)

--- trunk/chandler/projects/Chandler-FeedsPlugin/feeds/channels.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/projects/Chandler-FeedsPlugin/feeds/channels.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -131,8 +131,6 @@
         super(FeedChannel, self).__init__(*args, **kw)
         self.addIndex('link', 'value', attribute='link')
 
-    schema.kindInfo(displayName=u"Feed Channel")
-
     link = schema.One(
         schema.URL,
         displayName=_(u"link")
@@ -415,8 +413,6 @@
 ##
 class FeedItem(pim.ContentItem):
 
-    schema.kindInfo(displayName=u"Feed Item")
-
     link = schema.One(
         schema.URL,
         displayName=_(u"link"),

Modified: trunk/chandler/samples/skeleton/__init__.py (11199 => 11200)

--- trunk/chandler/samples/skeleton/__init__.py	2006-07-19 12:54:33 UTC (rev 11199)
+++ trunk/chandler/samples/skeleton/__init__.py	2006-07-19 16:58:20 UTC (rev 11200)
@@ -21,10 +21,6 @@
     
     attr1 = schema.One(schema.Text, displayName=u"Attribute 1")
    
-    schema.kindInfo(
-        displayName = u"Example Kind"
-    )
-
     # redirection attributes
     who = schema.Descriptor(redirectTo="attr1")
 






_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to