[Commits] (vajda) - replaced Item.getItemName() with 'itsName' python property

commits at osafoundation.org commits at osafoundation.org
Tue Mar 23 21:09:35 PST 2004


Commit by: vajda
Modified files:
osaf/chandler/Chandler/application/Application.py 1.212 1.213
osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py 1.6 1.7
osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py 1.9 1.10
osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py 1.2 1.3
osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py 1.3 1.4
osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py 1.5 1.6
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py 1.6 1.7
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py 1.4 1.5
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py 1.10 1.11
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py 1.3 1.4
osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py 1.6 1.7
osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py 1.11 1.12
osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py 1.18 1.19
osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py 1.22 1.23
osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py 1.8 1.9
osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py 1.17 1.18
osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py 1.15 1.16
osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py 1.14 1.15
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py 1.20 1.21
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py 1.70 1.71
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py 1.16 1.17
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py 1.7 1.8
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py 1.7 1.8
osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py 1.7 1.8
osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py 1.7 1.8
osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py 1.15 1.16
osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py 1.11 1.12
osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py 1.1 1.2
osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py 1.6 1.7
osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py 1.1 1.2
osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py 1.4 1.5
osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py 1.7 1.8
osaf/chandler/Chandler/repository/__hardhat__.py 1.3 1.4
osaf/chandler/Chandler/repository/item/Item.py 1.112 1.113
osaf/chandler/Chandler/repository/item/ItemHandler.py 1.31 1.32
osaf/chandler/Chandler/repository/item/ItemRef.py 1.61 1.62
osaf/chandler/Chandler/repository/item/PersistentCollections.py 1.6 1.7
osaf/chandler/Chandler/repository/item/Query.py 1.5 1.6
osaf/chandler/Chandler/repository/packs/schema/model/Item.kind 1.12 1.13
osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind 1.21 1.22
osaf/chandler/Chandler/repository/parcel/Parcel.py 1.10 1.11
osaf/chandler/Chandler/repository/parcel/ParcelLoader.py 1.14 1.15
osaf/chandler/Chandler/repository/parcel/Util.py 1.8 1.9
osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py 1.3 1.4
osaf/chandler/Chandler/repository/parcel/tests/TestItems.py 1.5 1.6
osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py 1.2 1.3
osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py 1.7 1.8
osaf/chandler/Chandler/repository/persistence/DBContainer.py 1.7 1.8
osaf/chandler/Chandler/repository/persistence/FileRepository.py 1.26 1.27
osaf/chandler/Chandler/repository/persistence/PackHandler.py 1.13 1.14
osaf/chandler/Chandler/repository/persistence/Repository.py 1.68 1.69
osaf/chandler/Chandler/repository/persistence/XMLRepository.py 1.67 1.68
osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py 1.30 1.31
osaf/chandler/Chandler/repository/schema/Alias.py 1.4 1.5
osaf/chandler/Chandler/repository/schema/Kind.py 1.56 1.57
osaf/chandler/Chandler/repository/schema/Types.py 1.55 1.56
osaf/chandler/Chandler/repository/tests/AttributeTestCase.py 1.2 1.3
osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py 1.3 1.4
osaf/chandler/Chandler/repository/tests/TestAlias.py 1.2 1.3
osaf/chandler/Chandler/repository/tests/TestItems.py 1.8 1.9
osaf/chandler/Chandler/repository/tests/TestKinds.py 1.3 1.4
osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py 1.6 1.7
osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py 1.14 1.15
osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py 1.8 1.9
osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py 1.15 1.16
osaf/chandler/Chandler/repository/tests/TestRepository.py 1.5 1.6
osaf/chandler/Chandler/repository/tests/TestTypes.py 1.3 1.4
osaf/chandler/Chandler/repository/util/SingleRef.py 1.3 1.4

Log message:
   - replaced Item.getItemName() with 'itsName' python property
   - replaced Item.getUUID() with 'itsUUID' python property
   - replaced Item.getItemPath() with 'itsPath' python property
   - replaced Item.getItemParent() with 'itsParent' python property
   - replaced Item.getRoot() with 'itsRoot' python property
   - replaced Item.kind with 'itsKind' python property


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/application/Application.py.diff?r1=text&tr1=1.212&r2=text&tr2=1.213
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py.diff?r1=text&tr1=1.9&r2=text&tr2=1.10
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py.diff?r1=text&tr1=1.18&r2=text&tr2=1.19
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py.diff?r1=text&tr1=1.22&r2=text&tr2=1.23
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py.diff?r1=text&tr1=1.17&r2=text&tr2=1.18
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py.diff?r1=text&tr1=1.15&r2=text&tr2=1.16
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py.diff?r1=text&tr1=1.20&r2=text&tr2=1.21
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.70&r2=text&tr2=1.71
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.16&r2=text&tr2=1.17
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py.diff?r1=text&tr1=1.15&r2=text&tr2=1.16
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/__hardhat__.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/item/Item.py.diff?r1=text&tr1=1.112&r2=text&tr2=1.113
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/item/ItemHandler.py.diff?r1=text&tr1=1.31&r2=text&tr2=1.32
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/item/ItemRef.py.diff?r1=text&tr1=1.61&r2=text&tr2=1.62
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/item/PersistentCollections.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/item/Query.py.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/packs/schema/model/Item.kind.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind.diff?r1=text&tr1=1.21&r2=text&tr2=1.22
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/Parcel.py.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/ParcelLoader.py.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/Util.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/tests/TestItems.py.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/DBContainer.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/FileRepository.py.diff?r1=text&tr1=1.26&r2=text&tr2=1.27
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/PackHandler.py.diff?r1=text&tr1=1.13&r2=text&tr2=1.14
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/Repository.py.diff?r1=text&tr1=1.68&r2=text&tr2=1.69
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/XMLRepository.py.diff?r1=text&tr1=1.67&r2=text&tr2=1.68
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py.diff?r1=text&tr1=1.30&r2=text&tr2=1.31
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/schema/Alias.py.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/schema/Kind.py.diff?r1=text&tr1=1.56&r2=text&tr2=1.57
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/schema/Types.py.diff?r1=text&tr1=1.55&r2=text&tr2=1.56
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/AttributeTestCase.py.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestAlias.py.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestItems.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestKinds.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py.diff?r1=text&tr1=1.15&r2=text&tr2=1.16
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestRepository.py.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/tests/TestTypes.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/util/SingleRef.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py:1.3 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py:1.4
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py:1.3	Wed Jan 14 23:34:17 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestMail.py	Tue Mar 23 21:07:15 2004
@@ -2,8 +2,8 @@
 Unit tests for mail
 """
 
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/15 07:34:17 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:07:15 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -44,13 +44,13 @@
         mailMessageItem = Mail.MailMessage("mailMessageItem")
 
         # Double check kinds
-        self.assertEqual(attachmentItem.kind,
+        self.assertEqual(attachmentItem.itsKind,
                          Mail.MailParcel.getAttachmentKind())
-        self.assertEqual(emailAccountItem.kind,
+        self.assertEqual(emailAccountItem.itsKind,
                          Mail.MailParcel.getEmailAccountKind())
-        self.assertEqual(emailAddressItem.kind,
+        self.assertEqual(emailAddressItem.itsKind,
                          Mail.MailParcel.getEmailAddressKind())
-        self.assertEqual(mailMessageItem.kind,
+        self.assertEqual(mailMessageItem.itsKind,
                          Mail.MailParcel.getMailMessageKind())
 
         # Literal properties

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py:1.7 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py:1.8
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py:1.7	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/MenuBlocks.py	Tue Mar 23 21:07:47 2004
@@ -52,7 +52,7 @@
                     else:
                         menu = data['mainMenu']
                     
-                    name = child.getItemName()
+                    name = child.itsName
                     if child.operation == 'InsertBefore':
                         try:
                             index = menu.index (child.itemLocation)

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.16 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.17
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py:1.16	Tue Mar 23 07:32:08 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ControlBlocks.py	Tue Mar 23 21:07:47 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.16 $"
-__date__ = "$Date: 2004/03/23 15:32:08 $"
+__version__ = "$Revision: 1.17 $"
+__date__ = "$Date: 2004/03/24 05:07:47 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -289,7 +289,7 @@
         return style
 
     def NeedsUpdate(self):
-        wxWindow = Globals.association[self.getUUID()]
+        wxWindow = Globals.association[self.itsUUID]
         wxWndow.scheduleUpdate = True    
 
     def OnSelectionChangedEvent (self, notification):
@@ -452,7 +452,7 @@
                                                cellValues.pop(0),
                                                -1,
                                                -1,
-                                               wxTreeItemData (child.getUUID()))
+                                               wxTreeItemData (child.itsUUID))
                 index = 1
                 for value in cellValues:
                     self.SetItemText (childNodeId, value, index)
@@ -536,7 +536,7 @@
         rootNodeId = self.AddRoot (cellValues.pop(0),
                                    -1,
                                    -1,
-                                   wxTreeItemData (root.getUUID()))
+                                   wxTreeItemData (root.itsUUID))
         self.SetItemHasChildren (rootNodeId, self.ElementHasChildren (root))
         self.LoadChildren(rootNodeId)
         ExpandContainer (self, counterpart.openedContainers, self.GetRootItem ())
@@ -572,7 +572,7 @@
                 self.LoadChildren(id)
                 if self.IsVisible(id):
                     self.Expand(id)
-                itemUUID = item.getUUID()
+                itemUUID = item.itsUUID
                 child, cookie = self.GetFirstChild (id, 0)
                 while child.IsOk():
                     if self.GetPyData(child) == itemUUID:
@@ -625,7 +625,7 @@
         return tree, None, None
 
     def OnSelectionChangedEvent (self, notification):
-        wxCounterpart = Globals.association[self.getUUID()]
+        wxCounterpart = Globals.association[self.itsUUID]
         wxCounterpart.GoToItem (notification.GetData()['item'])
 
     def Calculate_wxStyle (self):

Index: osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py:1.7 osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py:1.8
--- osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py:1.7	Tue Feb 10 21:01:24 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/notifications/Notification.py	Tue Mar 23 21:07:54 2004
@@ -26,7 +26,7 @@
         @type event: L{Event}
         """
         super(Notification, self).__init__()
-        self.__eventUUID = event.getUUID()
+        self.__eventUUID = event.itsUUID
         self.data = None
         self.threadid = None
 
@@ -41,4 +41,4 @@
         self.data = data
 
     def __repr__(self):
-        return '<Notification> ' +  str(self.event.getItemPath())
+        return '<Notification> ' +  str(self.event.itsPath)

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py:1.6 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py:1.7
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py:1.6	Wed Jan 14 23:34:17 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestCalendar.py	Tue Mar 23 21:07:15 2004
@@ -2,8 +2,8 @@
 Unit tests for calendar
 """
 
-__revision__  = "$Revision: 1.6 $"
-__date__      = "$Date: 2004/01/15 07:34:17 $"
+__revision__  = "$Revision: 1.7 $"
+__date__      = "$Date: 2004/03/24 05:07:15 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -122,7 +122,7 @@
         self.loadParcel("OSAF/contentmodel/calendar")
 
         item = Calendar.CalendarEvent()
-        path = item.getItemPath()
+        path = item.itsPath
         item.delete()
         del item
         itemShouldBeGone = self.rep.find(path)

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.7 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.8
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py:1.7	Tue Mar 23 07:32:08 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Query.py	Tue Mar 23 21:07:47 2004
@@ -78,7 +78,7 @@
             item = Globals.repository.find(notification.data['uuid'])
             # Repository limitation: list doesn't implement index
             for kind in self.data:
-                if kind is item.kind:
+                if kind is item.itsKind:
                     for block in self.usedInBlocks:
                         self.resultsStale = True
                         block.update()

Index: osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py:1.1 osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py:1.2
--- osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py:1.1	Mon Mar  8 08:42:53 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/utils/imports/OutlookContacts.py	Tue Mar 23 21:08:09 2004
@@ -1,7 +1,7 @@
 """Import contacts exported by Outlook to CSV format."""
 
-__revision__  = "$Revision: 1.1 $"
-__date__      = "$Date: 2004/03/08 16:42:53 $"
+__revision__  = "$Revision: 1.2 $"
+__date__      = "$Date: 2004/03/24 05:08:09 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -210,18 +210,18 @@
 
 currently ignored fields:
 
-"Title" "Suffix"	"Department"
-"Other Street"	"Other Street 2"  "Other Street 3"	"Other City" "Other State"
+"Title" "Suffix"        "Department"
+"Other Street"        "Other Street 2"  "Other Street 3"        "Other City" "Other State"
 "Other Postal Code"   "Other Country"   "Assistant's Phone"   "Assistant's Name"
-"Telex"   "TTY/TDD Phone"   "Radio Phone" "Callback"					
-"Account" "Billing Information" "Categories"	"Directory Server"
-"E-mail Type"	"E-mail Display Name"	"E-mail 2 Type"	
-"E-mail 2 Display Name"	"E-mail 3 Type"	"E-mail 3 Display Name"
-"Government ID Number"	"Hobby"	"Initials"	"Internet Free Busy"
-"Keywords"	"Language"	"Location"	"Manager's Name"	"Mileage"
-"Office Location"	"Organizational ID Number"    "Priority"	"Private"
-"Profession"	"Referred By"	"Sensitivity"	"User 1"	"User 2"
-"User 3"	"User 4"
+"Telex"   "TTY/TDD Phone"   "Radio Phone" "Callback"                                        
+"Account" "Billing Information" "Categories"        "Directory Server"
+"E-mail Type"        "E-mail Display Name"        "E-mail 2 Type"        
+"E-mail 2 Display Name"        "E-mail 3 Type"        "E-mail 3 Display Name"
+"Government ID Number"        "Hobby"        "Initials"        "Internet Free Busy"
+"Keywords"        "Language"        "Location"        "Manager's Name"        "Mileage"
+"Office Location"        "Organizational ID Number"    "Priority"        "Private"
+"Profession"        "Referred By"        "Sensitivity"        "User 1"        "User 2"
+"User 3"        "User 4"
 """
 
 class OutlookContacts(CSVImporter.CSVImporter):
@@ -299,7 +299,7 @@
         returnList = []
         try:
             #String and DateTime Kinds don't offer a newItem method
-            item=kind.newItem(None, parent.getItemParent())
+            item=kind.newItem(None, parent.itsParent)
         except AttributeError:
             item=None
         for branch in tree:
@@ -307,7 +307,7 @@
             if value is not None:
                 returnList.append(value)
                 if item is not None:
-                    item=kind.newItem(None, parent.getItemParent())
+                    item=kind.newItem(None, parent.itsParent)
         if item is not None:
             #if item was ever set, we'll have an extra item
             item.delete()
@@ -382,7 +382,7 @@
         sectionKind=Globals.repository.find(kindPath)
         sectionsList=[]
         for child in object.iterChildren():
-            if child.kind is sectionKind:
+            if child.itsKind is sectionKind:
                 sectionsList.append(child)
         object.sections=sectionsList
         
@@ -476,4 +476,4 @@
  'User 2': '',
  'User 3': '',
  'User 4': '',
- 'Web Page': ''}
\ No newline at end of file
+ 'Web Page': ''}

Index: osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py:1.6 osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py:1.7
--- osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py:1.6	Sat Mar 20 15:22:00 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/content/Content.py	Tue Mar 23 21:08:11 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.6 $"
-__date__ = "$Date: 2004/03/20 23:22:00 $"
+__version__ = "$Revision: 1.7 $"
+__date__ = "$Date: 2004/03/24 05:08:11 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -22,7 +22,7 @@
 
         HTMLText = "<html><body>"
         
-        kind = item.kind
+        kind = item.itsKind
         if kind is Globals.repository.find ("//parcels/OSAF/contentmodel/calendar/CalendarEvent"):
             HTMLText += "<b>Headline: </b> %s<br>" % item.getAbout()
             HTMLText += "<b>Attendees: </b> %s<br>" % item.getWho()

Index: osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py:1.4 osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py:1.5
--- osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py:1.4	Wed Mar 10 01:18:28 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/main/SideBar.py	Tue Mar 23 21:08:20 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.4 $"
-__date__ = "$Date: 2004/03/10 09:18:28 $"
+__version__ = "$Revision: 1.5 $"
+__date__ = "$Date: 2004/03/24 05:08:20 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -16,12 +16,12 @@
     
     def OnViewSideBarEvent(self, notification):
         self.open = not self.open
-        self.showOrHideSideBar(Globals.association[self.getUUID()])
+        self.showOrHideSideBar(Globals.association[self.itsUUID])
 
     def showOrHideSideBar(self, sidebar):
         if sidebar.IsShown() != self.open:
             sidebar.Show(self.open)
-            parentWindow = Globals.association[self.parentBlock.getUUID()]
+            parentWindow = Globals.association[self.parentBlock.itsUUID]
             if self.open:
                 self.parentBlock.addToContainer(parentWindow, sidebar, None, None, None)
             else:
