[Happydoc-checkins] CVS: HappyDoc3/happydoclib packagetree.py,1.4,1.5 scanner.py,1.16,1.17

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc3/happydoclib
In directory sc8-pr-cvs1:/tmp/cvs-serv12335/happydoclib

Modified Files:
	packagetree.py scanner.py 
Log Message:
Have each PackageTree node register itself with its parent, so there
is no need to perform the registration as a separate step.


Index: packagetree.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/packagetree.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** packagetree.py	18 Jan 2003 16:03:33 -0000	1.4
--- packagetree.py	18 Jan 2003 16:52:04 -0000	1.5
***************
*** 94,108 ****
      def __init__(self, parent, name):
          trace.into('PackageTree', '__init__',
-                    parent=parent,
                     name=name,
                     outputLevel=TRACE_LEVEL,
                     )
          UserDict.UserDict.__init__(self)
!         
          self.parent = parent
          
!         self.name = os.path.basename(name)
          trace.write('self.name=%s' % self.name, outputLevel=TRACE_LEVEL)
-         self.canonical_name = name
          
          trace.outof(outputLevel=TRACE_LEVEL)
--- 94,121 ----
      def __init__(self, parent, name):
          trace.into('PackageTree', '__init__',
                     name=name,
                     outputLevel=TRACE_LEVEL,
                     )
          UserDict.UserDict.__init__(self)
! 
!         self.name = os.path.basename(name)
          self.parent = parent
          
!         if self.parent is not None:
!             #
!             # If we have a parent, tell it about
!             # ourself and use the basename of
!             # our name as the canonical name.
!             #
!             self.parent.addSubNode(self)
!             self.canonical_name = self.name
!         else:
!             #
!             # We have no parent, so use our full
!             # name as the canonical name.
!             #
!             self.canonical_name = name
!         
          trace.write('self.name=%s' % self.name, outputLevel=TRACE_LEVEL)
          
          trace.outof(outputLevel=TRACE_LEVEL)
***************
*** 150,156 ****
          #
          for class_name in self.module_info.getClassNames():
!             class_tree = self.addSubNode(class_name,
!                                          nodeClass=ClassTree,
!                                          )
  
          #
--- 163,167 ----
          #
          for class_name in self.module_info.getClassNames():
!             class_tree = ClassTree(self, class_name)
  
          #
***************
*** 158,164 ****
          #
          for function_name in self.module_info.getFunctionNames():
!             function_tree = self.addSubNode(function_name,
!                                             nodeClass=FunctionTree,
!                                             )
          
  
--- 169,173 ----
          #
          for function_name in self.module_info.getFunctionNames():
!             function_tree = FunctionTree(self, function_name)
          
  
***************
*** 554,558 ****
          return named_node
  
!     def addSubNode(self, name, nodeClass=None):
          """Insert a child node under this node.
  
--- 563,567 ----
          return named_node
  
!     def addSubNode(self, node):
          """Insert a child node under this node.
  
***************
*** 560,574 ****
          and save it as one of our children.
          """
!         trace.into('PackageTree', 'addSubNode', name=name,
!                    outputLevel=TRACE_LEVEL)
! 
!         if nodeClass:
!             new_node = nodeClass(self, name)
!         else:
!             new_node = PackageTree(self, name)
!             
!         self[name] = new_node
!         trace.outof(outputLevel=TRACE_LEVEL)
!         return new_node
  
      def getSubNodes(self, mimetype=None):
--- 569,574 ----
          and save it as one of our children.
          """
!         self[node.getName()] = node
!         return node
  
      def getSubNodes(self, mimetype=None):
***************
*** 670,676 ****
  
          for method_name in self.code_info.getMethodNames():
!             method_node = self.addSubNode(method_name,
!                                           nodeClass=MethodTree,
!                                           )
          trace.outof(outputLevel=TRACE_LEVEL)
          return
--- 670,675 ----
  
          for method_name in self.code_info.getMethodNames():
!             method_node = MethodTree(self, method_name)
!             
          trace.outof(outputLevel=TRACE_LEVEL)
          return

Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** scanner.py	18 Jan 2003 14:15:29 -0000	1.16
--- scanner.py	18 Jan 2003 16:52:05 -0000	1.17
***************
*** 169,176 ****
          # Create the node for this name
          #
!         if parent is not None:
!             tree = parent.addSubNode(package_tree_name)
!         else:
!             tree = PackageTree(None, directoryName)
          
          #
--- 169,173 ----
          # Create the node for this name
          #
!         tree = PackageTree(parent, directoryName)
          
          #