From c2ffccf0f017cf5f76a4be582ca9990cdb736916 Mon Sep 17 00:00:00 2001 From: joyfullservice Date: Thu, 2 Nov 2023 17:27:43 -0500 Subject: [PATCH] Refactor for name change --- Version Control.accda.src/modules/clsDbTableData.cls | 2 +- Version Control.accda.src/modules/clsDbTableDef.cls | 2 +- .../modules/clsSourceParser.cls | 4 ++-- Version Control.accda.src/modules/modVCSUtility.bas | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Version Control.accda.src/modules/clsDbTableData.cls b/Version Control.accda.src/modules/clsDbTableData.cls index 4c5fbbbc..ed00152b 100644 --- a/Version Control.accda.src/modules/clsDbTableData.cls +++ b/Version Control.accda.src/modules/clsDbTableData.cls @@ -70,7 +70,7 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String) Application.ExportXML acExportTable, m_Table.Name, strFile End If Perf.OperationEnd - With New clsSanitize + With New clsSourceParser .LoadSourceFile strFile WriteFile .Sanitize(ectXML), strFile End With diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls index 880f850b..c119bee4 100644 --- a/Version Control.accda.src/modules/clsDbTableDef.cls +++ b/Version Control.accda.src/modules/clsDbTableDef.cls @@ -59,7 +59,7 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String) Perf.OperationEnd ' Rewrite sanitized XML as formatted UTF-8 content - With New clsSanitize + With New clsSourceParser .LoadSourceFile strFile DeleteFile strFile WriteFile .Sanitize(ectXML), strFile diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls index fdf79007..7f73ee67 100644 --- a/Version Control.accda.src/modules/clsSourceParser.cls +++ b/Version Control.accda.src/modules/clsSourceParser.cls @@ -8,7 +8,7 @@ Attribute VB_Creatable = False Attribute VB_PredeclaredId = False Attribute VB_Exposed = False '--------------------------------------------------------------------------------------- -' Module : modSanitize +' Module : clsSourceParser ' Author : Adam Waller ' Date : 12/4/2020 ' Purpose : Functions to sanitize files to remove non-essential metadata @@ -417,7 +417,7 @@ Private Function SanitizeObject() As String 'strPath As String, blnReturnHash As ' Prepare VBA output (if used) If Not cVBA Is Nothing Then ' Build sanitized VBA string - With New clsSanitize + With New clsSourceParser .LoadString cVBA.GetStr this.strVBA = .Sanitize(ectVBA) End With diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas index 80cb3cf1..b90ba8ee 100644 --- a/Version Control.accda.src/modules/modVCSUtility.bas +++ b/Version Control.accda.src/modules/modVCSUtility.bas @@ -413,7 +413,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ Dim strPrefix As String Dim strPrintSettingsFile As String Dim strHash As String - Dim cSanitize As clsSanitize + Dim cParser As clsSourceParser On Error GoTo ErrHandler @@ -428,7 +428,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ If FSO.FileExists(strFile) Then DeleteFile strFile ' Sanitize certain object types - Set cSanitize = New clsSanitize + Set cParser = New clsSourceParser Select Case intType Case acForm, acReport With New clsDevMode @@ -454,7 +454,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ End With ' Sanitizing converts to UTF-8 - With cSanitize + With cParser .LoadSourceFile strTempFile .ObjectName = FSO.GetBaseName(strFile) WriteFile .Sanitize(ectObjectDefinition), strFile @@ -473,7 +473,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ Case acQuery, acMacro ' Sanitizing converts to UTF-8 - With cSanitize + With cParser .LoadSourceFile strTempFile WriteFile .Sanitize(ectObjectDefinition), strFile strHash = .Hash @@ -485,7 +485,7 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ ' Table data macros are stored in XML format ' The file may not exist if no TD Macro was found If FSO.FileExists(strTempFile) Then - With cSanitize + With cParser .LoadSourceFile strTempFile WriteFile .Sanitize(ectXML), strFile strHash = .Hash @@ -622,7 +622,7 @@ Public Sub ExportCodeModule(strName As String, strFile As String) CurrentVBProject.VBComponents(strName).Export strTempFile ' Sanitize the VBA code while reading the temp file - With New clsSanitize + With New clsSourceParser .LoadString ReadFile(strTempFile, GetSystemEncoding) strContent = .Sanitize(ectVBA) End With