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

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

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

Modified Files:
	Jedi.Docs.System.pas 
Log Message:
* Fixed bug regarding Delphi internal classes of nested types
* Allowed for the <exclude /> tag (would previously regenerate the skeleton because it was considered to be an empty member)
* Possibly some other minor fixes

Index: Jedi.Docs.System.pas
===================================================================
RCS file: /cvsroot/jedidotnet/tools/docs/common/Jedi.Docs.System.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Jedi.Docs.System.pas	26 Jun 2004 10:22:44 -0000	1.2
--- Jedi.Docs.System.pas	26 Nov 2004 09:57:56 -0000	1.3
***************
*** 198,202 ****
      list := node.ChildNodes;
      index := list.Count - 1;
!     while (index >= 0) and ((list[index].NodeType <> XmlNodeType.Element) or (list[Index].InnerXml = '')) do
        Dec(index);
      Result := index >= 0;
--- 198,203 ----
      list := node.ChildNodes;
      index := list.Count - 1;
!     while (index >= 0) and ((list[index].NodeType <> XmlNodeType.Element) or ((list[Index].InnerXml = '') and
!         (list[index].LocalName <> 'exclude'))) do
        Dec(index);
      Result := index >= 0;
***************
*** 440,446 ****
  
  function AssemblyOverview.CanTypeBeDocumented(&type: System.Type): Boolean;
  begin
    Result := (&type.IsPublic or &type.IsNestedPublic or &type.IsNestedFamily or &type.IsNestedFamORAssem) and
!     not &type.Name.StartsWith('@Meta') and (&type.Name <> 'Unit');
  end;
  
--- 441,450 ----
  
  function AssemblyOverview.CanTypeBeDocumented(&type: System.Type): Boolean;
+ var
+   base: System.Type;
  begin
+   base := &type.BaseType;
    Result := (&type.IsPublic or &type.IsNestedPublic or &type.IsNestedFamily or &type.IsNestedFamORAssem) and
!     (not Assigned(base) or (base.FullName <> 'Borland.Delphi.System.@TClass')) and (&type.Name <> 'Unit');
  end;
  
***************
*** 676,682 ****
  
  function AssemblyOverview.MustTypeBeDocumented(&type: System.Type): Boolean;
  begin
!   Result := &type.IsPublic or &type.IsNestedPublic or (not &type.DeclaringType.IsSealed and
!     (&type.IsNestedFamily or &type.IsNestedFamORAssem));
  end;
  
--- 680,690 ----
  
  function AssemblyOverview.MustTypeBeDocumented(&type: System.Type): Boolean;
+ var
+   base: System.Type;
  begin
!   base := &type.BaseType;
!   Result := (not Assigned(base) or (&type.BaseType.FullName <> 'Borland.Delphi.System.@TClass')) and (
!     &type.IsPublic or &type.IsNestedPublic or (not &type.DeclaringType.IsSealed and
!     (&type.IsNestedFamily or &type.IsNestedFamORAssem)));
  end;
  
***************
*** 907,926 ****
  procedure OutputGenerator.UpdateMemberSkeleton(var index: Integer);
  begin
!   UpdateElement('overloads', False);
!   UpdateElement('summary', True);
  
!   if (FMemberFlags and (MemberFlags.IsMethod or MemberFlags.IsProperty)) <> MemberFlags.None then
!     UpdateParamsSkeleton(index);
  
!   if (FMemberFlags and MemberFlags.IsFunction) = MemberFlags.IsFunction then
!     UpdateElement('returns', True);
  
!   if (FMemberFlags and MemberFlags.IsProperty) <> MemberFlags.None then
!     UpdateElement('value', False);
  
!   if (FMemberFlags and MemberFlags.IsNamespace) = MemberFlags.None then
!     UpdateElement('remarks', False);
  
!   WriteCommentEnd; // ensure all comments are closed
  end;
  
--- 915,942 ----
  procedure OutputGenerator.UpdateMemberSkeleton(var index: Integer);
  begin
!   if FMemberNode.SelectSingleNode('exclude') <> nil then
!   begin
!     FXmlWriter.WriteStartElement('exclude');
!     FXmlWriter.WriteEndElement;
!   end
!   else
!   begin
!     UpdateElement('overloads', False);
!     UpdateElement('summary', True);
  
!     if (FMemberFlags and (MemberFlags.IsMethod or MemberFlags.IsProperty)) <> MemberFlags.None then
!       UpdateParamsSkeleton(index);
  
!     if (FMemberFlags and MemberFlags.IsFunction) = MemberFlags.IsFunction then
!       UpdateElement('returns', True);
  
!     if (FMemberFlags and MemberFlags.IsProperty) <> MemberFlags.None then
!       UpdateElement('value', False);
  
!     if (FMemberFlags and MemberFlags.IsNamespace) = MemberFlags.None then
!       UpdateElement('remarks', False);
  
!     WriteCommentEnd; // ensure all comments are closed
!   end;
  end;