[CMF-checkins] CVS: CMF/CMFUid - UniqueIdAnnotationTool.py:1.2 interfaces.py:1.4

[Grégoire Weber]

Update of /cvs-repository/CMF/CMFUid
In directory cvs.zope.org:/tmp/cvs-serv20938

Modified Files:
	UniqueIdAnnotationTool.py interfaces.py 
Log Message:
- renamed '*AnnotatedUniqueId' to '*UniqueIdAnnotation'


=== CMF/CMFUid/UniqueIdAnnotationTool.py 1.1 => 1.2 ===
--- CMF/CMFUid/UniqueIdAnnotationTool.py:1.1	Thu Jul 22 09:41:21 2004
+++ CMF/CMFUid/UniqueIdAnnotationTool.py	Thu Jul 22 10:15:02 2004
@@ -28,40 +28,40 @@
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.permissions import ManagePortal
 
-from Products.CMFUid.interfaces import IAnnotatedUniqueId
+from Products.CMFUid.interfaces import IUniqueIdAnnotation
 
-class AnnotatedUniqueId(Persistent, Implicit):
+class UniqueIdAnnotation(Persistent, Implicit):
     """Unique id object used as annotation on (content) objects.
     """
     
     __implements__ = (
-        IAnnotatedUniqueId,
+        IUniqueIdAnnotation,
     )
     
     def __init__(self, obj, id):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         self._uid = None
         self.id = id
         setattr(obj, id, self)
     
     def __call__(self):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         return self._uid
         
     def getId(self):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         return self.id
     
     def setUid(self, uid):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         self._uid = uid
         
     def manage_afterClone(self, item):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         # Duplicated unique ids on the copied object have to be avoided.
         # the uid object may already be removed by the 'manage_afterAdd'.
@@ -75,7 +75,7 @@
                 pass
     
     def manage_beforeDelete(self, item, container):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         # This helps in distinguishing renaming from copying/adding and
         # importing in 'manage_afterAdd' (see below)
@@ -84,7 +84,7 @@
             self._cmf_uid_is_rename = True
     
     def manage_afterAdd(self, item, container):
-        """See IAnnotatedUniqueId.
+        """See IUniqueIdAnnotation.
         """
         # 'is_rename' is set if deletion was caused by a rename/move.
         # The unique id is deleted only if the call is not part of 
@@ -101,7 +101,7 @@
         if _is_rename is not None:
             del self._cmf_uid_is_rename
 
-InitializeClass(AnnotatedUniqueId)
+InitializeClass(UniqueIdAnnotation)
 
 
 class UniqueIdAnnotationTool(UniqueObject, SimpleItem, ActionProviderBase):
@@ -122,4 +122,4 @@
     def __call__(self, obj, id):
         """return an empty unique id annotation
         """
-        return AnnotatedUniqueId(obj, id)
+        return UniqueIdAnnotation(obj, id)


=== CMF/CMFUid/interfaces.py 1.3 => 1.4 ===
--- CMF/CMFUid/interfaces.py:1.3	Tue Jul 20 21:26:11 2004
+++ CMF/CMFUid/interfaces.py	Thu Jul 22 10:15:02 2004
@@ -121,8 +121,8 @@
         """
 
 
-class IAnnotatedUniqueId(ICallableOpaqueItem, ICallableOpaqueItemEvents):
-    """Unique id handling adding, copying, and deletion events.
+class IUniqueIdAnnotation(ICallableOpaqueItem, ICallableOpaqueItemEvents):
+    """Opaque unique id item handling adding, copying, and deletion events.
     """
     
     def __init__(uid):