[Commits] (bkirsch) Updated mail content model

commits at osafoundation.org commits at osafoundation.org
Fri Aug 13 12:03:33 PDT 2004


Commit by: bkirsch
Modified files:
chandler/parcels/osaf/contentmodel/mail/parcel.xml 1.42 1.43
chandler/parcels/osaf/contentmodel/mail/Mail.py 1.15 1.16

Log message:
Updated  mail content model

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/mail/parcel.xml.diff?r1=text&tr1=1.42&r2=text&tr2=1.43
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/mail/Mail.py.diff?r1=text&tr1=1.15&r2=text&tr2=1.16

Index: chandler/parcels/osaf/contentmodel/mail/parcel.xml
diff -u chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.42 chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.43
--- chandler/parcels/osaf/contentmodel/mail/parcel.xml:1.42	Fri Aug 13 07:41:00 2004
+++ chandler/parcels/osaf/contentmodel/mail/parcel.xml	Fri Aug 13 12:03:32 2004
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<!-- $Revision: 1.42 $ -->
-<!-- $Date: 2004/08/13 14:41:00 $ -->
+<!-- $Revision: 1.43 $ -->
+<!-- $Date: 2004/08/13 19:03:32 $ -->
 <!-- Copyright (c) 2003 Open Source Applications Foundation -->
 <!-- License: http://osafoundation.org/Chandler_0.1_license_terms.htm -->
 
@@ -263,7 +263,7 @@
         <Attribute itsName="folder">
             <displayName value="Folder" />
             <type ref="String" />
-            <initialValue ref="None" />
+            <initialValue type="String" value="INBOX" />
         </Attribute>
 
         <Attribute itsName="uid">
@@ -277,7 +277,7 @@
             <displayName value="Namespace" />
             <description value="The namespace of the message" />
             <type ref="String" />
-            <initialValue ref="None" />
+            <initialValue type="String" value="" />
         </Attribute>
 
         <Attribute itsName="flags">
@@ -423,9 +423,6 @@
 
         <Attribute itsName="rfc2822Message">
             <type ref="Text" />
-            <!--
-            <initialValue type="Text" value="" />
-            -->
         </Attribute>
 
         <Attribute itsName="dateSentString">
@@ -590,7 +587,7 @@
         <Attribute itsName="filename">
             <displayName value="File name" />
             <type ref="String" />
-            <initialValue ref="None" />
+            <initialValue type="String" value="" />
         </Attribute>
 
     </Kind>
@@ -602,7 +599,7 @@
         <Attribute itsName="charset">
             <displayName value="Character set" />
             <type ref="String" />
-            <initialValue ref="None" />
+            <initialValue type="String" value="ISO=8859-1" />
         </Attribute>
 
     </Kind>

Index: chandler/parcels/osaf/contentmodel/mail/Mail.py
diff -u chandler/parcels/osaf/contentmodel/mail/Mail.py:1.15 chandler/parcels/osaf/contentmodel/mail/Mail.py:1.16
--- chandler/parcels/osaf/contentmodel/mail/Mail.py:1.15	Fri Aug 13 07:41:00 2004
+++ chandler/parcels/osaf/contentmodel/mail/Mail.py	Fri Aug 13 12:03:32 2004
@@ -1,8 +1,8 @@
 """ Classes used for Mail parcel kinds
 """
 
-__revision__  = "$Revision: 1.15 $"
-__date__      = "$Date: 2004/08/13 14:41:00 $"
+__revision__  = "$Revision: 1.16 $"
+__date__      = "$Date: 2004/08/13 19:03:32 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -188,7 +188,7 @@
         if not parent:
             parent = ContentModel.ContentModel.getContentItemParent()
         if not kind:
-            kind = MailParcel.geSMTPAccountKind()
+            kind = MailParcel.getSMTPAccountKind()
         super (SMTPAccount, self).__init__(name, parent, kind)
 
 class IMAPAccount(AccountBase):
@@ -196,7 +196,7 @@
         if not parent:
             parent = ContentModel.ContentModel.getContentItemParent()
         if not kind:
-            kind = MailParcel.geIMAPAccountKind()
+            kind = MailParcel.getIMAPAccountKind()
         super (IMAPAccount, self).__init__(name, parent, kind)
 
 class MailDeliveryBase(Item.Item):
@@ -250,9 +250,15 @@
 class MailMessageMixin(MIMEContainer):
     """
       Mail Message Mixin is the bag of Message-specific attributes.
-    We only instantiate these Items when we "unstamp" an
-    Item, to save the attributes for later "restamping".
+
     """
+    def __init__(self, name=None, parent=None, kind=None):
+        if not parent:
+            parent = ContentModel.ContentModel.getContentItemParent()
+        if not kind:
+            kind = MailParcel.getMailMessageMixinKind()
+        super (MailMessageMixin, self).__init__(name, parent, kind)
+
     def InitOutgoingAttributes (self):
         """ Init any attributes on ourself that are appropriate for
         a new outgoing item.



More information about the Commits mailing list