[JEDI.NET-commits] tools/JediDoc/source JediDoc.System.Xml.AssemblyDocGeneration.pas,1.3,1.4

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

Update of /cvsroot/jedidotnet/tools/JediDoc/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19995/tools/JediDoc/source

Modified Files:
	JediDoc.System.Xml.AssemblyDocGeneration.pas 
Log Message:
Adapted to the fact that the fileList cache now stores the full path and file names.

Index: JediDoc.System.Xml.AssemblyDocGeneration.pas
===================================================================
RCS file: /cvsroot/jedidotnet/tools/JediDoc/source/JediDoc.System.Xml.AssemblyDocGeneration.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JediDoc.System.Xml.AssemblyDocGeneration.pas	19 Jun 2005 16:00:18 -0000	1.3
--- JediDoc.System.Xml.AssemblyDocGeneration.pas	23 Jun 2005 17:28:28 -0000	1.4
***************
*** 170,184 ****
  class function AssemblyDocs.InputXmlFile(filename: string): XmlDocument;
  var
    savedDir: string;
  begin
!   Result := XmlDocument(FInDocs[filename]);
    if not Assigned(Result) then
    begin
      Result := XmlDocument.Create;
!     Result.Load(filename);
!     FInDocs.Add(filename, Result);
      savedDir := Environment.CurrentDirectory;
      try
!       Environment.CurrentDirectory := Path.GetDirectoryName(filename);
        XmlUtils.ExpandIncludeNodes(Result, FInDocs);
      finally
--- 170,186 ----
  class function AssemblyDocs.InputXmlFile(filename: string): XmlDocument;
  var
+   fi: FileInfo;
    savedDir: string;
  begin
!   fi := FileInfo.Create(filename);
!   Result := XmlDocument(FInDocs[fi.FullName]);
    if not Assigned(Result) then
    begin
      Result := XmlDocument.Create;
!     Result.Load(fi.FullName);
!     FInDocs.Add(fi.FullName, Result);
      savedDir := Environment.CurrentDirectory;
      try
!       Environment.CurrentDirectory := fi.DirectoryName;
        XmlUtils.ExpandIncludeNodes(Result, FInDocs);
      finally
***************
*** 220,230 ****
  var
    childNode: XmlNode;
!   translationList: SortedList;
  begin
!   translationList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   translationList.Add('<see-ns />', System.String.Format('<see cref="N:{0}" />', member.NameSpace));
!   translationList.Add('<see-class />', System.String.Format('<see cref="T:{0}.{1}" />', member.NameSpace, member.TypeName));
!   translationList.Add('<see-self />', System.String.Format('<see cref="{0}" />', canonicalName));
!   XmlUtils.Replace(XmlElement(memberNode), translationList);
  
    FWriter.WriteStartElement('member');
--- 222,232 ----
  var
    childNode: XmlNode;
!   replacementList: SortedList;
  begin
!   replacementList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   replacementList.Add('<see-ns />', System.String.Format('<see cref="N:{0}" />', member.NameSpace));
!   replacementList.Add('<see-class />', System.String.Format('<see cref="T:{0}.{1}" />', member.NameSpace, member.TypeName));
!   replacementList.Add('<see-self />', System.String.Format('<see cref="{0}" />', canonicalName));
!   XmlUtils.Replace(XmlElement(memberNode), replacementList);
  
    FWriter.WriteStartElement('member');