[JEDI.NET-commits] tools/docs/common Jedi.Docs.System.pas,1.6,1.7

[Marcel B. <jed...@us...>]

Update of /cvsroot/jedidotnet/tools/docs/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12220/tools/docs/common

Modified Files:
	Jedi.Docs.System.pas 
Log Message:
* If a method with parameters used the <exclude /> tag, the parameters where generated as methods when regenerating the namespace xml files.
* Added code to copy any non-standard xml nodes from the original file when regenerating the namespace xml files.

Index: Jedi.Docs.System.pas
===================================================================
RCS file: /cvsroot/jedidotnet/tools/docs/common/Jedi.Docs.System.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Jedi.Docs.System.pas	26 Nov 2004 17:30:46 -0000	1.6
--- Jedi.Docs.System.pas	26 Nov 2004 20:50:38 -0000	1.7
***************
*** 95,100 ****
      procedure UpdateElement(name: string; required: Boolean); overload;
      procedure UpdateElement(name: string; required: Boolean; attrName, attrValue: string); overload;
      procedure UpdateMemberSkeleton(var index: Integer);
!     procedure UpdateParamsSkeleton(var index: Integer);
      class procedure WriteAssemblyDocFile(assemblies: HybridDictionary; assemblyName: string); static;
      procedure WriteHeader;
--- 95,101 ----
      procedure UpdateElement(name: string; required: Boolean); overload;
      procedure UpdateElement(name: string; required: Boolean; attrName, attrValue: string); overload;
+     procedure UpdateNonStandardElements;
      procedure UpdateMemberSkeleton(var index: Integer);
!     procedure UpdateParamsSkeleton(var index: Integer; skip: Boolean = False);
      class procedure WriteAssemblyDocFile(assemblies: HybridDictionary; assemblyName: string); static;
      procedure WriteHeader;
***************
*** 929,932 ****
--- 930,949 ----
  end;
  
+ procedure OutputGenerator.UpdateNonStandardElements;
+ var
+   enum: IEnumerator;
+   childNode: XmlNode;
+ begin
+   enum := FMemberNode.ChildNodes.GetEnumerator;
+   while enum.MoveNext do
+   begin
+     childNode := XmlNode(enum.Current);
+     if (childNode.NodeType = XmlNodeType.Element) and (childNode.Name <> 'overloads') and
+         (childNode.Name <> 'summary')  and (childNode.Name <> 'returns') and (childNode.Name <> 'value') and
+         (childNode.Name <> 'remarks') and (childNode.Name <> 'param') then
+       XmlNodeUtils.WriteNode(childNode, Self);
+   end;
+ end;
+ 
  procedure OutputGenerator.UpdateMemberSkeleton(var index: Integer);
  begin
***************
*** 935,938 ****
--- 952,957 ----
      FXmlWriter.WriteStartElement('exclude');
      FXmlWriter.WriteEndElement;
+     if (FMemberFlags and (MemberFlags.IsMethod or MemberFlags.IsProperty)) <> MemberFlags.None then
+       UpdateParamsSkeleton(index, True);
    end
    else
***************
*** 953,961 ****
        UpdateElement('remarks', False);
  
      WriteCommentEnd; // ensure all comments are closed
    end;
  end;
  
! procedure OutputGenerator.UpdateParamsSkeleton(var index: Integer);
  var
    baseName: string;
--- 972,982 ----
        UpdateElement('remarks', False);
  
+     UpdateNonStandardElements;
+ 
      WriteCommentEnd; // ensure all comments are closed
    end;
  end;
  
! procedure OutputGenerator.UpdateParamsSkeleton(var index: Integer; skip: Boolean);
  var
    baseName: string;
***************
*** 965,969 ****
    while (index < FNamespaceMembers.Count) and string(FNamespaceMembers.GetKey(index)).StartsWith(baseName) do
    begin
!     if (MemberFlags(FNamespaceMembers.GetByIndex(index)) and MemberFlags.InAssembly) <> MemberFlags.None then
        UpdateElement('param', True, 'name', NameMapper.ParamName(string(FNamespaceMembers.GetKey(index))));
      Inc(index);
--- 986,991 ----
    while (index < FNamespaceMembers.Count) and string(FNamespaceMembers.GetKey(index)).StartsWith(baseName) do
    begin
!     if not skip and (
!         (MemberFlags(FNamespaceMembers.GetByIndex(index)) and MemberFlags.InAssembly) <> MemberFlags.None) then
        UpdateElement('param', True, 'name', NameMapper.ParamName(string(FNamespaceMembers.GetKey(index))));
      Inc(index);