@@ -53,9 +53,9 @@
         to get their parent.
         """
         itemUUID = notification.data['uuid']
-        if notification.event.getItemName() == "item_changed":
+        if notification.event.itsName == "item_changed":
             item = Globals.repository.find (itemUUID)
-            itemUUID = item.getItemParent().getUUID()
+            itemUUID = item.itsParent.itsUUID
         counterpart = Globals.repository.find (self.counterpartUUID)
         if counterpart.openedContainers.has_key (itemUUID):
             self.scheduleUpdate = True

Index: osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.7 osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.8
--- osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py:1.7	Sun Mar 21 11:38:39 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/repositoryviewer/Repository.py	Tue Mar 23 21:08:22 2004
@@ -1,8 +1,8 @@
 """ Classes used by the repository view
 """
 
-__version__ = "$Revision: 1.7 $"
-__date__ = "$Date: 2004/03/21 19:38:39 $"
+__version__ = "$Revision: 1.8 $"
+__date__ = "$Date: 2004/03/24 05:08:22 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -15,7 +15,7 @@
     
     def ElementParent(self, element):
         try:
-            return element.getItemParent()
+            return element.itsParent
         except AttributeError:
             return None
 
@@ -30,14 +30,14 @@
         if element == Globals.repository.view:
             cellValues.append ("//")
         else:
-            cellValues.append (element.getItemName())
+            cellValues.append (element.itsName)
             cellValues.append (str (element.getItemDisplayName()))
             try:
-                cellValues.append (element.kind.getItemName())
+                cellValues.append (element.itsKind.itsName)
             except AttributeError:
                 cellValues.append ('(kindless)')
-            cellValues.append (str (element.getUUID()))
-            cellValues.append (str (element.getItemPath()))
+            cellValues.append (str (element.itsUUID))
+            cellValues.append (str (element.itsPath))
         return cellValues
 
     def ElementHasChildren(self, element):
@@ -58,7 +58,7 @@
             parentUUID = notification.data['parent']
         except KeyError:
             item = Globals.repository.find (notification.data['uuid'])
-            parentUUID = item.getItemParent().getUUID()
+            parentUUID = item.itsParent.itsUUID
         counterpart = Globals.repository.find (self.counterpartUUID)
         if counterpart.openedContainers.has_key (parentUUID):
             self.scheduleUpdate = True
@@ -75,9 +75,10 @@
             if reference == None:
                 return "(None)"
 
-            url = reference.getItemPath()
-            if reference.hasAttributeValue('kind'):
-                kind = reference.kind.getItemName()
+            url = reference.itsPath
+            kind = reference.itsKind
+            if kind is not None:
+                kind = kind.itsName
             else:
                 kind = "(kindless)"
                 
@@ -92,13 +93,13 @@
         try:
             displayName = item.getItemDisplayName()
             try:
-                kind = item.kind.getItemName()
+                kind = item.itsKind.itsName
             except AttributeError:
                 kind = "(kindless)"
             
             HTMLText = "<html><body><h5>%s: %s</h5><ul>" % (kind, displayName)
-            HTMLText = HTMLText + "<li><b>Path:</b> %s" % item.getItemPath()
-            HTMLText = HTMLText + "<li><b>UUID:</b> %s" % item.getUUID()
+            HTMLText = HTMLText + "<li><b>Path:</b> %s" % item.itsPath
+            HTMLText = HTMLText + "<li><b>UUID:</b> %s" % item.itsUUID
             HTMLText = HTMLText + "</ul><h5>Attributes</h5><ul>"
     
             # We build tuples (name, formatted) for all value-only, then

Index: osaf/chandler/Chandler/repository/item/ItemHandler.py
diff -u osaf/chandler/Chandler/repository/item/ItemHandler.py:1.31 osaf/chandler/Chandler/repository/item/ItemHandler.py:1.32
--- osaf/chandler/Chandler/repository/item/ItemHandler.py:1.31	Sun Feb  1 14:12:17 2004
+++ osaf/chandler/Chandler/repository/item/ItemHandler.py	Tue Mar 23 21:08:27 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.31 $"
-__date__      = "$Date: 2004/02/01 22:12:17 $"
+__revision__  = "$Revision: 1.32 $"
+__date__      = "$Date: 2004/03/24 05:08:27 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -202,7 +202,7 @@
             if self.kind is None:
                 raise ValueError, 'Kind %s not found' %(self.kindRef)
             else:
-                self.item._setKind(self.kind)
+                self.item._kind = self.kind
 
     def _onItemLoad(self):
 
@@ -455,7 +455,7 @@
             otherName = attribute.getAspect('otherName')
 
         if otherName is None:
-            raise TypeError, 'Undefined other endpoint for %s/%s.%s of kind %s' %(self.parent.getItemPath(), self.name, name, self.kind.getItemPath())
+            raise TypeError, 'Undefined other endpoint for %s/%s.%s of kind %s' %(self.parent.itsPath, self.name, name, self.kind.itsPath)
 
         return otherName
 
@@ -550,14 +550,14 @@
 
         if attrCard == 'single':
             if isinstance(value, ItemPackage.Item.Item):
-                raise TypeError, "item %s cannot be stored as a literal value" %(value.getItemPath())
+                raise TypeError, "item %s cannot be stored as a literal value" %(value.itsPath)
 
             if value is ItemPackage.Item.Item.Nil:
                 raise ValueError, 'Cannot persist Item.Nil'
 
             if attrType is not None:
                 if not attrType.recognizes(value):
-                    raise TypeError, "value '%s' of type %s is not recognized by type %s" %(value, type(value), attrType.getItemPath())
+                    raise TypeError, "value '%s' of type %s is not recognized by type %s" %(value, type(value), attrType.itsPath)
                 else:
                     attrType.typeXML(value, generator, withSchema)
             else:

Index: osaf/chandler/Chandler/repository/item/ItemRef.py
diff -u osaf/chandler/Chandler/repository/item/ItemRef.py:1.61 osaf/chandler/Chandler/repository/item/ItemRef.py:1.62
--- osaf/chandler/Chandler/repository/item/ItemRef.py:1.61	Mon Mar  8 14:56:52 2004
+++ osaf/chandler/Chandler/repository/item/ItemRef.py	Tue Mar 23 21:08:27 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.61 $"
-__date__      = "$Date: 2004/03/08 22:56:52 $"
+__revision__  = "$Revision: 1.62 $"
+__date__      = "$Date: 2004/03/24 05:08:27 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -132,19 +132,22 @@
         else:
             if other.isStale():
                 logger.error('Found stale item %s at %s of kind %s',
-                             other, other.getItemPath(),
-                             other._kind.getItemPath())
+                             other, other.itsPath,
+                             other._kind.itsPath)
                 return False
             else:
-                otherName = item.getAttributeAspect(name, 'otherName',
-                                                    default=None)
+                otherName = item.getAttributeAspect(name, 'otherName')
+                if otherName is None:
+                    logger.error('otherName is None for attribute %s.%s',
+                                 item._kind.itsPath, name)
+                    return False
                 otherOtherName = other.getAttributeAspect(otherName,
                                                           'otherName',
                                                           default=None)
                 if otherOtherName != name:
                     logger.error("otherName for attribute %s.%s, %s, does not match otherName for attribute %s.%s, %s",
-                                 item._kind.getItemPath(), name, otherName,
-                                 other._kind.getItemPath(), otherName,
+                                 item._kind.itsPath, name, otherName,
+                                 other._kind.itsPath, otherName,
                                  otherOtherName)
                     return False
 
@@ -181,7 +184,7 @@
             attrs['otherName'] = item._otherName(name)
 
         generator.startElement('ref', attrs)
-        generator.characters(other.getUUID().str64())
+        generator.characters(other._uuid.str64())
         generator.endElement('ref')
 
 
@@ -278,7 +281,7 @@
         super(UUIDStub, self).__init__()
 
         self.item = item
-        self.uuid = other.getUUID()
+        self.uuid = other._uuid
 
     def __repr__(self):
 
@@ -325,7 +328,7 @@
             
         if self.refName is None:
             if other is None:
-                raise ValueError, "refName to %s is unspecified, %s should be loaded before %s" %(self.spec, self.spec, item.getItemPath())
+                raise ValueError, "refName to %s is unspecified, %s should be loaded before %s" %(self.spec, self.spec, item.itsPath)
             else:
                 self.refName = other._refName(self.attrName)
 
@@ -511,7 +514,7 @@
     def __repr__(self):
 
         return '<%s: %s.%s.%s>' %(type(self).__name__,
-                                  self._getItem().getItemPath(),
+                                  self._getItem().itsPath,
                                   self._name, self._otherName)
 
     def __contains__(self, obj):
@@ -800,25 +803,25 @@
                 other = self[key]
             except DanglingRefError, e:
                 logger.error('DanglingRefError on %s.%s: %s',
-                             self._item.getItemPath(), self._name, e)
+                             self._item.itsPath, self._name, e)
                 return False
             except KeyError, e:
                 logger.error('KeyError on %s.%s: %s',
-                             self._item.getItemPath(), self._name, e)
+                             self._item.itsPath, self._name, e)
                 return False
             else:
                 if other.isStale():
                     logger.error('Found stale item %s at %s of kind %s',
-                                 other, other.getItemPath(),
-                                 other._kind.getItemPath())
+                                 other, other.itsPath,
+                                 other._kind.itsPath)
                     return False
                 else:
                     name = other.getAttributeAspect(self._otherName, 'otherName', default=None)
                     if name != self._name:
                         logger.error("OtherName for attribute %s.%s, %s, does not match otherName for attribute %s.%s, %s",
-                                     other._kind.getItemPath(),
+                                     other._kind.itsPath,
                                      self._otherName, name,
-                                     self._item._kind.getItemPath(),
+                                     self._item._kind.itsPath,
                                      self._name, self._otherName)
                         return False
                         
@@ -827,7 +830,7 @@
             
         if l != 0:
             logger.error("Iterator on %s.%s doesn't match length (%d left for %d total)",
-                         self._item.getItemPath(), self._name, l, len(self))
+                         self._item.itsPath, self._name, l, len(self))
             return False
 
         return True

Index: osaf/chandler/Chandler/repository/packs/schema/model/Item.kind
diff -u osaf/chandler/Chandler/repository/packs/schema/model/Item.kind:1.12 osaf/chandler/Chandler/repository/packs/schema/model/Item.kind:1.13
--- osaf/chandler/Chandler/repository/packs/schema/model/Item.kind:1.12	Mon Dec  8 11:19:04 2003
+++ osaf/chandler/Chandler/repository/packs/schema/model/Item.kind	Tue Mar 23 21:08:33 2004
@@ -14,32 +14,11 @@
       <ref alias="description" type="path">/Core/description</ref>
       <ref alias="issues" type="path">/Core/issues</ref>
       <ref alias="examples" type="path">/Core/examples</ref>
-
-      <!-- 
-         - plus local attributes below:
-         -     kind
-        -->
     </ref>
 
     <attribute name="classes" cardinality="dict" type="class">
       <value name="python">repository.item.Item.Item</value>
     </attribute>
-  </item>
-
-  <item withSchema="True">
-    <name>kind</name>
-    <kind type="path">//Schema/Core/Attribute</kind>
-    <class module="repository.schema.Attribute">Attribute</class>
-    <parent type="path">//Schema/Core/Item</parent>
-
-    <ref name="kinds" otherName="attributes"
-         cardinality="list" otherCard="list">
-      <ref type="path">..</ref>
-    </ref>
-
-    <attribute name="cardinality">single</attribute>
-    <attribute name="otherName">items</attribute>
-    <attribute name="persist" type="bool">False</attribute>
   </item>
 
 </items>

Index: osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind
diff -u osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind:1.21 osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind:1.22
--- osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind:1.21	Mon Dec  8 11:19:04 2003
+++ osaf/chandler/Chandler/repository/packs/schema/model/Kind.kind	Tue Mar 23 21:08:33 2004
@@ -13,7 +13,7 @@
       <!-- 
          - plus local attributes below:
          -     notFoundAttributes, inheritedAttributes,
-         -     superKinds, subKinds, items, attributes, classes, 
+         -     superKinds, subKinds, attributes, classes, 
          -     displayAttribute
         -->
     </ref>
@@ -90,22 +90,6 @@
 
     <attribute name="cardinality">list</attribute>
     <attribute name="otherName">superKinds</attribute>
-  </item>
-
-  <item withSchema="True">
-    <name>items</name>
-    <kind type="path">//Schema/Core/Attribute</kind>
-    <class module="repository.schema.Attribute">Attribute</class>
-    <parent type="path">//Schema/Core/Kind</parent>
-
-    <ref name="kinds" otherName="attributes"
-         cardinality="list" otherCard="list">
-      <ref type="path">..</ref>
-    </ref>
-
-    <attribute name="cardinality">list</attribute>
-    <attribute name="otherName">kind</attribute>
-    <attribute name="persist" type="bool">False</attribute>
   </item>
 
   <item withSchema="True">

Index: osaf/chandler/Chandler/repository/parcel/Util.py
diff -u osaf/chandler/Chandler/repository/parcel/Util.py:1.8 osaf/chandler/Chandler/repository/parcel/Util.py:1.9
--- osaf/chandler/Chandler/repository/parcel/Util.py:1.8	Mon Mar 22 13:51:56 2004
+++ osaf/chandler/Chandler/repository/parcel/Util.py	Tue Mar 23 21:08:37 2004
@@ -2,8 +2,8 @@
 Utility functions for displaying repository contents
 """
 
-__revision__  = "$Revision: 1.8 $"
-__date__      = "$Date: 2004/03/22 21:51:56 $"
+__revision__  = "$Revision: 1.9 $"
+__date__      = "$Date: 2004/03/24 05:08:37 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -24,20 +24,20 @@
         return
 
     if item.hasAttributeValue("kind"):
-        print "%s (Kind: %s)" % (uri, item.kind.getItemPath() )
+        print "%s (Kind: %s)" % (uri, item.itsKind.itsPath )
     else:
         print "%s" % (uri)
 
     # For Kinds, display their attributes (except for the internal ones
     # like notFoundAttributes:
     if item.hasAttributeValue("kind") and \
-     "//Schema/Core/Kind" == str(item.kind.getItemPath()):
+     "//Schema/Core/Kind" == str(item.itsKind.itsPath):
         for i in range(level+2):
             print " ",
         print "attributes:"
 
         displayedAttrs = { }
-        for (name,attr) in item.kind.iterAttributes():
+        for (name,attr) in item.itsKind.iterAttributes():
             if name == "attributes" or \
                name == "notFoundAttributes" or \
                name == "inheritedAttributes":
@@ -49,7 +49,7 @@
         for key in keys:
             for k in range(level+4):
                 print " ",
-            print "%s %s" % ( key, displayedAttrs[key].getItemPath() )
+            print "%s %s" % ( key, displayedAttrs[key].itsPath )
 
     displayedAttrs = { }
     for (name, value) in item.iterAttributeValues():
@@ -97,7 +97,7 @@
             for j in value:
                 for k in range(level+4):
                     print " ",
-                print j.getItemPath()
+                print j.itsPath
 
         else:
             for i in range(level+2):
@@ -105,7 +105,7 @@
 
             print "%s:" % name,
             try:
-                print value.getItemPath()
+                print value.itsPath
             except:
                 print value, type(value)
 
@@ -113,5 +113,5 @@
 
     if item.hasChildren():
         for child in item.iterChildren():
-            childuri = child.getItemPath()
+            childuri = child.itsPath
             PrintItem(childuri, rep, level+1)

Index: osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py
diff -u osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py:1.3 osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py:1.4
--- osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py:1.3	Thu Jan 15 18:56:38 2004
+++ osaf/chandler/Chandler/repository/parcel/tests/TestDependency.py	Tue Mar 23 21:08:44 2004
@@ -1,8 +1,8 @@
 """
 Dependency tests for Parcel Loader
 """
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/16 02:56:38 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:08:44 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -26,32 +26,32 @@
 
         # Ensure depA Parcel was created with the right Kind and attrs
         depA = self.rep.find("//parcels/depA")
