Return-Path: <ajack@apache.org>
Mailing-List: contact gump-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list gump@jakarta.apache.org
Received: (qmail 97508 invoked by uid 500); 12 Jan 2004 23:23:47 -0000
Received: (qmail 97504 invoked from network); 12 Jan 2004 23:23:47 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 12 Jan 2004 23:23:47 -0000
Received: (qmail 19550 invoked by uid 1728); 12 Jan 2004 23:24:00 -0000
Date: 12 Jan 2004 23:24:00 -0000
Message-ID: <20040112232400.19549.qmail@minotaur.apache.org>
From: ajack@apache.org
To: jakarta-gump-cvs@apache.org
Subject: cvs commit: jakarta-gump/python/gump/document forrest.py
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

ajack       2004/01/12 15:24:00

  Modified:    python/gump/document forrest.py
  Log:
  Next step is 'getting inside dependencies'. More information displayed.
  
  Revision  Changes    Path
  1.50      +25 -10    jakarta-gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- forrest.py	12 Jan 2004 18:01:36 -0000	1.49
  +++ forrest.py	12 Jan 2004 23:24:00 -0000	1.50
  @@ -988,16 +988,16 @@
           
           dependencySection=document.createSection('Dependency')
           
  -        self.documentProjectList(dependencySection, "Project Dependencies",	\
  +        self.documentDependenciesList(dependencySection, "Project Dependencies",	\
                       project.getDependencies(), 0, project)  
                       
  -        self.documentProjectList(dependencySection, "Project Dependees",		\
  +        self.documentDependenciesList(dependencySection, "Project Dependees",		\
                       project.getDependees(), 1, project)
                       
  -        self.documentProjectList(dependencySection, "Full Project Dependencies",	\
  +        self.documentDependenciesList(dependencySection, "Full Project Dependencies",	\
                       project.getFullDependencies(), 0, project)  
                       
  -        self.documentProjectList(dependencySection, "Full Project Dependees",		\
  +        self.documentDependenciesList(dependencySection, "Full Project Dependees",		\
                       project.getFullDependees(), 1, project)                          
           
           document.serialize()
  @@ -1055,11 +1055,13 @@
           if not paths:        
               pathTable.createLine('No ' + title + ' entries')
                        
  -    def documentProjectList(self,xdocNode,title,dependencies,dependees,referencingObject):
  +    def documentDependenciesList(self,xdocNode,title,dependencies,dependees,referencingObject):
         if dependencies:
               projectSection=xdocNode.createSection(title)
  -            projectTable=projectSection.createTable(['Name','Type','State'])
  +            projectTable=projectSection.createTable(['Name','Type','Inheritence','Ids','State'])
               for depend in dependencies:
  +                
  +                # Project/Owner
                   if not dependees:
                       project=depend.getProject()
                   else:
  @@ -1068,11 +1070,24 @@
                   projectRow.createComment(project.getName())
                   self.insertLink( project, referencingObject, projectRow.createData())
                   
  +                # Inheritence
  +                projectRow.createData(depend.getInheritenceDescription())
  +                
  +                # Ids
  +                ids = depend.getIds() or 'All'
  +                projectRow.createData(ids)
  +                
  +                # Type
                   type=''
  +                if depend.isRuntime():
  +                    if type: type += ' '    
  +                    type+='Runtime'              
                   if depend.isOptional():
  -                    type='Optional'                
  +                    if type: type += ' '
  +                    type+='Optional'                
                   projectRow.createData(type)
                   
  +                # State description
                   self.insertStateDescription(project,referencingObject,projectRow.createData())
                   
       def documentAnnotations(self,xdocNode,annotatable):