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

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

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

Modified Files:
	JediDoc.System.Xml.AssemblyDocGeneration.pas 
	JediDoc.System.Xml.Reflection.pas 
Log Message:
Changed 'Translate' (and similar) to 'Replace' (and similar) throughout the source as it better describes the process

Index: JediDoc.System.Xml.AssemblyDocGeneration.pas
===================================================================
RCS file: /cvsroot/jedidotnet/tools/JediDoc/source/JediDoc.System.Xml.AssemblyDocGeneration.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JediDoc.System.Xml.AssemblyDocGeneration.pas	19 Jun 2005 14:49:38 -0000	1.2
--- JediDoc.System.Xml.AssemblyDocGeneration.pas	19 Jun 2005 16:00:18 -0000	1.3
***************
*** 226,230 ****
    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.Translate(XmlElement(memberNode), translationList);
  
    FWriter.WriteStartElement('member');
--- 226,230 ----
    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');

Index: JediDoc.System.Xml.Reflection.pas
===================================================================
RCS file: /cvsroot/jedidotnet/tools/JediDoc/source/JediDoc.System.Xml.Reflection.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JediDoc.System.Xml.Reflection.pas	19 Jun 2005 14:49:38 -0000	1.2
--- JediDoc.System.Xml.Reflection.pas	19 Jun 2005 16:00:18 -0000	1.3
***************
*** 58,62 ****
    strict private
      class function GetIncludedNodes(filename, xpath: string; fileList: HashTable): XmlNodeList; static;
!     class procedure ProcessIncludeTranslations(importedNode, includeNode: XmlNode); static;
    {$ENDREGION}
    {$REGION 'Custom tag processing methods'}
--- 58,62 ----
    strict private
      class function GetIncludedNodes(filename, xpath: string; fileList: HashTable): XmlNodeList; static;
!     class procedure ProcessIncludeReplacements(importedNode, includeNode: XmlNode); static;
    {$ENDREGION}
    {$REGION 'Custom tag processing methods'}
***************
*** 69,75 ****
      class procedure CustomTagProcessing(doc: XmlDocument); static;
      class procedure ExpandIncludeNodes(doc: XmlDocument; fileList: HashTable); static;
!     class procedure Translate(element: XmlElement); overload; static;
!     class procedure Translate(element: XmlElement; translationList: IDictionary); overload; static;
!     class procedure TranslateCommonMemberReferences(element: XmlElement); static;
    {$ENDREGION}
    end;
--- 69,75 ----
      class procedure CustomTagProcessing(doc: XmlDocument); static;
      class procedure ExpandIncludeNodes(doc: XmlDocument; fileList: HashTable); static;
!     class procedure Replace(element: XmlElement); overload; static;
!     class procedure Replace(element: XmlElement; translationList: IDictionary); overload; static;
!     class procedure ReplaceCommonMemberReferences(element: XmlElement); static;
    {$ENDREGION}
    end;
***************
*** 205,209 ****
        importedNode := doc.ImportNode(includedNode, True);
        includeNode.ParentNode.InsertBefore(importedNode, includeNode);
!       ProcessIncludeTranslations(importedNode, includeNode);
      end;
      removeList.Add(includeNode);
--- 205,209 ----
        importedNode := doc.ImportNode(includedNode, True);
        includeNode.ParentNode.InsertBefore(importedNode, includeNode);
!       ProcessIncludeReplacements(importedNode, includeNode);
      end;
      removeList.Add(includeNode);
***************
*** 230,242 ****
  end;
  
! class procedure XmlUtils.ProcessIncludeTranslations(importedNode, includeNode: XmlNode);
  var
    customList: SortedList;
    attr: XmlAttribute;
    argNum: Integer;
!   translateNode: XmlNode;
  begin
    customList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   // retrieve {0} type argument translations.
    for attr in includeNode.Attributes do
    begin
--- 230,242 ----
  end;
  
! class procedure XmlUtils.ProcessIncludeReplacements(importedNode, includeNode: XmlNode);
  var
    customList: SortedList;
    attr: XmlAttribute;
    argNum: Integer;
!   replaceNode: XmlNode;
  begin
    customList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   // retrieve {0} type argument replacements.
    for attr in includeNode.Attributes do
    begin
***************
*** 247,259 ****
      end;
    end;
!   // retrieve <translate> tags
!   for translateNode in XmlElement(includeNode).GetElementsByTagName('translate') do
    begin
!     attr := translateNode.Attributes['source'];
      if not Assigned(attr) then
!       raise Exception.Create('Missing ''source'' attribute in the ''translate'' tag');
!     customList.Add(attr.Value, translateNode.InnerText);
    end;
!   Translate(XmlElement(importedNode), customList);
  end;
  
--- 247,259 ----
      end;
    end;
!   // retrieve <replace> tags
!   for replaceNode in XmlElement(includeNode).GetElementsByTagName('replace') do
    begin
!     attr := replaceNode.Attributes['source'];
      if not Assigned(attr) then
!       raise Exception.Create('Missing ''source'' attribute in the ''replace'' tag');
!     customList.Add(attr.Value, replaceNode.InnerText);
    end;
!   Replace(XmlElement(importedNode), customList);
  end;
  
***************
*** 318,330 ****
  end;
  
! class procedure XmlUtils.Translate(element: XmlElement);
  var
    list: SortedList;
  begin
    list := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   Translate(element, list);
  end;
  
! class procedure XmlUtils.Translate(element: XmlElement; translationList: IDictionary);
  var
    nodeInner: string;
--- 318,330 ----
  end;
  
! class procedure XmlUtils.Replace(element: XmlElement);
  var
    list: SortedList;
  begin
    list := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
!   Replace(element, list);
  end;
  
! class procedure XmlUtils.Replace(element: XmlElement; translationList: IDictionary);
  var
    nodeInner: string;
***************
*** 341,348 ****
  end;
  
! class procedure XmlUtils.TranslateCommonMemberReferences(element: XmlElement);
  var
    memberElement: XmlElement;
!   translateList: SortedList;
    id: string;
    qualifiedName: string;
--- 341,348 ----
  end;
  
! class procedure XmlUtils.ReplaceCommonMemberReferences(element: XmlElement);
  var
    memberElement: XmlElement;
!   replaceList: SortedList;
    id: string;
    qualifiedName: string;
***************
*** 355,366 ****
    if memberElement <> nil then
    begin
!     translateList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
      id := memberElement.Attributes['name'].Value;
      qualifiedName := StringUtils.After(StringUtils.BeforeLast(id, '('), ':');
      className := StringUtils.BeforeLast(qualifiedName, '.');
      memberName := StringUtils.AfterLast(qualifiedName, '.');
!     translateList.Add('<see_self>', System.String.Format('<see cref="{0}" />', id));
!     translateList.Add('<see_class>', System.String.Format('<see cref="T:{0}" />', className));
!     Translate(element, translateList);
    end;
  end;
--- 355,366 ----
    if memberElement <> nil then
    begin
!     replaceList := SortedList.Create(CaseInsensitiveComparer.DefaultInvariant);
      id := memberElement.Attributes['name'].Value;
      qualifiedName := StringUtils.After(StringUtils.BeforeLast(id, '('), ':');
      className := StringUtils.BeforeLast(qualifiedName, '.');
      memberName := StringUtils.AfterLast(qualifiedName, '.');
!     replaceList.Add('<see_self>', System.String.Format('<see cref="{0}" />', id));
!     replaceList.Add('<see_class>', System.String.Format('<see cref="T:{0}" />', className));
!     Replace(element, replaceList);
    end;
  end;