Remove ability to import user data from TCodeImporter

Made minimal changes to calling code to support change in TCodeImporter's interface.

Author: delphidabbler

Src/UCodeImportExport.pas

@@ -68,8 +68,6 @@   TCodeImporter = class(TNoPublicConstructObject)
   strict private
     ///  <summary>Version of file being imported.</summary>
     fVersion: Integer;
-    ///  <summary>Information about user who created export.</summary>
-    fUserInfo: TUserInfo;
     ///  <summary>List of snippets read from XML.</summary>
     fSnippetInfo: TSnippetInfoList;
     ///  <summary>Extended XML document object.</summary>
@@ -91,14 +89,12 @@   TCodeImporter = class(TNoPublicConstructObject)
   public
     ///  <summary>Destroys object.</summary>
     destructor Destroy; override;
-    ///  <summary>Imports snippets and optional user data from XML.</summary>
-    ///  <param name="UserInfo">TUserInfo [out] Receives user information. Set
-    ///  to null if no user information was available.</param>
+    ///  <summary>Imports snippets from XML.</summary>
     ///  <param name="SnippetInfo">TSnippetInfoList [out] Receives information
     ///  about each imported snippet.</param>
     ///  <param name="Data">TBytes [in] Byte array containing XML data.</param>
-    class procedure ImportData(out UserInfo: TUserInfo;
-      out SnippetInfo: TSnippetInfoList; const Data: TBytes);
+    class procedure ImportData(out SnippetInfo: TSnippetInfoList;
+      const Data: TBytes);
   end;
 
 type
@@ -469,7 +465,6 @@ procedure TCodeImporter.Execute(const Data: TBytes);
   // Error message
   sParseError = 'Import file has an invalid format';
 var
-  UserNode: IXMLNode;               // node containing any user info
   SnippetNodes: IXMLSimpleNodeList; // list of snippet nodes
   SnippetNode: IXMLNode;            // each snippet node in list
   Idx: Integer;                     // loops thru snippet node list
@@ -482,21 +477,6 @@ procedure TCodeImporter.Execute(const Data: TBytes);
     // Validate loaded document and get version number
     fVersion := ValidateDoc;
 
-    // Get user info
-    UserNode :=  fXMLDoc.FindNode(cExportRootNode + '\' + cUserInfoNode);
-    if Assigned(UserNode) then
-    begin
-      fUserInfo.Details.Name := TXMLDocHelper.GetSubTagText(
-        fXMLDoc, UserNode, cUserNameNode
-      );
-      fUserInfo.Details.Email := TXMLDocHelper.GetSubTagText(
-        fXMLDoc, UserNode, cUserEmailNode
-      );
-      fUserInfo.Comments := TXMLDocHelper.GetSubTagText(
-        fXMLDoc, UserNode, cUserCommentsNode
-      );
-    end;
-
     // Read in all snippets
     SnippetNodes := GetAllSnippetNodes;
     SetLength(fSnippetInfo, SnippetNodes.Count);
@@ -574,15 +554,14 @@ function TCodeImporter.GetAllSnippetNodes: IXMLSimpleNodeList;
   Result := fXMLDoc.FindChildNodes(SnippetsNode, cSnippetNode);
 end;
 
-class procedure TCodeImporter.ImportData(out UserInfo: TUserInfo;
-  out SnippetInfo: TSnippetInfoList; const Data: TBytes);
+class procedure TCodeImporter.ImportData(out SnippetInfo: TSnippetInfoList;
+  const Data: TBytes);
 var
   Idx: Integer; // loops through all imported snippets
 begin
   with InternalCreate do
     try
       Execute(Data);
-      UserInfo.Assign(fUserInfo);
       SetLength(SnippetInfo, Length(fSnippetInfo));
       for Idx := Low(fSnippetInfo) to High(fSnippetInfo) do
         SnippetInfo[Idx].Assign(fSnippetInfo[Idx]);
@@ -599,7 +578,6 @@ constructor TCodeImporter.InternalCreate;
   fXMLDoc := TXMLDocHelper.CreateXMLDoc;
   // Initialise fields that receive imported data
   SetLength(fSnippetInfo, 0);
-  fUserInfo.Init;
 end;
 
 function TCodeImporter.ValidateDoc: Integer;

Src/UCodeImportMgr.pas

@@ -214,7 +214,7 @@ procedure TCodeImportMgr.Import(const FileName: string);
   fImportInfoList.Clear;
   try
     Data := TFileIO.ReadAllBytes(FileName);
-    TCodeImporter.ImportData(fUserInfo, fSnippetInfoList, Data);
+    TCodeImporter.ImportData(fSnippetInfoList, Data);
   except
     on E: EStreamError do
       raise ECodeImportMgr.Create(E);