[Modeling-cvs] ProjectModeling/Modeling Model.py,1.3,1.3.4.1 Entity.py,1.10,1.10.4.1 Attribute.py,1.11,1.11.4.1 Relationship.py,1.7,1.7.4.1

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv14251

Modified Files:
      Tag: brch-0_9pre6-1-ModelMasons_base_generation_scheme
	Model.py Entity.py Attribute.py Relationship.py 
Log Message:
Applied some changes made in 0.9pre7: added field 'comment' in Model, Entity, Attribute and Relationship

Index: Model.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Model.py,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** Model.py	10 Jan 2003 10:45:44 -0000	1.3
--- Model.py	16 May 2003 10:46:22 -0000	1.3.4.1
***************
*** 55,59 ****
    _connectionDictionary={}
    _packageName=''
! 
    def __init__(self, aName=''):
      "Initializes a model. A name **must** be provided."
--- 55,60 ----
    _connectionDictionary={}
    _packageName=''
!   _comment=''
!   
    def __init__(self, aName=''):
      "Initializes a model. A name **must** be provided."
***************
*** 95,98 ****
--- 96,103 ----
      anEntity._setModel(self)
      
+   def comment(self):
+     "Returns the comment field"
+     return self._comment
+   
    def connectionDictionary(self):
      "Returns the connection dictionary"
***************
*** 191,194 ****
--- 196,203 ----
      self._adaptorName=adaptorName
    
+   def setComment(self, aComment):
+     "Sets the comment field"
+     self._comment=aComment
+     
    def setConnectionDictionary(self, aConnectionDictionary):
      "Sets the connection dictionary"
***************
*** 315,320 ****
              'connectionDictionary': ('string',
                                       self.setConnectionDictionary,
!                                      self.connectionDictionary)
!                             
              }
              
--- 324,331 ----
              'connectionDictionary': ('string',
                                       self.setConnectionDictionary,
!                                      self.connectionDictionary),
!             'comment':     ('string',
!                             self.setComment,
!                             self.comment),
              }
              

Index: Entity.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Entity.py,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** Entity.py	17 Mar 2003 10:27:09 -0000	1.10
--- Entity.py	16 May 2003 10:46:22 -0000	1.10.4.1
***************
*** 145,148 ****
--- 145,149 ----
    _attrsUsedForLocking=()
    _moduleName=None
+   _comment=''
    
    def __init__(self, name='', aModel=None):
***************
*** 158,161 ****
--- 159,163 ----
      self._attrsUsedForLocking=()
      self._className=None
+     self._comment=''
      self._externalName=''
      self._model=None
***************
*** 358,361 ****
--- 360,367 ----
                    if rel.isClassProperty()])
  
+   def comment(self):
+     "Returns the comment field"
+     return self._comment
+   
    def definedKeys(self):
      """
***************
*** 838,841 ****
--- 844,851 ----
      self._className=aName
  
+   def setComment(self, aComment):
+     "Sets the comment field"
+     self._comment=aComment
+     
    def setExternalName(self, externalName):
      "Sets the external name"
***************
*** 1378,1381 ****
--- 1388,1394 ----
                       self.setClassName,
                       self.className ),
+       'comment':   ( 'string',
+                      self.setComment,
+                      self.comment),
        'externalName': ( 'string',
                          self.setExternalName,

Index: Attribute.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Attribute.py,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -d -r1.11 -r1.11.4.1
*** Attribute.py	17 Mar 2003 11:15:11 -0000	1.11
--- Attribute.py	16 May 2003 10:46:22 -0000	1.11.4.1
***************
*** 100,103 ****
--- 100,104 ----
    _columnName=''
    _width=0
+   _comment=''
    
    def __init__(self, aName='', anEntity=None):
***************
*** 111,114 ****
--- 112,116 ----
      self._allowsNone=1
      self._columnName=''
+     self._comment=''
      self._defaultValue=None
      self._definition=''
***************
*** 165,168 ****
--- 167,174 ----
      return self._columnName
    
+   def comment(self):
+     "Returns the comment field"
+     return self._comment
+   
    def defaultValue(self):
      "Returns the default value associated to this attribute"
***************
*** 323,326 ****
--- 329,336 ----
      self._columnName=columnName
    
+   def setComment(self, aComment):
+     "Sets the comment field"
+     self._comment=aComment
+     
    def convertStringToAttributeType(self, aValue):
      """
***************
*** 595,598 ****
--- 605,611 ----
                                       self.setColumnName,
                                       self.columnName),
+       'comment'                   : ( 'string',
+                                       self.setComment,
+                                       self.comment),
        'displayLabel'              : ('string',
                                       self.setDisplayLabel,
***************
*** 638,642 ****
      subList=('name',
               'columnName', 'precision', 'scale', 'width', 'externalType', #DB
!              'displayLabel', 'isClassProperty', 'isRequired',
               'defaultValue', 'type', )
      dict=self.fullPropertySet()
--- 651,655 ----
      subList=('name',
               'columnName', 'precision', 'scale', 'width', 'externalType', #DB
!              'comment', 'displayLabel', 'isClassProperty', 'isRequired',
               'defaultValue', 'type', )
      dict=self.fullPropertySet()
***************
*** 647,651 ****
    def flattenedPropertySet(self):
      subList=('name', 'displayLabel', 'isClassProperty', 'definition',
!              'isFlattened', )
      dict=self.fullPropertySet()
      deleteKeys=filter(lambda k, list=subList: k not in list, dict.keys())
--- 660,664 ----
    def flattenedPropertySet(self):
      subList=('name', 'displayLabel', 'isClassProperty', 'definition',
!              'isFlattened', 'comment')
      dict=self.fullPropertySet()
      deleteKeys=filter(lambda k, list=subList: k not in list, dict.keys())

Index: Relationship.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Relationship.py,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -C2 -d -r1.7 -r1.7.4.1
*** Relationship.py	10 Feb 2003 12:12:15 -0000	1.7
--- Relationship.py	16 May 2003 10:46:22 -0000	1.7.4.1
***************
*** 69,72 ****
--- 69,73 ----
    #
    _isClassProperty=1
+   _comment=''
    __implements__=(RelationshipInterface, XMLCapabilityInterface)
  
***************
*** 76,79 ****
--- 77,81 ----
      self._deleteRule      = DELETE_NULLIFY
      self._displayLabel    = ''
+     self._comment         = ''
      self._entity          = None
      self._isClassProperty = 1
***************
*** 83,86 ****
--- 85,92 ----
      return
      
+   def comment(self):
+     "Returns the comment field"
+     return self._comment
+   
    def entity(self):
      "Return the relationship's source entity"
***************
*** 146,149 ****
--- 152,159 ----
      return self._name
          
+   def setComment(self, aComment):
+     "Sets the comment field"
+     self._comment=aComment
+     
    def setDeleteRule(self, rule):
      """
***************
*** 280,283 ****
--- 290,296 ----
      "-"
      return {
+       'comment'               : ('string',
+                                  self.setComment,
+                                  self.comment),
        'name'                  : ('string',
                                   lambda self=None,p=None: None,