-        self.assertEqual(depA.kind,
+        self.assertEqual(depA.itsKind,
          self.rep.find('//Schema/Core/Parcel'))
 
         # Ensure testKind was created with the right Kind
         testKind = self.rep.find("//parcels/depA/TestKind")
-        self.assertEqual(testKind.kind,
+        self.assertEqual(testKind.itsKind,
          self.rep.find('//Schema/Core/Kind'))
 
         # Ensure depB Parcel was created with the right Kind and attrs
         depB = self.rep.find("//parcels/depB")
-        self.assertEqual(depB.kind,
+        self.assertEqual(depB.itsKind,
          self.rep.find('//Schema/Core/Parcel'))
 
         # Ensure depC Parcel was created with the right Kind and attrs
         depC = self.rep.find("//parcels/depB/depC")
-        self.assertEqual(depC.kind,
+        self.assertEqual(depC.itsKind,
          self.rep.find('//Schema/Core/Parcel'))
 
         # Ensure testAttribute was created with the right Kind
         testAttribute = self.rep.find("//parcels/depB/depC/TestAttribute")
-        self.assertEqual(testAttribute.kind,
+        self.assertEqual(testAttribute.itsKind,
          self.rep.find('//Schema/Core/Attribute'))
 
         # Ensure testAttribute is an attribute of testKind (and vice-versa)
-        self.assert_(testKind.attributes.has_key(testAttribute.getUUID()))
-        self.assert_(testAttribute.kinds.has_key(testKind.getUUID()))
+        self.assert_(testKind.attributes.has_key(testAttribute.itsUUID))
+        self.assert_(testAttribute.kinds.has_key(testKind.itsUUID))
 
 if __name__ == "__main__":
     unittest.main()

Index: osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py
diff -u osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py:1.7 osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py:1.8
--- osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py:1.7	Mon Feb  2 11:41:30 2004
+++ osaf/chandler/Chandler/repository/parcel/tests/TestParcelLoader.py	Tue Mar 23 21:08:44 2004
@@ -1,8 +1,8 @@
 """
 Simple tests for Parcel Loader
 """
-__revision__  = "$Revision: 1.7 $"
-__date__      = "$Date: 2004/02/02 19:41:30 $"
+__revision__  = "$Revision: 1.8 $"
+__date__      = "$Date: 2004/03/24 05:08:44 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -28,7 +28,7 @@
 
         # Ensure the simple Parcel was created with the right Kind and attrs
         simpleParcel = self.rep.find("//parcels/simple")
-        self.assertEqual(simpleParcel.kind,
+        self.assertEqual(simpleParcel.itsKind,
          self.rep.find('//Schema/Core/Parcel'))
         self.assertEqual(simpleParcel.displayName, "Simple Parcel")
         self.assertEqual(simpleParcel.description, 
@@ -39,7 +39,7 @@
 
         # Ensure testAttribute was created with the right Kind and attrs
         testAttribute = self.rep.find("//parcels/simple/TestAttribute")
-        self.assertEqual(testAttribute.kind,
+        self.assertEqual(testAttribute.itsKind,
          self.rep.find('//Schema/Core/Attribute'))
         self.assertEqual(testAttribute.type, 
          self.rep.find('//Schema/Core/String'))
@@ -48,24 +48,24 @@
 
         # Ensure testKind was created with the right Kind and attrs
         testKind = self.rep.find("//parcels/simple/TestKind")
-        self.assertEqual(testKind.kind,
+        self.assertEqual(testKind.itsKind,
          self.rep.find('//Schema/Core/Kind'))
         self.assertEqual(testKind.displayName, "Test Kind")
         self.assertEqual(testKind.displayAttribute, "TestAttribute")
 
         # Ensure testAttribute is an attribute of testKind (and vice-versa)
-        self.assert_(testKind.attributes.has_key(testAttribute.getUUID()))
-        self.assert_(testAttribute.kinds.has_key(testKind.getUUID()))
+        self.assert_(testKind.attributes.has_key(testAttribute.itsUUID))
+        self.assert_(testAttribute.kinds.has_key(testKind.itsUUID))
 
         # Ensure subKind was created with the right Kind and attrs
         subKind = self.rep.find("//parcels/simple/SubKind")
-        self.assertEqual(subKind.kind,
+        self.assertEqual(subKind.itsKind,
          self.rep.find('//Schema/Core/Kind'))
         self.assertEqual(subKind.displayName, "Subclass Test Kind")
 
         # Ensure testKind and subKind have the correct inheritence links
-        self.assert_(subKind.superKinds.has_key(testKind.getUUID()))
-        self.assert_(testKind.subKinds.has_key(subKind.getUUID()))
+        self.assert_(subKind.superKinds.has_key(testKind.itsUUID))
+        self.assert_(testKind.subKinds.has_key(subKind.itsUUID))
 
 if __name__ == "__main__":
     unittest.main()

Index: osaf/chandler/Chandler/repository/persistence/DBContainer.py
diff -u osaf/chandler/Chandler/repository/persistence/DBContainer.py:1.7 osaf/chandler/Chandler/repository/persistence/DBContainer.py:1.8
--- osaf/chandler/Chandler/repository/persistence/DBContainer.py:1.7	Mon Mar  8 14:56:53 2004
+++ osaf/chandler/Chandler/repository/persistence/DBContainer.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.7 $"
-__date__      = "$Date: 2004/03/08 22:56:53 $"
+__revision__  = "$Revision: 1.8 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -162,7 +162,7 @@
             
         try:
             cursor = self.cursor()
-            key = item.getUUID()._uuid
+            key = item._uuid._uuid
 
             try:
                 value = cursor.set_range(key, flags=DB_DIRTY_READ)
@@ -183,11 +183,11 @@
 
         super(VerContainer, self).__init__(store, name, txn, create)
         if create:
-            self._db.put(Repository.ROOT_ID._uuid, pack('>l', ~0), txn)
+            self._db.put(Repository.itsUUID._uuid, pack('>l', ~0), txn)
 
     def getVersion(self):
 
-        return ~unpack('>l', self.get(Repository.ROOT_ID._uuid))[0]
+        return ~unpack('>l', self.get(Repository.itsUUID._uuid))[0]
 
     def setDocVersion(self, uuid, version, docId):
 

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py:1.9 osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py:1.10
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py:1.9	Wed Mar  3 15:38:26 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/calendar/Calendar.py	Tue Mar 23 21:07:09 2004
@@ -1,8 +1,8 @@
 """ Classes used for Calendar parcel kinds
 """
 
-__revision__  = "$Revision: 1.9 $"
-__date__      = "$Date: 2004/03/03 23:38:26 $"
+__revision__  = "$Revision: 1.10 $"
+__date__      = "$Date: 2004/03/24 05:07:09 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -24,19 +24,19 @@
 
     def _setUUIDs(self):
         calendarEventKind = self.find('CalendarEvent')
-        CalendarParcel.calendarEventKindID = calendarEventKind.getUUID()
+        CalendarParcel.calendarEventKindID = calendarEventKind.itsUUID
 
         locationKind = self.find('Location')
-        CalendarParcel.locationKindID = locationKind.getUUID()
+        CalendarParcel.locationKindID = locationKind.itsUUID
         
         calendarKind = self.find('Calendar')
-        CalendarParcel.calendarKindID = calendarKind.getUUID()
+        CalendarParcel.calendarKindID = calendarKind.itsUUID
         
         recurrenceKind = self.find('RecurrencePattern')
-        CalendarParcel.recurrencePatternKindID = recurrenceKind.getUUID()
+        CalendarParcel.recurrencePatternKindID = recurrenceKind.itsUUID
         
         reminderKind = self.find('Reminder')
-        CalendarParcel.reminderKindID = reminderKind.getUUID()
+        CalendarParcel.reminderKindID = reminderKind.itsUUID
 
     def onItemLoad(self):
         super(CalendarParcel, self).onItemLoad()

Index: osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py
diff -u osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py:1.30 osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py:1.31
--- osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py:1.30	Mon Mar  8 14:56:53 2004
+++ osaf/chandler/Chandler/repository/persistence/XMLRepositoryView.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.30 $"
-__date__      = "$Date: 2004/03/08 22:56:53 $"
+__revision__  = "$Revision: 1.31 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -42,16 +42,22 @@
         
         return False
 
+    def _newItems(self):
+
+        for item in self._log:
+            if item.isNew():
+                yield item
+
     def dirlog(self):
 
         for item in self._log:
-            print item.getItemPath()
+            print item.itsPath
 
     def cancel(self):
 
         for item in self._log:
             if item.isDeleted():
-                del self._deletedRegistry[item.getUUID()]
+                del self._deletedRegistry[item.itsUUID]
                 item._status &= ~Item.DELETED
             else:
                 item.setDirty(0)
@@ -172,10 +178,10 @@
 
                 newVersion = versions.getVersion()
                 if count > 0:
-                    lock = env.lock_get(self._lock_id, self.ROOT_ID._uuid,
+                    lock = env.lock_get(self._lock_id, self.itsUUID._uuid,
                                         DB_LOCK_WRITE)
                     newVersion += 1
-                    versions.put(self.ROOT_ID._uuid, pack('>l', ~newVersion))
+                    versions.put(self.itsUUID._uuid, pack('>l', ~newVersion))
 
                     ood = {}
                     for item in self._log:
@@ -287,7 +293,7 @@
 
         if isDebug:
             self.logger.debug('saving version %d of %s',
-                              newVersion, item.getItemPath())
+                              newVersion, item.itsPath)
 
         if uuid in ood:
             docId, oldDirty, newDirty = ood[uuid]
@@ -295,7 +301,7 @@
                          oldDirty, newDirty)
             if isDebug:
                 self.logger.debug('merging %s (%0.4x:%0.4x) with newest version',
-                                  item.getItemPath(), oldDirty, newDirty)
+                                  item.itsPath, oldDirty, newDirty)
         else:
             mergeWith = None
             
@@ -321,7 +327,7 @@
             raise
 
         if isDeleted:
-            parent=item.getItemParent().getUUID()
+            parent=item.itsParent.itsUUID
             versions.setDocVersion(uuid, newVersion, 0)
             history.writeVersion(uuid, newVersion, 0, item._status, parent)
             self._notifications.changed(uuid, 'deleted', parent=parent)
@@ -352,7 +358,7 @@
                         newDirty == item.VRDIRTY or oldDirty == item.VRDIRTY):
                         items[uuid] = (docId, oldDirty, newDirty)
                     else:
-                        raise NotImplementedError, 'Item %s may be mergeable but this particular merge (0x%x:0x%x) is not implemented yet' %(item.getItemPath(), newDirty, oldDirty)    
+                        raise NotImplementedError, 'Item %s may be mergeable but this particular merge (0x%x:0x%x) is not implemented yet' %(item.itsPath, newDirty, oldDirty)    
 
         history.apply(check, oldVersion, newVersion)
 
@@ -510,7 +516,7 @@
                         next = value._nextKey
                         alias = value._alias
     
-                        uuid = ref.other(self._item).getUUID()
+                        uuid = ref.other(self._item).itsUUID
                         self._writeRef(entry[1], version,
                                        uuid, previous, next, alias)
                         
@@ -589,8 +595,8 @@
             if self._indexed:
                 store._index.indexDocument(self._view._getIndexWriter(),
                                            self.getReader(),
-                                           self.getUUID(),
-                                           self._getItem().getUUID(),
+                                           uuid,
+                                           self._getItem().itsUUID,
                                            self._getAttribute(),
                                            self.getVersion())
             self._dirty = False

Index: osaf/chandler/Chandler/repository/schema/Kind.py
diff -u osaf/chandler/Chandler/repository/schema/Kind.py:1.56 osaf/chandler/Chandler/repository/schema/Kind.py:1.57
--- osaf/chandler/Chandler/repository/schema/Kind.py:1.56	Tue Mar 23 16:26:54 2004
+++ osaf/chandler/Chandler/repository/schema/Kind.py	Tue Mar 23 21:08:51 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.56 $"
-__date__      = "$Date: 2004/03/24 00:26:54 $"
+__revision__  = "$Revision: 1.57 $"
+__date__      = "$Date: 2004/03/24 05:08:51 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -50,7 +50,7 @@
         
         item = self.getItemClass()(name, parent, self)
         if self._kind is self:
-            superKind = self._kind.getItemParent().getItemChild('Item')
+            superKind = self._kind.itsParent.getItemChild('Item')
             item.addValue('superKinds', superKind)
 
         return item
@@ -66,7 +66,7 @@
 
         child = self.getItemChild(name)
         if child:
-            return child.getUUID()
+            return child.itsUUID
         
         if self.hasAttributeValue('attributes', _attrDict=self._references):
             return self.attributes.resolveAlias(name)
@@ -173,7 +173,7 @@
             return self.getAttributeValue('superKinds',
                                           _attrDict=self._references)
         except AttributeError:
-            raise ValueError, 'No superKind for %s' %(self.getItemPath())
+            raise ValueError, 'No superKind for %s' %(self.itsPath)
 
     def _xmlRefs(self, generator, withSchema, version, mode):
 
@@ -232,7 +232,7 @@
         if value is None:
             data = Kind.NoneString
         else:
-            data = value.getUUID().str64()
+            data = value.itsUUID.str64()
             
         generator.characters(data)
 
@@ -246,7 +246,7 @@
             return True
 
         if isinstance(value, SingleRef):
-            return self.getRepository()[value.getUUID()].isItemOf(self)
+            return self.getRepository()[value.itsUUID].isItemOf(self)
 
         if isinstance(value, Item):
             return value.isItemOf(self)

Index: osaf/chandler/Chandler/repository/schema/Types.py
diff -u osaf/chandler/Chandler/repository/schema/Types.py:1.55 osaf/chandler/Chandler/repository/schema/Types.py:1.56
--- osaf/chandler/Chandler/repository/schema/Types.py:1.55	Tue Jan 20 13:00:50 2004
+++ osaf/chandler/Chandler/repository/schema/Types.py	Tue Mar 23 21:08:51 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.55 $"
-__date__      = "$Date: 2004/01/20 21:00:50 $"
+__revision__  = "$Revision: 1.56 $"
+__date__      = "$Date: 2004/03/24 05:08:51 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -316,7 +316,7 @@
 
     def eval(self, value):
 
-        return self.getRepository()[value.getUUID()]
+        return self.getRepository()[value.itsUUID]
 
     def _compareTypes(self, other):
 
@@ -451,7 +451,7 @@
                 self._fieldXML(repository, value, fieldName, field, generator)
             generator.endElement('fields')
         else:
-            raise TypeError, 'Struct %s has no fields' %(self.getItemPath())
+            raise TypeError, 'Struct %s has no fields' %(self.itsPath)
     
     def _fieldXML(self, repository, value, fieldName, field, generator):
 

Index: osaf/chandler/Chandler/repository/tests/TestAlias.py
diff -u osaf/chandler/Chandler/repository/tests/TestAlias.py:1.2 osaf/chandler/Chandler/repository/tests/TestAlias.py:1.3
--- osaf/chandler/Chandler/repository/tests/TestAlias.py:1.2	Sun Mar 21 11:38:44 2004
+++ osaf/chandler/Chandler/repository/tests/TestAlias.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests for Aliases
 """
 
-__revision__  = "$Revision: 1.2 $"
-__date__      = "$Date: 2004/03/21 19:38:44 $"
+__revision__  = "$Revision: 1.3 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -27,7 +27,7 @@
 
         self.kind = self._find(self._KIND_KIND)
         self.itemKind = self._find(self._ITEM_KIND)
-        self.attrKind = self.itemKind.getAttribute('kind').kind
+        self.attrKind = self.itemKind.itsParent['Attribute']
         self.newKind = self.kind.newItem('newKind', self.rep)
         self.typeKind = self._find('//Schema/Core/Type')
 
@@ -54,7 +54,7 @@
         self.assert_(self.alias.type(1.43) is None)
         self.assert_(self.alias.type(2.4+8j) is None)
         self.assert_(self.alias.type(True) is None)
-        self.assert_(self.alias.type(self.alias.getUUID()) is None)
+        self.assert_(self.alias.type(self.alias.itsUUID) is None)
 
         self.assert_(self.alias.type(12) is not None)
         self.assert_(self.alias.type(self.dateTime) is not None)
@@ -64,7 +64,7 @@
         self.assert_(not self.alias.recognizes(1.43))
         self.assert_(not self.alias.recognizes(2.4+8j))
         self.assert_(not self.alias.recognizes(True))
-        self.assert_(not self.alias.recognizes(self.alias.getUUID()))
+        self.assert_(not self.alias.recognizes(self.alias.itsUUID))
 
         self.assert_(self.alias.recognizes(12))
         self.assert_(self.alias.recognizes(self.dateTime))

Index: osaf/chandler/Chandler/repository/tests/TestItems.py
diff -u osaf/chandler/Chandler/repository/tests/TestItems.py:1.8 osaf/chandler/Chandler/repository/tests/TestItems.py:1.9
--- osaf/chandler/Chandler/repository/tests/TestItems.py:1.8	Sun Mar 21 11:38:44 2004
+++ osaf/chandler/Chandler/repository/tests/TestItems.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Basic Unit tests for Chandler repository
 """
 
-__revision__  = "$Revision: 1.8 $"
-__date__      = "$Date: 2004/03/21 19:38:44 $"
+__revision__  = "$Revision: 1.9 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,8 +25,8 @@
         # Test getItemDisplayName
         self.assertEquals(kind.getItemDisplayName(), 'Item')
 
-        # Test getItemPath()
-        self.assertEquals(str(kind.getItemPath()), '//Schema/Core/Item')
+        # Test itsPath
+        self.assertEquals(str(kind.itsPath), '//Schema/Core/Item')
 
         # Test simple item construction
         item = Item('test', self.rep, kind)
@@ -78,8 +78,8 @@
 
         self.assertEqual(item.getItemChild('child1'), child1)
         self.assertEqual(item.getItemChild('child2'), child2)
-        self.assertEqual(child1.getItemParent(), item)
-        self.assertEqual(child2.getItemParent(), item)
+        self.assertEqual(child1.itsParent, item)
+        self.assertEqual(child2.itsParent, item)
 
         # Test iterating over child items
         iter = item.iterChildren()
@@ -98,13 +98,14 @@
         self.assert_(item.hasChild('child1'))
         self.assert_(item.hasChild('child2'))
 
-        # Test item renaming, getItemName
+        # Test item renaming, itsName
+        kind = self._find('//Schema/Core/Item')
         child3 = Item('busted', item, kind)
-        self.assertEqual(child3.getItemName(), 'busted')
-        child3.rename('busted')
-        self.assertEqual(child3.getItemName(), 'busted')
-        child3.rename('child3')
-        self.assertEqual(child3.getItemName(), 'child3')
+        self.assertEqual(child3.itsName, 'busted')
+        child3.itsName = 'busted'
+        self.assertEqual(child3.itsName, 'busted')
+        child3.itsName = 'child3'
+        self.assertEqual(child3.itsName, 'child3')
 
         # Test that placing affects iteration order
         item.placeChild(child3, child1)
@@ -112,20 +113,20 @@
         iter.next()
         self.assertEqual(child3, iter.next())
         self.assertItemPathEqual(child3, '//test/child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
 
         # Test item movement to same parent
-        oldParent = child3.getItemParent()
-        child3.move(child3.getItemParent())
-        self.assertEqual(oldParent, child3.getItemParent())
+        oldParent = child3.itsParent
+        child3.itsParent = child3.itsParent
+        self.assertEqual(oldParent, child3.itsParent)
         self.assertItemPathEqual(child3, '//test/child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
         
         # Test item movement to leaf item
-        child3.move(child2)
-        self.assertEqual(child2, child3.getItemParent())
+        child3.itsParent = child2
+        self.assertEqual(child2, child3.itsParent)
         self.assertItemPathEqual(child3, '//test/child2/child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
 
         # now write what we've done and read it back
         self._reopenRepository()
@@ -134,15 +135,15 @@
         child2 = item['child2']
         child3 = child2['child3']
 
-        self.assertEqual(child2, child3.getItemParent())
+        self.assertEqual(child2, child3.itsParent)
         self.assertItemPathEqual(child3, '//test/child2/child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
 
         # Test item movement to root
-        child3.move(self.rep)
+        child3.itsParent = self.rep
         self.assertIsRoot(child3)
         self.assertItemPathEqual(child3, '//child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
         
         # now write what we've done and read it back
         self._reopenRepository()
@@ -153,7 +154,7 @@
 
         self.assert_(child3 in self.rep.getRoots())
         self.assertItemPathEqual(child3, '//child3')
-        self.assertIsRoot(child3.getRoot())
+        self.assertIsRoot(child3.itsRoot)
 
     def testAttributeIteration(self):
         """Test iteration over attributes"""
@@ -170,8 +171,8 @@
             self.failUnless(kind.hasAttributeValue(i))
 
         # Test iterating over reference attributes
-        referenceAttributeNames = ['superKinds', 'attributes', 'kind',
-                                   'inheritedAttributes', 'items']
+        referenceAttributeNames = ['superKinds', 'attributes',
+                                   'inheritedAttributes']
         for i in kind.iterAttributeValues(referencesOnly=True):
             self.failUnless(i[0] in referenceAttributeNames)
             self.failUnless(isinstance(i[1], RefDict) or

Index: osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py
diff -u osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py:1.8 osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py:1.9
--- osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py:1.8	Sun Jan 11 22:28:50 2004
+++ osaf/chandler/Chandler/repository/tests/TestPersistentCollections.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests for persistent collections
 """
 
-__revision__  = "$Revision: 1.8 $"
-__date__      = "$Date: 2004/01/12 06:28:50 $"
+__revision__  = "$Revision: 1.9 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -65,7 +65,7 @@
         empNames = ['employee1','employee2','employee3','employee4']
         for e in empNames:
             emp = employeeKind.newItem(e, self.rep)
-            emps[str(emp.getUUID())] = emp
+            emps[str(emp.itsUUID)] = emp
 
         manager.employees = emps
         self._checkManagerAndEmployeesDict(manager, emps)
@@ -75,7 +75,7 @@
         emps = {}
         for e in empNames:
             emp = self._find(Path('//', e))
-            emps[str(emp.getUUID())] = emp
+            emps[str(emp.itsUUID)] = emp
         self._checkManagerAndEmployeesDict(manager,emps)
 
     def testPersistingPythonDictByUpdate(self):
@@ -88,7 +88,7 @@
         empNames = ['employee1','employee2','employee3','employee4']
         for e in empNames:
             emp = employeeKind.newItem(e, self.rep)
-            emps[str(emp.getUUID())] = emp
+            emps[str(emp.itsUUID)] = emp
 
         for k, v in emps.items():
             print k,v
@@ -103,7 +103,7 @@
         emps = {}
         for e in empNames:
             emp = self._find((Path('//', e)))
-            emps[str(emp.getUUID())] = emp
+            emps[str(emp.itsUUID)] = emp
         self._checkManagerAndEmployeesDict(manager,emps)
        
                   

Index: osaf/chandler/Chandler/repository/tests/TestTypes.py
diff -u osaf/chandler/Chandler/repository/tests/TestTypes.py:1.3 osaf/chandler/Chandler/repository/tests/TestTypes.py:1.4
--- osaf/chandler/Chandler/repository/tests/TestTypes.py:1.3	Thu Jan 22 17:32:20 2004
+++ osaf/chandler/Chandler/repository/tests/TestTypes.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests for Types
 """
 
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/23 01:32:20 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -27,7 +27,7 @@
 
         self.kind = self._find(self._KIND_KIND)
         self.itemKind = self._find(self._ITEM_KIND)
-        self.attrKind = self.itemKind.getAttribute('kind').kind
+        self.attrKind = self.itemKind.itsParent['Attribute']
         self.newKind = self.kind.newItem('newKind', self.rep)
         self.typeKind = self._find('//Schema/Core/Type')
 
@@ -99,8 +99,8 @@
         # create values
         typeStrings = { 'String':'abcde', 'Symbol':'str', 'Integer':'123',
                         'Long':'456', 'Float':'123.456', 'Complex':'(34.4+3j)',
-                        'Boolean':'True', 'UUID':str(self.attrKind.getUUID()),
-                        'SingleRef':str(self.attrKind.getUUID()),
+                        'Boolean':'True', 'UUID':str(self.attrKind.itsUUID),
+                        'SingleRef':str(self.attrKind.itsUUID),
                         'Path':'//Schema/Core/Item', 'NoneType':None,
                         'Class':'repository.item.Item.Item', 'Enumeration':'ref',
                         'Struct':'ref', 'DateTime':'2004-01-08 12:34:56.15',
@@ -122,7 +122,7 @@
         class myStruct(object):
             __slots__ = ('name', 'rank')
             
-        self.uuid = self.attrKind.getUUID()
+        self.uuid = self.attrKind.itsUUID
         self.uuidString = str(self.uuid)
         self.pathString = '//Schema/Core/Item'
         self.path = Path(self.pathString)
@@ -239,7 +239,7 @@
                        'NoneType':(None, [None]),
                        'Class': (self.itemClass, ['abcde']),
                        'Enumeration':('green', ['abcde']),
-#                       'Struct':(str(self.struct.getUUID()), ['abcde']),
+#                       'Struct':(str(self.struct.itsUUID), ['abcde']),
                        'DateTime':(self.dateTime,["abacde"]),
                        'DateTimeDelta':(self.dateTimeDelta, ["abcde"]),
                        'RelativeDateTime':(self.relativeDateTime, ["abcde"]),

Index: osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py
diff -u osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py:1.15 osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py:1.16
--- osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py:1.15	Tue Jan 20 16:03:09 2004
+++ osaf/chandler/Chandler/repository/tests/TestReferenceAttributes.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests for reference attributes
 """
 
-__revision__  = "$Revision: 1.15 $"
-__date__      = "$Date: 2004/01/21 00:03:09 $"
+__revision__  = "$Revision: 1.16 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -28,16 +28,16 @@
         self.assert_(item1 is not None)
 
         # check kind
-        self.assert_(kind1.kind is kind)
+        self.assert_(kind1.itsKind is kind)
         self.assert_(kind1 in kind.items)
 
         # check kind and otherName
-        self.assert_(item1.kind is itemKind)
+        self.assert_(item1.itsKind is itemKind)
         self.assert_(item1 in itemKind.items)
 
         # set kind Attribute (update bidirectional ref)
-        item1.kind = kind1
-        self.assert_(item1.kind is kind1)
+        item1.itsKind = kind1
+        self.assert_(item1.itsKind is kind1)
 
         # now test that  otherName side of kind now = items of kind1
         self.assert_(item1 in kind1.items)
@@ -47,10 +47,10 @@
         # create a third item and switch kind using __setattr__
         item2 = Item('item2', self.rep, itemKind)
         self.assert_(item2 is not None)
-        item2.kind = kind1
+        item2.itsKind = kind1
 
         # again, verify kind
-        self.assert_(item2.kind is kind1)
+        self.assert_(item2.itsKind is kind1)
 
         # now verify that otherName side of kind is list cardinality
         self.assertEquals(len(kind1.items), 2)
@@ -66,35 +66,29 @@
         item2 = self._find('//item2')
 
         # check kind
-        self.assert_(kind1.kind is kind)
+        self.assert_(kind1.itsKind is kind)
         self.assert_(kind1 in kind.items)
 
         # set kind Attribute (update bidirectional ref)
-        self.assert_(item1.kind is kind1)
+        self.assert_(item1.itsKind is kind1)
 
         # now test that otherName side of kind now = items of kind1
         self.assert_(item1 in kind1.items)
         # and verify item1 no longer in kind.items (old otherName)
         self.assert_(item1 not in kind.items)
         # again, verify kind
-        self.assert_(item2.kind is kind1)
+        self.assert_(item2.itsKind is kind1)
 
         # now verify that otherName side of kind is list cardinality
         self.assertEquals(len(kind1.items), 2)
         self.assert_(item1 in kind1.items)
         self.assert_(item2 in kind1.items)
 
-        # test removeAttributeValue
-        item2.removeAttributeValue('kind')
-        self.failUnlessRaises(AttributeError, lambda: item2.kind)
-        self.assertEquals(len(kind1.items), 1)
-        self.failIf(item2 in kind1.items)
-
         # now write what we've done and read it back
         self._reopenRepository()
         kind1 = self._find('//kind1')
         item2 = self._find('//item2')
-        self.failUnlessRaises(AttributeError, lambda: item2.kind)
+        self.failUnlessRaises(AttributeError, lambda: item2.itsKind)
         self.assertEquals(len(kind1.items), 1)
         self.failIf(item2 in kind1.items)
 
@@ -235,7 +229,7 @@
         self.assert_(itemKind is not None)
 
         item = Item('item1', self.rep, itemKind)
-        attrKind = itemKind.getAttribute('kind').kind
+        attrKind = itemKind.itsParent['Attribute']
 
         # subattributes are created by assigning the "parent" attribute
         # to the superAttribute attribute of the "child" attribute
@@ -261,12 +255,12 @@
         # now write what we've done and read it back
         self._reopenRepository()
         item = self._find('//item1')
-        itemKind = item.kind
+        itemKind = item.itsKind
         issuesAttr = itemKind.getAttribute('issues')
 
         attMap = {}
         for i in issuesAttr.subAttributes:
-            attMap[i.getItemName()] = i 
+            attMap[i.itsName] = i 
             
         criticalSubAttr = attMap['critical']
         normalSubAttr = attMap['normal']

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py:1.5 osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py:1.6
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py:1.5	Mon Feb  2 01:27:32 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/notes/Notes.py	Tue Mar 23 21:07:14 2004
@@ -1,8 +1,8 @@
 """ Classes used for Notes parcel kinds
 """
 
-__revision__  = "$Revision: 1.5 $"
-__date__      = "$Date: 2004/02/02 09:27:32 $"
+__revision__  = "$Revision: 1.6 $"
+__date__      = "$Date: 2004/03/24 05:07:14 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,10 +25,10 @@
 
     def _setUUIDs(self):
         noteKind = self.find('Note')
-        NotesParcel.noteKindID = noteKind.getUUID()
+        NotesParcel.noteKindID = noteKind.itsUUID
 
         conversationKind = self.find('Conversation')
-        NotesParcel.conversationKindID = conversationKind.getUUID()
+        NotesParcel.conversationKindID = conversationKind.itsUUID
 
     def getNoteKind(cls):
         assert cls.noteKindID, "Note parcel not yet loaded"

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py:1.10 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py:1.11
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py:1.10	Wed Jan 14 23:34:17 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContentModel.py	Tue Mar 23 21:07:15 2004
@@ -2,8 +2,8 @@
 Basic Unit tests for contentmodel
 """
 
-__revision__  = "$Revision: 1.10 $"
-__date__      = "$Date: 2004/01/15 07:34:17 $"
+__revision__  = "$Revision: 1.11 $"
+__date__      = "$Date: 2004/03/24 05:07:15 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -74,15 +74,15 @@
 
         # Check each item's parent, make sure it has a path
         contentItemParent = ContentModel.ContentModel.getContentItemParent()
-        self.assertEqual(genericContentItem.getItemParent(), contentItemParent)
-        self.assertEqual(genericProject.getItemParent(), contentItemParent)
-        self.assertEqual(genericGroup.getItemParent(), contentItemParent)
+        self.assertEqual(genericContentItem.itsParent, contentItemParent)
+        self.assertEqual(genericProject.itsParent, contentItemParent)
+        self.assertEqual(genericGroup.itsParent, contentItemParent)
         
-        self.assertEqual(repr(genericContentItem.getItemPath()),
+        self.assertEqual(repr(genericContentItem.itsPath),
                          '//userdata/contentitems/genericContentItem')
-        self.assertEqual(repr(genericProject.getItemPath()),
+        self.assertEqual(repr(genericProject.itsPath),
                          '//userdata/contentitems/genericProject')
-        self.assertEqual(repr(genericGroup.getItemPath()),
+        self.assertEqual(repr(genericGroup.itsPath),
                          '//userdata/contentitems/genericGroup')
 
         # These attributes should be empty, but should not be missing

Index: osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py:1.14 osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py:1.15
--- osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py:1.14	Mon Feb 16 08:30:50 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Instruction.py	Tue Mar 23 21:07:34 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.14 $"
-__date__      = "$Date: 2004/02/16 16:30:50 $"
+__revision__  = "$Revision: 1.15 $"
+__date__      = "$Date: 2004/03/24 05:07:34 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -99,9 +99,9 @@
                 # agent.MakeTask(action, notification)
                 pass
             elif action.UseWxThread() or action.NeedsConfirmation():
-                actionProxy = DeferredAction(action.getUUID())
+                actionProxy = DeferredAction(action.itsUUID)
 
-                lock = Globals.wxApplication.PostAsyncEvent(actionProxy.Execute, agent.getUUID(), notification)
+                lock = Globals.wxApplication.PostAsyncEvent(actionProxy.Execute, agent.itsUUID, notification)
                 #while lock.locked():
                 #    yield 'wait', 1.0
                 #yield 'go', 0
@@ -112,7 +112,7 @@
                 result = action.Execute(agent, notification)
 
             end = time.clock() - start
-            actionID = action.getUUID()
+            actionID = action.itsUUID
             """
             if not self.hasAttributeValue('timers'):
                 self.timers = {}

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py:1.20 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py:1.21
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py:1.20	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/Block.py	Tue Mar 23 21:07:47 2004
@@ -73,7 +73,7 @@
         wxApplication keeps a list, named commandIDs with allows us to
         look up the UUID of a block given it's Id -- DJA
         """
-        UUID = object.getUUID()
+        UUID = object.itsUUID
         try:
             id = Block.UUIDtoIds [UUID]
         except KeyError:
@@ -88,7 +88,7 @@
 
     def update (self):
         try:
-            theWindow = Globals.association[self.getUUID()]
+            theWindow = Globals.association[self.itsUUID]
         except KeyError:
             pass
         else:
@@ -112,7 +112,7 @@
         counterparts.
         """
         try:
-            theWindow = Globals.association[self.getUUID()]
+            theWindow = Globals.association[self.itsUUID]
             method = getattr (theWindow, 'wxSynchronizeFramework')
         except AttributeError:
             pass
@@ -133,7 +133,7 @@
         given the block we can find the associated wxWindows object.
         """
         if window:
-            UUID = self.getUUID()
+            UUID = self.itsUUID
             """
               Currently not all wxWindows counterpart objects have a __del__
             funcation to removed themselves from the association when they
@@ -143,9 +143,9 @@
             assert not Globals.association.has_key(UUID)
             """
             if __debug__ and Globals.association.has_key(UUID):
-                Globals.repository.find (UUID).getItemPath()
+                Globals.repository.find (UUID).itsPath
                 logging.warn("Bug #1177: item %s doesn't remove it's counterpart from the association",
-                             str (Globals.repository.find (UUID).getItemPath()))
+                             str (Globals.repository.find (UUID).itsPath))
             Globals.association[UUID] = window
             window.counterpartUUID = UUID
             """

Index: osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py
diff -u osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py:1.11 osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py:1.12
--- osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py:1.11	Fri Feb 13 18:54:20 2004
+++ osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/RSSData.py	Tue Mar 23 21:07:18 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.11 $"
-__date__      = "$Date: 2004/02/14 02:54:20 $"
+__revision__  = "$Revision: 1.12 $"
+__date__      = "$Date: 2004/03/24 05:07:18 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -23,10 +23,10 @@
     def _setUUIDs(self, parent):
 
         # hackery to avoid threading conflicts
-        ZaoBaoParcel.RSSItemParentID = parent.getUUID()
+        ZaoBaoParcel.RSSItemParentID = parent.itsUUID
         
-        ZaoBaoParcel.RSSChannelKindID = self.find('RSSChannel').getUUID()
-        ZaoBaoParcel.RSSItemKindID = self.find('RSSItem').getUUID()
+        ZaoBaoParcel.RSSChannelKindID = self.find('RSSChannel').itsUUID
+        ZaoBaoParcel.RSSItemKindID = self.find('RSSItem').itsUUID
 
     def onItemLoad(self):
         super(ZaoBaoParcel, self).onItemLoad()

Index: osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py:1.8 osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py:1.9
--- osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py:1.8	Thu Jan 15 17:25:18 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentThread.py	Tue Mar 23 21:07:21 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.8 $"
-__date__      = "$Date: 2004/01/16 01:25:18 $"
+__revision__  = "$Revision: 1.9 $"
+__date__      = "$Date: 2004/03/24 05:07:21 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -65,7 +65,7 @@
           return all the instructions
         """
         instructions = []
-        matchingInstructions = self.instructionMap[event.getUUID()]
+        matchingInstructions = self.instructionMap[event.itsUUID]
 
         for instruction in matchingInstructions:
             if instruction.IsEnabled():
@@ -117,7 +117,7 @@
     for instruction in instructions:
         notifications = instruction.GetNotifications()
         for notification in notifications:
-            nID = notification.getUUID()
+            nID = notification.itsUUID
             if instructionMap.has_key(nID):
                 instructionMap[nID].append(instruction)
             else:

Index: osaf/chandler/Chandler/repository/persistence/PackHandler.py
diff -u osaf/chandler/Chandler/repository/persistence/PackHandler.py:1.13 osaf/chandler/Chandler/repository/persistence/PackHandler.py:1.14
--- osaf/chandler/Chandler/repository/persistence/PackHandler.py:1.13	Fri Dec 12 22:55:26 2003
+++ osaf/chandler/Chandler/repository/persistence/PackHandler.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.13 $"
-__date__      = "$Date: 2003/12/13 06:55:26 $"
+__revision__  = "$Revision: 1.14 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -74,7 +74,7 @@
 
         if not attrs.has_key('file'):
             itemKind = self.repository.find('Schema/Core/Item')
-            self.pack._setKind(itemKind)
+            self.pack._kind = itemKind         #kludge
             self.pack.description = self.path
 
     def cwdStart(self, attrs):

Index: osaf/chandler/Chandler/repository/persistence/Repository.py
diff -u osaf/chandler/Chandler/repository/persistence/Repository.py:1.68 osaf/chandler/Chandler/repository/persistence/Repository.py:1.69
--- osaf/chandler/Chandler/repository/persistence/Repository.py:1.68	Mon Mar  8 14:56:53 2004
+++ osaf/chandler/Chandler/repository/persistence/Repository.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.68 $"
-__date__      = "$Date: 2004/03/08 22:56:53 $"
+__revision__  = "$Revision: 1.69 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,7 +25,7 @@
     "Another thread changed %s and saved those changes before this thread got a chance to do so. These changes conflict with this thread's changes, the item cannot be saved."
 
     def __str__(self):
-        return self.__doc__ %(self.args[0].getItemPath())
+        return self.__doc__ %(self.args[0].itsPath)
 
     def getItem(self):
         return self.args[0]
@@ -178,10 +178,6 @@
 
         return self.view.check()
 
-    def getUUID(self):
-
-        return Repository.ROOT_ID
-
     def addNotificationCallback(self, fn):
 
         self._notifications.append(fn)
@@ -193,7 +189,7 @@
         except ValueError:
             return None
 
-    ROOT_ID = UUID('3631147e-e58d-11d7-d3c2-000393db837c')
+    itsUUID = UUID('3631147e-e58d-11d7-d3c2-000393db837c')
     OPEN = 0x1
     view = property(_getView)
 
@@ -329,7 +325,7 @@
                              load=load)
 
         elif isinstance(spec, UUID):
-            if spec == self.ROOT_ID:
+            if spec == self.itsUUID:
                 return self
             else:
                 try:
@@ -372,7 +368,7 @@
             for root in self.getRoots():
                 self.dir(root, path)
         else:
-            path.append(item.getItemName())
+            path.append(item.itsName)
             print path
             for child in item:
                 self.dir(child, path)
@@ -457,7 +453,7 @@
     def __getitem__(self, key):
 
         if isinstance(key, UUID):
-            if key == self.ROOT_ID:
+            if key == self.itsUUID:
                 return self
             else:
                 try:
@@ -489,7 +485,7 @@
 
         return self._roots.values()
 
-    def getItemPath(self, path=None):
+    def _getPath(self, path=None):
         'Return the path of the repository relative to its item, always //.'
 
         if path is None:
@@ -510,7 +506,7 @@
 
     def _addItem(self, item, previous=None, next=None):
 
-        name = item.getItemName()
+        name = item.itsName
 
         if name in self._roots:
             raise ValueError, "A root named '%s' exists already" %(name)
@@ -521,7 +517,7 @@
 
     def _removeItem(self, item):
 
-        del self._roots[item.getItemName()]
+        del self._roots[item.itsName]
 
     def _unloadChild(self, name):
 
@@ -529,7 +525,7 @@
 
     def _registerItem(self, item):
 
-        uuid = item.getUUID()
+        uuid = item.itsUUID
 
         old = self._registry.get(uuid)
         if old and old is not item:
@@ -543,7 +539,7 @@
 
     def _unregisterItem(self, item):
 
-        uuid = item.getUUID()
+        uuid = item.itsUUID
         del self._registry[uuid]
         if item.isDeleting():
             self._deletedRegistry[uuid] = uuid
@@ -569,14 +565,21 @@
     def _loadChild(self, parent, name):
         raise NotImplementedError, "RepositoryView._loadChild"
 
+    def _newItems(self):
+        raise NotImplementedError, "RepositoryView._newItems"
+
     def _addStub(self, stub):
 
         if not self.isLoading():
             self._stubs.append(stub)
 
-    def getUUID(self):
+    def __getUUID(self):
 
-        return Repository.ROOT_ID
+        return Repository.itsUUID
+
+    def __getName(self):
+
+        return "Repository"
 
     def getLogger(self):
 
@@ -586,7 +589,11 @@
 
         return self.repository.logger.getEffectiveLevel() <= logging.DEBUG
 
-    ROOT_ID = property(getUUID)
+    itsUUID = property(__getUUID)
+    itsName = property(__getName)
+    itsPath = property(_getPath)
+    itsParent = None
+    
     logger = property(getLogger)
     debug = property(isDebug)
 
@@ -697,7 +704,7 @@
 
             if self.isDebug():
                 self.logger.debug("loaded version %d of %s",
-                                  item._version, item.getItemPath())
+                                  item._version, item.itsPath)
 
         except:
             if not loading:
@@ -743,9 +750,9 @@
     def _loadChild(self, parent, name):
 
         if parent is not None and parent is not self:
-            uuid = parent.getUUID()
+            uuid = parent.itsUUID
         else:
-            uuid = self.ROOT_ID
+            uuid = self.itsUUID
 
         store = self.repository.store
         doc = store.loadChild(self.version, uuid, name)
@@ -758,7 +765,7 @@
                 if self.isDebug():
                     if parent is not None and parent is not self:
                         self.logger.debug("loading child %s of %s",
-                                          name, parent.getItemPath())
+                                          name, parent.itsPath)
                     else:
                         self.logger.debug("loading root %s", name)
                     
@@ -789,7 +796,7 @@
 
         super(OnDemandRepositoryView, self)._addItem(item, previous, next)
 
-        name = item.getItemName()
+        name = item.itsName
         if name in self._notRoots:
             del self._notRoots[name]
 
@@ -799,7 +806,7 @@
 
         super(OnDemandRepositoryView, self)._removeItem(item)
 
-        name = item.getItemName()
+        name = item.itsName
         self._notRoots[name] = name
 
     def getRoot(self, name, load=True):

Index: osaf/chandler/Chandler/repository/schema/Alias.py
diff -u osaf/chandler/Chandler/repository/schema/Alias.py:1.4 osaf/chandler/Chandler/repository/schema/Alias.py:1.5
--- osaf/chandler/Chandler/repository/schema/Alias.py:1.4	Mon Dec  8 11:19:07 2003
+++ osaf/chandler/Chandler/repository/schema/Alias.py	Tue Mar 23 21:08:51 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.4 $"
-__date__      = "$Date: 2003/12/08 19:19:07 $"
+__revision__  = "$Revision: 1.5 $"
+__date__      = "$Date: 2004/03/24 05:08:51 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -45,4 +45,4 @@
                 t.typeXML(value, generator)
                 return
 
-        raise ValueError, "value '%s' of type '%s' unrecognized by %s" %(value, type(value), self.getItemPath())
+        raise ValueError, "value '%s' of type '%s' unrecognized by %s" %(value, type(value), self.itsPath)

Index: osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py
diff -u osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py:1.6 osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py:1.7
--- osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py:1.6	Sun Jan 11 22:28:50 2004
+++ osaf/chandler/Chandler/repository/tests/TestLiteralAttributes.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests literal attributes
 """
 
-__revision__  = "$Revision: 1.6 $"
-__date__      = "$Date: 2004/01/12 06:28:50 $"
+__revision__  = "$Revision: 1.7 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -94,7 +94,7 @@
         myKind = kind.newItem('listKind', self.rep)
                                                                   
         # create an attribute with cardinality list and add to the kind
-        attrKind = itemKind.getAttribute('kind').kind             
+        attrKind = itemKind.itsParent['Attribute']
         multiAttribute = Attribute('strings', myKind, attrKind)   
         multiAttribute.cardinality = 'list'
         myKind.addValue('attributes', multiAttribute)             
@@ -182,7 +182,7 @@
         myKind = kind.newItem('dictKind', self.rep)
                                                                   
         # create an attribute with cardinality dict and add to the kind
-        attrKind = itemKind.getAttribute('kind').kind
+        attrKind = itemKind.itsParent['Attribute']
         multiAttribute = Attribute('strings', myKind, attrKind)
         multiAttribute.cardinality = 'dict'
         myKind.addValue('attributes', multiAttribute)

Index: osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py
diff -u osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py:1.14 osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py:1.15
--- osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py:1.14	Mon Mar  8 14:56:54 2004
+++ osaf/chandler/Chandler/repository/tests/TestPerfWithRSS.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Simple Performance tests for Chandler repository
 """
 
-__revision__  = "$Revision: 1.14 $"
-__date__      = "$Date: 2004/03/08 22:56:54 $"
+__revision__  = "$Revision: 1.15 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -123,7 +123,7 @@
             if not item:
                 item = chanKind.newItem(urlhash, parent)
                 item.url = url
-            feeds.append(item.getUUID())
+            feeds.append(item.itsUUID)
 
         return feeds
 
@@ -136,7 +136,7 @@
     def _readItems(self, kind):
         items = KindQuery().run([kind]) 
         for i in items:
-            assert(i.getItemName() is not None)
+            assert(i.itsName is not None)
 
 #    def testReadBackRSS(self):
 #        self._stressTest()
@@ -144,9 +144,9 @@
 #        self.rep = XMLRepository(os.path.join(self.testdir, '__repository__'))
 #        self.rep.open()
 #        RSSItem = self.rep.find('//parcels/OSAF/examples/zaobao/RSSItem')
-#        self._readItems(RSSItem.kind)
+#        self._readItems(RSSItem.itsKind)
 #        profiler = hotshot.Profile('/tmp/TestPerfWithRss.readBack.hotshot')
-#        profiler.runcall(TestPerfWithRSS._readItems, self, RSSItem.kind)
+#        profiler.runcall(TestPerfWithRSS._readItems, self, RSSItem.itsKind)
 #        profiler.close()
 
     def tearDown(self):

Index: osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py:1.17 osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py:1.18
--- osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py:1.17	Tue Nov 25 10:19:23 2003
+++ osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/Action.py	Tue Mar 23 21:07:34 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.17 $"
-__date__      = "$Date: 2003/11/25 18:19:23 $"
+__revision__  = "$Revision: 1.18 $"
+__date__      = "$Date: 2004/03/24 05:07:34 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -37,7 +37,7 @@
         return self.confirmFlag
     
     def GetName(self):
-        return self.getItemName()
+        return self.itsName
 
     def _ImportClasses(self, importPaths):
         '''
@@ -88,7 +88,7 @@
                 result = methodObject(instance)
             else:
                 # FIXME: should probably throw an exception here
-                print "unknown action type", agent.getItemName(), self.GetName(), self.actionType
+                print "unknown action type", agent.itsName, self.GetName(), self.actionType
         except:
             print "failed to execute action", self.GetName()
 
@@ -122,7 +122,7 @@
         else:
             message = _('Agent [agentname] needs your permission.  Do you grant it?')
 
-        message = message.replace('[agentname]', agent.getItemName())
+        message = message.replace('[agentname]', agent.itsName)
         return message
 
     def Execute(self, agentID, notification):

Index: osaf/chandler/Chandler/application/Application.py
diff -u osaf/chandler/Chandler/application/Application.py:1.212 osaf/chandler/Chandler/application/Application.py:1.213
--- osaf/chandler/Chandler/application/Application.py:1.212	Sat Mar 20 15:22:02 2004
+++ osaf/chandler/Chandler/application/Application.py	Tue Mar 23 21:07:08 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.212 $"
-__date__ = "$Date: 2004/03/20 23:22:02 $"
+__version__ = "$Revision: 1.213 $"
+__date__ = "$Date: 2004/03/24 05:07:08 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -262,7 +262,7 @@
                                        style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
             Globals.mainView = mainView
             self.menuParent = None
-            self.mainFrame.counterpartUUID = mainView.getUUID()
+            self.mainFrame.counterpartUUID = mainView.itsUUID
             EVT_SIZE(self.mainFrame, self.mainFrame.OnSize)
 
             GlobalEvents = Globals.repository.find('//parcels/OSAF/framework/blocks/Events/GlobalEvents')

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py:1.6 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py:1.7
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py:1.6	Fri Jan 16 18:40:42 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestNotes.py	Tue Mar 23 21:07:15 2004
@@ -2,8 +2,8 @@
 Unit tests for notes parcel
 """
 
-__revision__  = "$Revision: 1.6 $"
-__date__      = "$Date: 2004/01/17 02:40:42 $"
+__revision__  = "$Revision: 1.7 $"
+__date__      = "$Date: 2004/03/24 05:07:15 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -43,8 +43,8 @@
         conversationItem = Notes.Conversation("conversationItem")
 
         # Double check kinds
-        self.assertEqual(noteItem.kind, Notes.NotesParcel.getNoteKind())
-        self.assertEqual(conversationItem.kind,
+        self.assertEqual(noteItem.itsKind, Notes.NotesParcel.getNoteKind())
+        self.assertEqual(conversationItem.itsKind,
                          Notes.NotesParcel.getConversationKind())
 
         # Literal properties

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py:1.3 osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py:1.4
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py:1.3	Mon Feb  2 01:27:31 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/mail/Mail.py	Tue Mar 23 21:07:12 2004
@@ -1,8 +1,8 @@
 """ Classes used for Mail parcel kinds
 """
 
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/02/02 09:27:31 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:07:12 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,16 +25,16 @@
 
     def _setUUIDs(self):
         attachmentKind = self.find('Attachment')
-        MailParcel.attachmentKindID = attachmentKind.getUUID()
+        MailParcel.attachmentKindID = attachmentKind.itsUUID
         
         emailAccountKind = self.find('EmailAccount')
-        MailParcel.emailAccountKindID = emailAccountKind.getUUID()
+        MailParcel.emailAccountKindID = emailAccountKind.itsUUID
         
         emailAddressKind = self.find('EmailAddress')
-        MailParcel.emailAddressKindID = emailAddressKind.getUUID()
+        MailParcel.emailAddressKindID = emailAddressKind.itsUUID
         
         mailMessageKind = self.find('MailMessage')
-        MailParcel.mailMessageKindID = mailMessageKind.getUUID()
+        MailParcel.mailMessageKindID = mailMessageKind.itsUUID
 
     def getAttachmentKind(cls):
         assert cls.attachmentKindID, "Mail parcel not yet loaded"

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py:1.4 osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py:1.5
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py:1.4	Wed Jan 14 23:34:17 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/tests/TestContacts.py	Tue Mar 23 21:07:15 2004
@@ -2,8 +2,8 @@
 Unit tests for contacts
 """
 
-__revision__  = "$Revision: 1.4 $"
-__date__      = "$Date: 2004/01/15 07:34:17 $"
+__revision__  = "$Revision: 1.5 $"
+__date__      = "$Date: 2004/03/24 05:07:15 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -51,15 +51,15 @@
         phoneNumberItem = Contacts.PhoneNumber("phoneNumberItem")
 
         # Double check kinds
-        self.assertEqual(contactItem.kind,
+        self.assertEqual(contactItem.itsKind,
                          Contacts.ContactsParcel.getContactKind())
-        self.assertEqual(contactSectionItem.kind,
+        self.assertEqual(contactSectionItem.itsKind,
                          Contacts.ContactsParcel.getContactSectionKind())
-        self.assertEqual(contactNameItem.kind,
+        self.assertEqual(contactNameItem.itsKind,
                          Contacts.ContactsParcel.getContactNameKind())
-        self.assertEqual(streetAddressItem.kind,
+        self.assertEqual(streetAddressItem.itsKind,
                          Contacts.ContactsParcel.getStreetAddressKind())
-        self.assertEqual(phoneNumberItem.kind,
+        self.assertEqual(phoneNumberItem.itsKind,
                          Contacts.ContactsParcel.getPhoneNumberKind())
 
         # Literal properties

Index: osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py:1.22 osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py:1.23
--- osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py:1.22	Fri Jan  9 11:45:33 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/agents/AgentManager.py	Tue Mar 23 21:07:20 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.22 $"
-__date__      = "$Date: 2004/01/09 19:45:33 $"
+__revision__  = "$Revision: 1.23 $"
+__date__      = "$Date: 2004/03/24 05:07:20 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -41,7 +41,7 @@
 
     def _BuildMap(self):
         for item in self.agentIndex.items:
-            agentID = item.getUUID()
+            agentID = item.itsUUID
             if not self.agentMap.has_key(agentID):
                 self.agentMap[agentID] = Agent.Agent(agentID)
 
@@ -56,7 +56,7 @@
         self.agentIndex.append(agentItem)
         agentItem.getRepository().commit()
 
-        agentID = agentItem.getUUID()
+        agentID = agentItem.itsUUID
         self.agentMap[agentID] = Agent.Agent(agentID)
 
     def Unregister(self, agentItem):
@@ -67,7 +67,7 @@
         self.agentIndex.removeValue('items', agentItem)
         agentItem.getRepository().commit()
 
-        agentID = agentItem.getUUID()
+        agentID = agentItem.itsUUID
         del self.agentMap[agentID]
 
     def AgentMatches(self, agent, name, role, owner):

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py:1.6 osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py:1.7
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py:1.6	Mon Feb  2 01:27:29 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/ContentModel.py	Tue Mar 23 21:07:09 2004
@@ -1,8 +1,8 @@
 """ Classes used for contentmodel parcel and kinds.
 """
 
-__revision__  = "$Revision: 1.6 $"
-__date__      = "$Date: 2004/02/02 09:27:29 $"
+__revision__  = "$Revision: 1.7 $"
+__date__      = "$Date: 2004/03/24 05:07:09 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,10 +25,10 @@
         Parcel.Parcel.__init__(self, name, parent, kind)
 
     def _setUUIDs(self, parent):
-        ContentModel.contentItemParentID = parent.getUUID()
-        ContentModel.contentItemKindID = self.find('ContentItem').getUUID()
-        ContentModel.projectKindID = self.find('Project').getUUID()
-        ContentModel.groupKindID = self.find('Group').getUUID()
+        ContentModel.contentItemParentID = parent.itsUUID
+        ContentModel.contentItemKindID = self.find('ContentItem').itsUUID
+        ContentModel.projectKindID = self.find('Project').itsUUID
+        ContentModel.groupKindID = self.find('Group').itsUUID
 
     def onItemLoad(self):
         super(ContentModel, self).onItemLoad()

Index: osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py:1.18 osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py:1.19
--- osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py:1.18	Mon Feb 16 23:23:33 2004
+++ osaf/chandler/Chandler/parcels/OSAF/examples/zaobao/blocks.py	Tue Mar 23 21:07:18 2004
@@ -1,8 +1,8 @@
 """ ZaoBao blocks
 """
 
-__version__ = "$Revision: 1.18 $"
-__date__ = "$Date: 2004/02/17 07:23:33 $"
+__version__ = "$Revision: 1.19 $"
+__date__ = "$Date: 2004/03/24 05:07:18 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -28,12 +28,12 @@
 
 class ZaoBaoListDelegate:
     def ElementParent(self, element):
-        if element.kind == RSSData.ZaoBaoParcel.getRSSChannelKind():
+        if element.itsKind is RSSData.ZaoBaoParcel.getRSSChannelKind():
             return None
         return element.channel
 
     def ElementChildren(self, element):
-        if element.kind == RSSData.ZaoBaoParcel.getRSSChannelKind():
+        if element.itsKind is RSSData.ZaoBaoParcel.getRSSChannelKind():
             return element.items
         return None
 
@@ -41,12 +41,12 @@
         return GetElementCellValues(element)
 
     def ElementHasChildren(self, element):
-        if element.kind == RSSData.ZaoBaoParcel.getRSSChannelKind():
+        if element.itsKind is RSSData.ZaoBaoParcel.getRSSChannelKind():
             return len(element.getAttributeValue('items', default=[])) != 0
         return False
 
     def NeedsUpdate(self, notification):
-        chanUUID = Globals.repository[self.counterpartUUID].rootPath.getUUID()
+        chanUUID = Globals.repository[self.counterpartUUID].rootPath.itsUUID
         changedUUID = notification.data['uuid']
         if chanUUID == changedUUID:
             self.scheduleUpdate = True
@@ -56,7 +56,7 @@
         chanKind = RSSData.ZaoBaoParcel.getRSSChannelKind()
         if element == chanKind:
             return None
-        if element.kind == chanKind:
+        if element.itsKind is chanKind:
             return chanKind
         return element.channel
 
@@ -66,7 +66,7 @@
         if element == chanKind:
             return KindQuery().run([chanKind])
 
-        if element.kind == chanKind:
+        if element.itsKind is chanKind:
             return element.items
 
         return None
@@ -79,14 +79,14 @@
         if element == chanKind:
             return True
 
-        if element.kind == chanKind:
+        if element.itsKind is chanKind:
             return len(element.getAttributeValue('items', default=[])) != 0
 
         return False
 
     def NeedsUpdate(self, notification):
         item = Globals.repository.find(notification.data['uuid'])
-        if item.kind == RSSData.ZaoBaoParcel.getRSSChannelKind():
+        if item.itsKind is RSSData.ZaoBaoParcel.getRSSChannelKind():
             self.scheduleUpdate = True
 
 

Index: osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py:1.15 osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py:1.16
--- osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py:1.15	Tue Feb  3 14:18:03 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/agents/schema/AgentItem.py	Tue Mar 23 21:07:34 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.15 $"
-__date__      = "$Date: 2004/02/03 22:18:03 $"
+__revision__  = "$Revision: 1.16 $"
+__date__      = "$Date: 2004/03/24 05:07:34 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -68,7 +68,7 @@
         """
           Subscribe to the notifications used by the active instructions 
         """
-        clientID = self.getUUID()
+        clientID = self.itsUUID
         notifications = self._GetActiveNotifications()
         Globals.notificationManager.Subscribe(notifications, clientID, callback)
 
@@ -76,7 +76,7 @@
         """
           Unsubscribe from the notifications used by the active instructions 
         """
-        clientID = self.getUUID()
+        clientID = self.itsUUID
         Globals.notificationManager.Unsubscribe(clientID)
 
 
@@ -104,13 +104,13 @@
         return self.getValue('status', attribute, 0)
  
     def DumpStatus(self):
-        print self.getItemName()
+        print self.itsName
         instructions = self.instructions
         for instruction in instructions:
             print "- Instruction"
             actions = instruction.GetActions()
             for action in actions:
-                print "  -", action.GetName(), "[" + str(action.GetCompletionPercentage()) + "%]", instruction.GetMagicNumber(action.getUUID())
+                print "  -", action.GetName(), "[" + str(action.GetCompletionPercentage()) + "%]", instruction.GetMagicNumber(action.itsUUID)
 
     def _CalculateBusyness(self):
         # returns the average magic number of all the agent's actions
@@ -120,7 +120,7 @@
         for instruction in instructions:
             actions = instruction.GetActions()
             for action in actions:
-                n += instruction.GetMagicNumber(action.getUUID())
+                n += instruction.GetMagicNumber(action.itsUUID)
                 i += 1
         if i == 0:
             return 0.0

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py:1.70 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py:1.71
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py:1.70	Sat Mar 20 15:22:01 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/ContainerBlocks.py	Tue Mar 23 21:07:47 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.70 $"
-__date__ = "$Date: 2004/03/20 23:22:01 $"
+__version__ = "$Revision: 1.71 $"
+__date__ = "$Date: 2004/03/24 05:07:47 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -88,14 +88,14 @@
             newChild = node.item
             if isinstance(newChild, Block):
                 try:
-                    embeddedPanel = Globals.association [self.getUUID()]
+                    embeddedPanel = Globals.association [self.itsUUID]
                 except KeyError:
                     return  # embedded container hasn't been rendered yet
                 embeddedSizer = embeddedPanel.GetSizer ()
 
                 assert self.contentSpec.queryEnum  == "ListOfItems", "EmbeddedContainers must have a ListOfItems Query"
                 oldChild = self.contentSpec.data[0]
-                wxOldChild = Globals.association [oldChild.getUUID()]
+                wxOldChild = Globals.association [oldChild.itsUUID]
                 self.UnregisterEvents(oldChild)
                 self.removeFromContainer (embeddedPanel, wxOldChild)
                 oldChild.parentBlock = None
@@ -275,7 +275,7 @@
         self.childrenToAdd = []
 
     def OnChooseTabEvent (self, notification):
-        tabbedContainer = Globals.association[self.getUUID()]
+        tabbedContainer = Globals.association[self.itsUUID]
         choice = notification.event.choice
         for index in xrange (tabbedContainer.GetPageCount()):
             if tabbedContainer.GetPageText(index) == choice:

Index: osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py:1.7 osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py:1.8
--- osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py:1.7	Wed Mar 10 01:28:20 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/blocks/NavigationBlocks.py	Tue Mar 23 21:07:47 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.7 $"
-__date__ = "$Date: 2004/03/10 09:28:20 $"
+__version__ = "$Revision: 1.8 $"
+__date__ = "$Date: 2004/03/24 05:07:47 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -69,12 +69,12 @@
         
     def OnViewBookmarksBarEvent(self, notification):
         self.open = not self.open
-        self.showOrHideBookmarksBar(Globals.association[self.getUUID()])
+        self.showOrHideBookmarksBar(Globals.association[self.itsUUID])
         
     def showOrHideBookmarksBar(self, bookmarksBar):
         if bookmarksBar.IsShown() != self.open:
             bookmarksBar.Show(self.open)
-            parentWindow = Globals.association[self.parentBlock.getUUID()]
+            parentWindow = Globals.association[self.parentBlock.itsUUID]
             if self.open:
                 self.parentBlock.addToContainer(parentWindow.GetSizer(), bookmarksBar, 
                                                 self.stretchFactor,
@@ -103,9 +103,9 @@
     
     def toolPressed(self, event):
         tool = Block.wxIDToObject(event.GetId())
-        if tool.getItemName() == 'BackButton':
+        if tool.itsName == 'BackButton':
             self.GoBack()
-        elif tool.getItemName() == 'ForwardButton':
+        elif tool.itsName == 'ForwardButton':
             self.GoForward()
 
     def toolEnterPressed(self, event):
@@ -170,7 +170,7 @@
         if len(self.history) == 0 or self.history[-1] != item:
             self.history.append(item)
         urlBox = Globals.repository.find ('//parcels/OSAF/views/main/URLBox')
-        wxURLBox = Globals.association[urlBox.getUUID()]
+        wxURLBox = Globals.association[urlBox.itsUUID]
         wxURLBox.SetValue(path)
         
         
@@ -194,4 +194,4 @@
     def OnViewStatusBarEventUpdateUI(self, notification):
         notification.data['Check'] = self.open
         
-        
\ No newline at end of file
+        

Index: osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py:1.15 osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py:1.16
--- osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py:1.15	Thu Feb 26 15:36:32 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/notifications/NotificationManager.py	Tue Mar 23 21:07:54 2004
@@ -44,7 +44,7 @@
             from repository.item.Query import KindQuery
             eventKind = Globals.repository.find('//parcels/OSAF/framework/notifications/schema/Event')
             for item in KindQuery().run([eventKind]):
-                self.declarations[item.getUUID()] = Declaration(item)
+                self.declarations[item.itsUUID] = Declaration(item)
         finally:
             self.declarations.release()
 
@@ -76,7 +76,7 @@
         try:
             decls = []
             for e in events:
-                decls.append(self.declarations[e.getUUID()])
+                decls.append(self.declarations[e.itsUUID])
 
             #print decls
 
@@ -136,7 +136,7 @@
         # future version should check notification for validity
         self.declarations.acquire()
         try:
-            eventID = notification.event.getUUID()
+            eventID = notification.event.itsUUID
 
             decl = self.declarations[eventID]
 
@@ -152,7 +152,7 @@
     __slots__ = [ 'subscribers', '__uuid' ]
     def __init__(self, event):
         self.subscribers = {}
-        self.__uuid = event.getUUID()
+        self.__uuid = event.itsUUID
     def __repr__(self):
         return '<Declaration> ' +  self.event.name
     def __getEvent(self):

Index: osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py
diff -u osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py:1.11 osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py:1.12
--- osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py:1.11	Thu Feb 26 15:36:33 2004
+++ osaf/chandler/Chandler/parcels/OSAF/framework/notifications/tests/TestNotifications.py	Tue Mar 23 21:08:00 2004
@@ -114,10 +114,10 @@
 
         def onItemChanged(note):
             uuid = note.GetData()['uuid']
-            print 'Changed:', Globals.repository[uuid].getItemPath()
+            print 'Changed:', Globals.repository[uuid].itsPath
         def onItemAdded(note):
             uuid = note.GetData()['uuid']
-            print 'Added:', Globals.repository[uuid].getItemPath()
+            print 'Added:', Globals.repository[uuid].itsPath
         def onItemDeleted(note):
             uuid = note.GetData()['uuid']
             print 'Deleted:', uuid

Index: osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py
diff -u osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py:1.1 osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py:1.2
--- osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py:1.1	Thu Feb 12 18:16:40 2004
+++ osaf/chandler/Chandler/parcels/OSAF/views/demo/Demo.py	Tue Mar 23 21:08:18 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.1 $"
-__date__ = "$Date: 2004/02/13 02:16:40 $"
+__version__ = "$Revision: 1.2 $"
+__date__ = "$Date: 2004/03/24 05:08:18 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -9,16 +9,16 @@
 
 class DemoTabs(ContainerBlocks.TabbedContainer):
     def OnChooseTabEventUpdateUI(self, notification):
-        notebook = Globals.association[self.getUUID()]
+        notebook = Globals.association[self.itsUUID]
         selectedText = notebook.GetPageText(notebook.GetSelection())
         notification.data['Check'] = (selectedText == notification.event.choice)
 
     def OnAddTextEvent(self, notification):
         textBox = Globals.repository.find('//parcels/OSAF/views/demo/ButtonText')
-        wxTextBox = Globals.association[textBox.getUUID()]
+        wxTextBox = Globals.association[textBox.itsUUID]
         wxTextBox.AppendText('Here is some text')
     
     def OnReloadTextEvent(self, notification):
         textBox = Globals.repository.find('//parcels/OSAF/views/demo/ButtonText')
-        wxTextBox = Globals.association[textBox.getUUID()]
+        wxTextBox = Globals.association[textBox.itsUUID]
         wxTextBox.SetValue('')

Index: osaf/chandler/Chandler/repository/__hardhat__.py
diff -u osaf/chandler/Chandler/repository/__hardhat__.py:1.3 osaf/chandler/Chandler/repository/__hardhat__.py:1.4
--- osaf/chandler/Chandler/repository/__hardhat__.py:1.3	Mon Mar  8 14:56:51 2004
+++ osaf/chandler/Chandler/repository/__hardhat__.py	Tue Mar 23 21:08:25 2004
@@ -35,9 +35,7 @@
     if buildenv['os'] != 'win' or sys.platform == 'cygwin':
         hardhatlib.epydoc(buildenv, info['name'], 'Generating API docs',
                           '-o api -v -n chandlerdb',
-                          '--inheritance listed',
-                          '--no-private',
-                          'item', 'schema', 'util')
+                          '--no-private', 'item', 'schema', 'util')
 
 
 def clean(buildenv):

Index: osaf/chandler/Chandler/repository/item/PersistentCollections.py
diff -u osaf/chandler/Chandler/repository/item/PersistentCollections.py:1.6 osaf/chandler/Chandler/repository/item/PersistentCollections.py:1.7
--- osaf/chandler/Chandler/repository/item/PersistentCollections.py:1.6	Fri Jan 16 18:02:03 2004
+++ osaf/chandler/Chandler/repository/item/PersistentCollections.py	Tue Mar 23 21:08:27 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.6 $"
-__date__      = "$Date: 2004/01/17 02:02:03 $"
+__revision__  = "$Revision: 1.7 $"
+__date__      = "$Date: 2004/03/24 05:08:27 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -73,7 +73,7 @@
             value = PersistentDict(self._item, self._attribute,
                                    self._companion, **value)
         elif isinstance(value, repository.item.Item.Item):
-            value = SingleRef(value.getUUID())
+            value = SingleRef(value._uuid)
         elif isinstance(value, repository.item.Item.ItemValue):
             value._setItem(self._item, self._attribute)
 
@@ -82,7 +82,7 @@
     def _restoreValue(self, value):
 
         if isinstance(value, SingleRef):
-            uuid = value.getUUID()
+            uuid = value.itsUUID
             if self._companion is None:
                 return self._item.find(uuid)
             else:

Index: osaf/chandler/Chandler/repository/item/Item.py
diff -u osaf/chandler/Chandler/repository/item/Item.py:1.112 osaf/chandler/Chandler/repository/item/Item.py:1.113
--- osaf/chandler/Chandler/repository/item/Item.py:1.112	Tue Mar 23 16:26:53 2004
+++ osaf/chandler/Chandler/repository/item/Item.py	Tue Mar 23 21:08:27 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.112 $"
-__date__      = "$Date: 2004/03/24 00:26:53 $"
+__revision__  = "$Revision: 1.113 $"
+__date__      = "$Date: 2004/03/24 05:08:27 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -55,17 +55,16 @@
         self._references = References(self)
         
         self._name = name or self._uuid.str64()
-        self._kind = None
+        self._kind = kind
         self._root = None
 
         self._setParent(parent)
-        self._setKind(kind)
 
     def _fillItem(self, name, parent, kind, **kwds):
 
         self._uuid = kwds['uuid']
         self._name = name or self._uuid.str64()
-        self._kind = None
+        self._kind = kind
         self._root = None
         self._status = 0
         self._version = kwds['version']
@@ -78,7 +77,6 @@
         self._references = kwds['references']
 
         self._setParent(parent, kwds.get('previous'), kwds.get('next'))
-        self._setKind(kind)
 
     def __iter__(self):
         """
@@ -180,7 +178,7 @@
                 otherName = attribute.getAspect('otherName')
 
         if otherName is None:
-            raise TypeError, 'Undefined other endpoint for %s.%s' %(self.getItemPath(), name)
+            raise TypeError, 'Undefined other endpoint for %s.%s' %(self.itsPath, name)
 
         return otherName
 
@@ -351,7 +349,7 @@
                 raise ValueError, 'cardinality %s of %s.%s requires collection' %(self, name, card)
 
             if otherName is None:
-                self._values[name] = value = SingleRef(value.getUUID())
+                self._values[name] = value = SingleRef(value.itsUUID)
 
             else:
                 value = ItemRef(self, name, value, otherName)
@@ -443,7 +441,7 @@
                 _attrDict is None and name in self._values):
                 value = self._values[name]
                 if isinstance(value, SingleRef):
-                    value = self.getRepository().find(value.getUUID())
+                    value = self.getRepository().find(value.itsUUID)
                 return value
 
             elif (_attrDict is self._references or
@@ -478,7 +476,7 @@
                 value.setReadOnly(True)
             return value
 
-        raise AttributeError, "%s has no value for '%s'" %(self.getItemPath(),
+        raise AttributeError, "%s has no value for '%s'" %(self.itsPath,
                                                            name)
 
     def removeAttributeValue(self, name, _attrDict=None):
@@ -561,16 +559,16 @@
         @return: C{None}
         """
 
-        if not (child.getItemParent() is self):
+        if not (child.itsParent is self):
             raise ValueError, '%s not a child of %s' %(child, self)
-        if not (after is None or after.getItemParent() is self):
+        if not (after is None or after.itsParent is self):
             raise ValueError, '%s not a child of %s' %(after, self)
         
-        key = child.getItemName()
+        key = child._name
         if after is None:
             afterKey = None
         else:
-            afterKey = after.getItemName()
+            afterKey = after._name
 
         self._children.place(key, afterKey)
 
@@ -586,7 +584,7 @@
         """
         
         for child in self.iterChildren():
-            print child.getItemPath()
+            print child.itsPath
             if recursive:
                 child.dir(True)
 
@@ -666,7 +664,7 @@
         def checkValue(name, value, attrType):
 
             if not attrType.recognizes(value):
-                logger.error('Value %s of type %s in attribute %s on %s is not recognized by type %s', value, type(value), name, self.getItemPath(), attrType.getItemPath())
+                logger.error('Value %s of type %s in attribute %s on %s is not recognized by type %s', value, type(value), name, self.itsPath, attrType.itsPath)
 
                 return False
 
@@ -675,16 +673,16 @@
         def checkCardinality(name, value, cardType, attrCard):
 
             if not isinstance(value, cardType):
-                logger.error('Value %s of type %s in attribute %s on %s is not an instance of type %s which is required for cardinality %s', value, type(value), name, self.getItemPath(), cardType, attrCard)
+                logger.error('Value %s of type %s in attribute %s on %s is not an instance of type %s which is required for cardinality %s', value, type(value), name, self.itsPath, cardType, attrCard)
 
                 return False
 
             return True
 
         for key, value in self._values.iteritems():
-            attribute = self.kind.getAttribute(key)
+            attribute = self._kind.getAttribute(key)
             if attribute is None:
-                logger.error('Item %s has a value for attribute %s but its kind %s has no definition for this attribute', self.getItemPath(), key, self.kind.getItemPath())
+                logger.error('Item %s has a value for attribute %s but its kind %s has no definition for this attribute', self.itsPath, key, self._kind.itsPath)
                 result = False
             else:
                 attrType = self.getAttributeAspect(key, 'type', default=None)
@@ -1053,8 +1051,8 @@
         A stale item pointer is defined as an item pointer that is no longer
         valid. When an item is unloaded, the item pointer is marked
         stale. The item pointer can be refreshed by reloading the item via the
-        L{find} method, passing it the item's C{uuid} obtained with the
-        L{getUUID} method.
+        L{find} method, passing it the item's C{uuid} obtained via the
+        L{itsUUID} property.
         
         Stale items are encountered when item pointers are kept across
         transaction boundaries. It is recommended to keep the item's
@@ -1126,7 +1124,7 @@
                         self._status |= dirty
                         return True
                     elif self._status & Item.NEW:
-                        repository.logger.error('logging of new item %s failed', self.getItemPath())
+                        repository.logger.error('logging of new item %s failed', self.itsPath)
             else:
                 self._status |= dirty
         else:
@@ -1180,7 +1178,7 @@
                     
                 self.removeAttributeValue(name, _attrDict=self._references)
 
-            self.getItemParent()._removeItem(self)
+            self.itsParent._removeItem(self)
             self._setRoot(None)
 
             self._status |= Item.DELETED | Item.STALE
@@ -1190,16 +1188,7 @@
                 if other.refCount() == 0:
                     other.delete()
         
-    def getItemName(self):
-        """
-        Return this item's name.
-
-        The item name is used to lookup an item in its parent container and
-        construct the item's path in the repository.
-        To rename an item use L{rename}.
-
-        The name of an item must be unique among all its siblings.
-        """
+    def __getName(self):
 
         return self._name
 
@@ -1211,7 +1200,7 @@
             - the value of the C{displayName} attribute
             - the value of the attribute named by the item's kind
               C{displayAttribute} attribute
-            - or the item's intrinsic name (see L{getItemName}).
+            - or the item's intrinsic name
 
         @return: a string
         """
@@ -1252,49 +1241,21 @@
 
         return count
 
-    def getUUID(self):
-        """
-        Return the Universally Unique ID for this item.
-
-        The UUID for an item is generated when the item is first created and
-        never changes. This UUID is valid for the life of the item.
-
-        The UUID is a 128 bit number intended to be unique in the entire
-        universe and is implemented as specified in the IETF's U{UUID draft <www.ics.uci.edu/pub/ietf/webdav/uuid-guid/draft-leach-uuids-guids-01.txt>} spec.
-        """
+    def __getUUID(self):
         
         return self._uuid
 
-    def getItemPath(self, path=None):
-        """
-        Return the path to this item relative to its repository.
-
-        A path is a C{/} separated sequence of item names.
-
-        @param path: use this path instead of allocating a new Path object
-        for the result
-        @type path: a Path instance
-        @return: a Path instance
-        """
+    def _getPath(self, path=None):
 
         if path is None:
             path = Path()
             
-        self.getItemParent().getItemPath(path)
+        self.itsParent._getPath(path)
         path.append(self._name)
 
         return path
 
-    def getRoot(self):
-        """
-        Return this item's repository root.
-
-        A repository root is a direct child of the repository.
-        All single-slash rooted paths are expressed relative to this root
-        when used with this item.
-        
-        @return: an item
-        """
+    def _getRoot(self):
 
         if self._root.isStale():
             self._root = self.getRepository()[self._root._uuid]
@@ -1325,30 +1286,16 @@
             for child in self.iterChildren(load=False):
                 child._setRoot(root)
 
-    def getItemParent(self):
-        """
-        Return this item's parent.
-
-        To change the parent, use L{move}.
-
-        @return: an item
-        """
+    def __getParent(self):
 
         if self._parent.isStale():
             self._parent = self.getRepository()[self._parent._uuid]
             
         return self._parent
 
-    def _setKind(self, kind):
+    def __getKind(self):
 
-        if self._kind is not None:
-            self._kind.removeValue('items', value=self)
-
-        self._kind = kind
-
-        if self._kind is not None:
-            ref = ItemRef(self, 'kind', self._kind, 'items', 'list', False)
-            self._references['kind'] = ref
+        return self._kind
 
     def getRepository(self):
         """
@@ -1375,7 +1322,7 @@
         @type name: a string
         """
 
-        parent = self.getItemParent()
+        parent = self.itsParent
         link = parent._children._get(self._name)
         parent._removeItem(self)
         self._name = name or self._uuid.str64()
@@ -1405,7 +1352,7 @@
         if newParent is None:
             raise ValueError, 'newParent cannot be None'
             
-        parent = self.getItemParent()
+        parent = self.itsParent
         if parent is not newParent:
             parent._removeItem(self)
             self._setParent(newParent, previous, next)
@@ -1437,7 +1384,7 @@
             current = self.getItemChild(name, not loading)
                 
             if current is not None:
-                raise ValueError, "A child '%s' exists already under %s" %(item._name, self.getItemPath())
+                raise ValueError, "A child '%s' exists already under %s" %(item._name, self.itsPath)
 
         else:
             self._children = Children(self)
@@ -1447,11 +1394,11 @@
         if '_notChildren' in self.__dict__ and name in self._notChildren:
             del self._notChildren[name]
             
-        return self.getRoot()
+        return self.itsRoot
 
     def _removeItem(self, item):
 
-        name = item.getItemName()
+        name = item._name
         del self._children[name]
 
         if '_notChildren' in self.__dict__:
@@ -1571,7 +1518,7 @@
                 return self.getRepository().walk(path, callable, 1, **kwds)
 
             elif path[0] == '/':
-                return self.getRoot().walk(path, callable, 1, **kwds)
+                return self.itsRoot.walk(path, callable, 1, **kwds)
 
         if path[_index] == '.':
             if _index == l - 1:
@@ -1580,9 +1527,8 @@
 
         if path[_index] == '..':
             if _index == l - 1:
-                return self.getItemParent()
-            return self.getItemParent().walk(path, callable,
-                                             _index + 1, **kwds)
+                return self.itsParent
+            return self.itsParent.walk(path, callable, _index + 1, **kwds)
 
         child = self.getItemChild(path[_index], kwds.get('load', True))
         child = callable(self, path[_index], child, **kwds)
@@ -1743,7 +1689,7 @@
             kind = self._kind
             if kind is not None:
                 xmlTag('kind', { 'type': 'uuid' },
-                       kind.getUUID().str64(), generator)
+                       kind.itsUUID.str64(), generator)
 
             if (withSchema or kind is None or
                 kind.getItemClass() is not type(self)):
@@ -1751,8 +1697,8 @@
                        type(self).__name__, generator)
 
         attrs = {}
-        parent = self.getItemParent()
-        parentID = parent.getUUID().str64()
+        parent = self.itsParent
+        parentID = parent.itsUUID.str64()
 
         if not isDeleted:
             if parent._isItem():
@@ -1786,7 +1732,7 @@
     def _unloadItem(self):
 
         if self._status & Item.DIRTY:
-            raise ValueError, 'Item %s has changed, cannot be unloaded' %(self.getItemPath())
+            raise ValueError, 'Item %s has changed, cannot be unloaded' %(self.itsPath)
 
         if hasattr(type(self), 'onItemUnload'):
             self.onItemUnload()
@@ -1795,8 +1741,6 @@
             repository = self.getRepository()
 
             self._status |= Item.DIRTY
-            if self.hasAttributeValue('kind'):
-                del self.kind
 
             if self._values:
                 self._values._unload()
@@ -1834,7 +1778,7 @@
                     attrType = attribute.getAspect('type')
                     attrCard = attribute.getAspect('cardinality',
                                                    default='single')
-                    attrId = attribute.getUUID()
+                    attrId = attribute.itsUUID
                 else:
                     attrType = None
                     attrCard = 'single'
@@ -1845,7 +1789,7 @@
                                          attrType, attrCard, attrId, generator,
                                          withSchema)
                 except Exception, e:
-                    e.args = ("while saving attribute '%s' of item %s, %s" %(key, self.getItemPath(), e.args[0]),)
+                    e.args = ("while saving attribute '%s' of item %s, %s" %(key, self.itsPath, e.args[0]),)
                     raise
 
     def _xmlRefs(self, generator, withSchema, version, mode):
@@ -1904,6 +1848,70 @@
     DIRTY      = VDIRTY | SDIRTY | CDIRTY | RDIRTY
 
     __access__ = 0L
+
+    itsName = property(fget = __getName,
+                       fset = rename,
+                       doc =
+                       """
+                       Return this item's name.
+
+                       The item name is used to lookup an item in its parent
+                       container and construct the item's path in the
+                       repository. 
+                       An item may be renamed by setting this property.
+
+                       The name of an item must be unique among all its
+                       siblings. 
+                       """)
+
+    itsUUID = property(fget = __getUUID,
+                       doc =
+                       """
+                       Return the Universally Unique ID for this item.
+
+                       The UUID for an item is generated when the item is
+                       first created and never changes. This UUID is valid
+                       for the life of the item.
+
+                       The UUID is a 128 bit number intended to be unique in
+                       the entire universe and is implemented as specified
+                       in the IETF's U{UUID draft
+                       <www.ics.uci.edu/pub/ietf/webdav/uuid-guid/draft-leach-uuids-guids-01.txt>}
+                       spec. 
+                       """)
+
+    itsPath = property(fget = _getPath,
+                       doc = 
+                       """
+                       Return the path to this item relative to its repository.
+
+                       A path is a C{/} separated sequence of item names.
+                       """)
+
+    itsParent = property(fget = __getParent,
+                         fset = move,
+                         doc = 
+                         """
+                         Return this item's parent.
+
+                         An item may be moved by setting this property.
+                         """)
+
+    itsRoot = property(fget = _getRoot,
+                       doc = 
+                       """
+                       Return this item's repository root.
+
+                       A repository root is a direct child of the repository.
+                       All single-slash rooted paths are expressed relative
+                       to this root when used with this item.
+                       """)
+
+    itsKind = property(fget = __getKind,
+                       doc = 
+                       """
+                       Return this item's kind.
+                       """)
 
 
 class Children(LinkedMap):

Index: osaf/chandler/Chandler/repository/item/Query.py
diff -u osaf/chandler/Chandler/repository/item/Query.py:1.5 osaf/chandler/Chandler/repository/item/Query.py:1.6
--- osaf/chandler/Chandler/repository/item/Query.py:1.5	Thu Jan 22 13:16:21 2004
+++ osaf/chandler/Chandler/repository/item/Query.py	Tue Mar 23 21:08:27 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.5 $"
-__date__      = "$Date: 2004/01/22 21:16:21 $"
+__revision__  = "$Revision: 1.6 $"
+__date__      = "$Date: 2004/03/24 05:08:27 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -43,11 +43,11 @@
     def run(self, kinds):
 
         for kind in kinds:
-            for item in kind.getAttributeValue('items', default=[]):
-                if item.isNew():
+            for item in kind.getRepository()._newItems():
+                if item.itsKind is kind:
                     yield item
 
-            query = "/item[kind='%s']" %(kind.getUUID().str64())
+            query = "/item[kind='%s']" %(kind.itsUUID.str64())
             for item in kind.getRepository().queryItems(query):
                 yield item
 

Index: osaf/chandler/Chandler/repository/parcel/Parcel.py
diff -u osaf/chandler/Chandler/repository/parcel/Parcel.py:1.10 osaf/chandler/Chandler/repository/parcel/Parcel.py:1.11
--- osaf/chandler/Chandler/repository/parcel/Parcel.py:1.10	Thu Jan 15 13:54:17 2004
+++ osaf/chandler/Chandler/repository/parcel/Parcel.py	Tue Mar 23 21:08:37 2004
@@ -1,7 +1,7 @@
 """ Bootstrapping Kind for Parcel"""
 
-__revision__  = "$Revision: 1.10 $"
-__date__      = "$Date: 2004/01/15 21:54:17 $"
+__revision__  = "$Revision: 1.11 $"
+__date__      = "$Date: 2004/03/24 05:08:37 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -63,7 +63,7 @@
         # item. To set a special handler on a logger, do so once in the
         # relevant class or module.
         
-        itemPath = repr(self.getItemPath())
+        itemPath = repr(self.itsPath)
         loggerPath = itemPath[2:].replace("/", ".")
         
         self.log = logging.getLogger(loggerPath)

Index: osaf/chandler/Chandler/repository/parcel/ParcelLoader.py
diff -u osaf/chandler/Chandler/repository/parcel/ParcelLoader.py:1.14 osaf/chandler/Chandler/repository/parcel/ParcelLoader.py:1.15
--- osaf/chandler/Chandler/repository/parcel/ParcelLoader.py:1.14	Tue Mar 23 09:53:47 2004
+++ osaf/chandler/Chandler/repository/parcel/ParcelLoader.py	Tue Mar 23 21:08:37 2004
@@ -6,8 +6,8 @@
     (3) Empty list, None types not handled properly
 """
 
-__revision__  = "$Revision: 1.14 $"
-__date__      = "$Date: 2004/03/23 17:53:47 $"
+__revision__  = "$Revision: 1.15 $"
+__date__      = "$Date: 2004/03/24 05:08:37 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -157,7 +157,7 @@
         (uri, local, element, currentItem, currentReferences) = self.tags[-1]
 
         # Is the current item part of the core schema?
-        isSchemaItem = (currentItem.kind.getRoot().getItemName() == 'Schema')
+        isSchemaItem = (currentItem.itsKind.itsRoot.itsName == 'Schema')
 
         # If we have a reference, delay loading
         if element == 'Reference':
@@ -232,7 +232,7 @@
                    "No parent item at %s:%s" % (self.locator.getSystemId(),
                                                line)
 
-            kindItem = item.kind
+            kindItem = item.itsKind
             attributeItem = kindItem.getAttribute(attributeName)
 
             assert attributeItem, \
@@ -312,7 +312,7 @@
         # If the item already exists, use the existing item
         item = parent.getItemChild(name)
         if item:
-            self.log.debug("Reloading item %s" % item.getItemPath()) 
+            self.log.debug("Reloading item %s" % item.itsPath) 
             return item
 
         # Find the kind represented by the tag (uri, local). The
@@ -348,12 +348,12 @@
 
                 # @@@ Special cases to resolve
                 if attributeName == 'inverseAttribute':
-                    item.addValue('otherName', reference.getItemName())
+                    item.addValue('otherName', reference.itsName)
                 elif attributeName == 'displayAttribute':
-                    item.addValue('displayAttribute', reference.getItemName())
+                    item.addValue('displayAttribute', reference.itsName)
                 elif attributeName == 'attributes':
                     item.addValue('attributes', reference,
-                                  alias=reference.getItemName())
+                                  alias=reference.itsName)
                 else:
                     item.addValue(attributeName, reference)
 

Index: osaf/chandler/Chandler/repository/parcel/tests/TestItems.py
diff -u osaf/chandler/Chandler/repository/parcel/tests/TestItems.py:1.5 osaf/chandler/Chandler/repository/parcel/tests/TestItems.py:1.6
--- osaf/chandler/Chandler/repository/parcel/tests/TestItems.py:1.5	Fri Jan 16 14:45:47 2004
+++ osaf/chandler/Chandler/repository/parcel/tests/TestItems.py	Tue Mar 23 21:08:44 2004
@@ -1,8 +1,8 @@
 """
 Item tests for Parcel Loader
 """
-__revision__  = "$Revision: 1.5 $"
-__date__      = "$Date: 2004/01/16 22:45:47 $"
+__revision__  = "$Revision: 1.6 $"
+__date__      = "$Date: 2004/03/24 05:08:44 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -28,16 +28,16 @@
 
         # Ensure the Parcel was created
         parcel = self.rep.find("//parcels/items")
-        self.assertEqual(parcel.kind,
+        self.assertEqual(parcel.itsKind,
          self.rep.find("//Schema/Core/Parcel"))
 
         # Ensure testInstances were created
         testInstance1 = self.rep.find("//parcels/items/TestInstance1")
-        self.assertEqual(testInstance1.kind,
+        self.assertEqual(testInstance1.itsKind,
          self.rep.find("//parcels/items/Kind2"))
 
         testInstance2 = self.rep.find("//parcels/items/TestInstance2")
-        self.assertEqual(testInstance2.kind,
+        self.assertEqual(testInstance2.itsKind,
          self.rep.find("//parcels/items/Kind2"))
 
         self.assertEqual(testInstance1.RefAttribute, testInstance2)

Index: osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py
diff -u osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py:1.2 osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py:1.3
--- osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py:1.2	Tue Mar 23 13:23:45 2004
+++ osaf/chandler/Chandler/repository/parcel/tests/TestLocalAttrs.py	Tue Mar 23 21:08:44 2004
@@ -1,8 +1,8 @@
 """
 Parcel Loader test for local attributes
 """
-__revision__  = "$Revision: 1.2 $"
-__date__      = "$Date: 2004/03/23 21:23:45 $"
+__revision__  = "$Revision: 1.3 $"
+__date__      = "$Date: 2004/03/24 05:08:44 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -31,7 +31,7 @@
         self.assert_(attr)
         found = False
         for (name, attr) in kind.iterAttributes():
-            if str(attr.getItemPath()) == \
+            if str(attr.itsPath) == \
              "//parcels/localattrs/TestKind/TestAttribute":
                 found = True
         self.assert_(found, "Local TestAttribute not found")

Index: osaf/chandler/Chandler/repository/tests/AttributeTestCase.py
diff -u osaf/chandler/Chandler/repository/tests/AttributeTestCase.py:1.2 osaf/chandler/Chandler/repository/tests/AttributeTestCase.py:1.3
--- osaf/chandler/Chandler/repository/tests/AttributeTestCase.py:1.2	Sun Jan 11 22:28:50 2004
+++ osaf/chandler/Chandler/repository/tests/AttributeTestCase.py	Tue Mar 23 21:08:55 2004
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.2 $"
-__date__      = "$Date: 2004/01/12 06:28:50 $"
+__revision__  = "$Revision: 1.3 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -18,7 +18,7 @@
     def _createManagerAndEmployeeKinds(self, type):
         kind = self._find('//Schema/Core/Kind')
         itemKind = self._find('//Schema/Core/Item')
-        attrKind = itemKind.getAttribute('kind').kind
+        attrKind = itemKind.itsParent['Attribute']
 
         managerKind = kind.newItem('manager', self.rep)
         employeesAttribute = Attribute('employees',managerKind, attrKind)

Index: osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py
diff -u osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py:1.3 osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py:1.4
--- osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py:1.3	Sun Jan 11 22:28:50 2004
+++ osaf/chandler/Chandler/repository/tests/RepositoryTestCase.py	Tue Mar 23 21:08:55 2004
@@ -1,8 +1,8 @@
 """
 A base class for repository testing
 """
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/12 06:28:50 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -44,4 +44,4 @@
         self.assert_(item in self.rep.getRoots())
 
     def assertItemPathEqual(self, item, string):
-        self.assertEqual(str(item.getItemPath()), string)
+        self.assertEqual(str(item.itsPath), string)

Index: osaf/chandler/Chandler/repository/tests/TestRepository.py
diff -u osaf/chandler/Chandler/repository/tests/TestRepository.py:1.5 osaf/chandler/Chandler/repository/tests/TestRepository.py:1.6
--- osaf/chandler/Chandler/repository/tests/TestRepository.py:1.5	Sun Jan 11 22:28:50 2004
+++ osaf/chandler/Chandler/repository/tests/TestRepository.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Basic Unit tests for Chandler repository
 """
 
-__revision__  = "$Revision: 1.5 $"
-__date__      = "$Date: 2004/01/12 06:28:50 $"
+__revision__  = "$Revision: 1.6 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -33,21 +33,21 @@
 
         root = self.rep.getRoot('Packs')
         #TODO these should use UUID's
-        self.assert_(root.getItemName() == 'Packs')
+        self.assert_(root.itsName == 'Packs')
     
         root = self.rep['Packs']
-        self.assert_(root.getItemName() == 'Packs')
+        self.assert_(root.itsName == 'Packs')
     
     def testGetRoots(self):
         """ Make sure the roots of the repository are correct"""
 
         for root in self.rep.getRoots():
-            self.assert_(root.getItemName() in ['Schema', 'Packs'])
+            self.assert_(root.itsName in ['Schema', 'Packs'])
 
     def testWalk(self):
         def callme(self, path, x):
             print path
-            print x.getItemName()
+            print x.itsName
 
         self.rep.walk('//Schema/Core/Parcel', callme)
 #TODO what's a resonable test here?
@@ -69,7 +69,7 @@
 
     def testGetUUID(self):
         #TODO -- can't rely on UUID to be the same
-        self.assert_(self.rep.getUUID() is not None)
+        self.assert_(self.rep.itsUUID is not None)
 
 if __name__ == "__main__":
     unittest.main()

Index: osaf/chandler/Chandler/repository/util/SingleRef.py
diff -u osaf/chandler/Chandler/repository/util/SingleRef.py:1.3 osaf/chandler/Chandler/repository/util/SingleRef.py:1.4
--- osaf/chandler/Chandler/repository/util/SingleRef.py:1.3	Mon Jan 12 19:20:12 2004
+++ osaf/chandler/Chandler/repository/util/SingleRef.py	Tue Mar 23 21:09:01 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/13 03:20:12 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:09:01 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -30,7 +30,7 @@
 
         self._uuid = UUID(state)
     
-    def getUUID(self):
+    def __getUUID(self):
 
         return self._uuid
 
@@ -57,3 +57,6 @@
     def __ne__(self, other):
 
         return isinstance(other, SingleRef) and self._uuid.__ne__(other._uuid)
+
+    itsUUID = property(__getUUID)
+    

Index: osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py
diff -u osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py:1.2 osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py:1.3
--- osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py:1.2	Wed Jan 14 23:34:13 2004
+++ osaf/chandler/Chandler/parcels/OSAF/contentmodel/contacts/Contacts.py	Tue Mar 23 21:07:11 2004
@@ -1,8 +1,8 @@
 """ Classes used for Contacts parcel kinds
 """
 
-__revision__  = "$Revision: 1.2 $"
-__date__      = "$Date: 2004/01/15 07:34:13 $"
+__revision__  = "$Revision: 1.3 $"
+__date__      = "$Date: 2004/03/24 05:07:11 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -26,19 +26,19 @@
 
     def _setUUIDs(self):
         contactKind = self.find('Contact')
-        ContactsParcel.contactKindID = contactKind.getUUID()
+        ContactsParcel.contactKindID = contactKind.itsUUID
         
         contactSectionKind = self.find('ContactSection')
-        ContactsParcel.contactSectionKindID = contactSectionKind.getUUID()
+        ContactsParcel.contactSectionKindID = contactSectionKind.itsUUID
 
         contactNameKind = self.find('ContactName')
-        ContactsParcel.contactNameKindID = contactNameKind.getUUID()
+        ContactsParcel.contactNameKindID = contactNameKind.itsUUID
         
         streetAddressKind = self.find('StreetAddress')
-        ContactsParcel.streetAddressKindID = streetAddressKind.getUUID()
+        ContactsParcel.streetAddressKindID = streetAddressKind.itsUUID
         
         phoneNumberKind = self.find('PhoneNumber')
-        ContactsParcel.phoneNumberKindID = phoneNumberKind.getUUID()
+        ContactsParcel.phoneNumberKindID = phoneNumberKind.itsUUID
 
     def getContactKind(cls):
         assert cls.contactKindID, "Contacts parcel not yet loaded"

Index: osaf/chandler/Chandler/repository/persistence/FileRepository.py
diff -u osaf/chandler/Chandler/repository/persistence/FileRepository.py:1.26 osaf/chandler/Chandler/repository/persistence/FileRepository.py:1.27
--- osaf/chandler/Chandler/repository/persistence/FileRepository.py:1.26	Fri Dec 12 22:55:26 2003
+++ osaf/chandler/Chandler/repository/persistence/FileRepository.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.26 $"
-__date__      = "$Date: 2003/12/13 06:55:26 $"
+__revision__  = "$Revision: 1.27 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -140,7 +140,7 @@
             contents.write('\n')
         
         for root in self._roots.itervalues():
-            name = root.getItemName()
+            name = root.itsName
             if name != 'Schema':
                 count += self._saveItems(root)
                 contents.write(name)
@@ -161,7 +161,7 @@
                 count += 1
                 item.setDirty(0)
 
-            contents.write(item.getUUID().str16())
+            contents.write(item.itsUUID.str16())
             contents.write('\n')
                 
             for child in item:
@@ -169,7 +169,7 @@
 
             return count
 
-        name = root.getItemName()
+        name = root.itsName
         dir = os.path.join(self.repository.dbHome, name)
 
         if not os.path.exists(dir):
@@ -185,11 +185,11 @@
 
     def _saveItem(self, item, **args):
 
-        self.logger.debug(item.getItemPath())
+        self.logger.debug(item.itsPath)
             
-        uuid = item.getUUID().str16()
+        uuid = item.itsUUID.str16()
         filename = os.path.join(self.repository.dbHome,
-                                item.getRoot().getItemName(),
+                                item.itsRoot.itsName,
                                 uuid + '.item')
         out = file(filename, 'w')
         generator = XMLGenerator(out, 'utf-8')

Index: osaf/chandler/Chandler/repository/persistence/XMLRepository.py
diff -u osaf/chandler/Chandler/repository/persistence/XMLRepository.py:1.67 osaf/chandler/Chandler/repository/persistence/XMLRepository.py:1.68
--- osaf/chandler/Chandler/repository/persistence/XMLRepository.py:1.67	Wed Mar 17 11:08:02 2004
+++ osaf/chandler/Chandler/repository/persistence/XMLRepository.py	Tue Mar 23 21:08:47 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.67 $"
-__date__      = "$Date: 2004/03/17 19:08:02 $"
+__revision__  = "$Revision: 1.68 $"
+__date__      = "$Date: 2004/03/24 05:08:47 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -238,7 +238,7 @@
         ctx = XmlQueryContext()
         ctx.setReturnType(XmlQueryContext.ResultDocuments)
         ctx.setEvaluationType(XmlQueryContext.Lazy)
-        ctx.setVariableValue("uuid", XmlValue(Repository.ROOT_ID.str64()))
+        ctx.setVariableValue("uuid", XmlValue(Repository.itsUUID.str64()))
         ctx.setVariableValue("version", XmlValue(float(version)))
         nameExp = re.compile("<name>(.*)</name>")
         roots = {}

Index: osaf/chandler/Chandler/repository/tests/TestKinds.py
diff -u osaf/chandler/Chandler/repository/tests/TestKinds.py:1.3 osaf/chandler/Chandler/repository/tests/TestKinds.py:1.4
--- osaf/chandler/Chandler/repository/tests/TestKinds.py:1.3	Sun Jan 11 22:27:39 2004
+++ osaf/chandler/Chandler/repository/tests/TestKinds.py	Tue Mar 23 21:08:55 2004
@@ -2,8 +2,8 @@
 Unit tests for kinds
 """
 
-__revision__  = "$Revision: 1.3 $"
-__date__      = "$Date: 2004/01/12 06:27:39 $"
+__revision__  = "$Revision: 1.4 $"
+__date__      = "$Date: 2004/03/24 05:08:55 $"
 __copyright__ = "Copyright (c) 2003 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -21,7 +21,7 @@
 
         self.kind = self._find("//Schema/Core/Kind")
         self.itemKind = self._find("//Schema/Core/Item")
-        self.attrKind = self.itemKind.getAttribute('kind').kind
+        self.attrKind = self.itemKind.itsParent['Attribute']
 
         self.kind1 = self.kind.newItem('kind1',self.rep)
         self.kind1Attr1 = Attribute('k1a1', self.rep, self.attrKind)
@@ -52,10 +52,10 @@
         self.assert_(self.kind1.resolve('bogus') is None)
 
         # resolve a child non attribute
-        self.assertEquals(self.kind1.resolve('kind2'), self.kind2.getUUID())
+        self.assertEquals(self.kind1.resolve('kind2'), self.kind2.itsUUID)
 
         # resolve an attribute (alias)
-        self.assert_(self.kind1.resolve('k1a1') is self.kind1Attr1.getUUID())
+        self.assert_(self.kind1.resolve('k1a1') is self.kind1Attr1.itsUUID)
 
     def testGetAttribute(self):
         """ Test getAttribute and has Attribute """
@@ -106,7 +106,7 @@
 #         self.assertEquals(len(item.k1a1),1)
 
 #         newKind = self.kind.newItem('newKind', self.rep)
-#         item.kind = newKind
+#         item.itsKind = newKind
 #         self.assert_('value' in item.k1a1)
 
 #         newSuperKind = self.kind.newItem('newSuperKind', self.rep)



More information about the Commits mailing list