Fix: Find dependencies of static classes

Author: josef-poetzl

.Copy2AddInFolder.cmd

@@ -1 +1,2 @@
 copy ACLibStructReader.accdb .\access-add-in\ACLibStructReader.accda
+timeout 2

access-add-in/ACLibStructReader.accda

@@ -39,11 +39,11 @@ End Sub
 
 Private Sub testGetLink()
 
-   Debug.Print getLink("abcXYZ")
+   Debug.Print GetLink("abcXYZ")
 
 End Sub
 
-Private Function getLink(strName As String) As String
+Private Function GetLink(strName As String) As String
 
 
    Dim i As Long
@@ -58,6 +58,6 @@ Private Function getLink(strName As String) As String
       i = i + 1
    Loop
 
-   getLink = strName
+   GetLink = strName
 
 End Function

source/___TEST.bas

@@ -8,18 +8,17 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Class Module: GraphvizStructViewer (Josef Pötzl, 2010-03-23)
+' Class: _codelib.addins.StructViewer.GraphvizStructViewer
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
+'
 ' GraphvizStructViewer
-' </summary>
-' <remarks>
-' </remarks>
 '
-'  @todo Einstellung der Graphviz-Parameter fehlt noch (es gibt noch zu viele Konstanten)
+' Remarks:
+'
+'  @todo Setting of Graphviz parameters is still missing (there are still too many constants)
 '
-'**/
+'---------------------------------------------------------------------------------------
+
 '---------------------------------------------------------------------------------------
 '<codelib>
 '  <file>_codelib/addins/StructViewer/GraphvizStructViewer.cls</file>
@@ -89,11 +88,11 @@ Public Sub ReadStruct()
 
 End Sub
 
-Private Function modulReaderExistsInCollection(col As Collection, cmr As CodeModuleReader) As Boolean
+Private Function ModulReaderExistsInCollection(col As Collection, cmr As CodeModuleReader) As Boolean
    Dim TempModuleReader As CodeModuleReader
    For Each TempModuleReader In col
       If TempModuleReader.Name = cmr.Name Then
-         modulReaderExistsInCollection = True
+         ModulReaderExistsInCollection = True
          Exit For
       End If
    Next
@@ -138,7 +137,7 @@ Private Sub addDOTobjects(ByVal markFirstItem As Boolean)
       If collectionItem.Name = "modErrorHandler" Then
          strColor = "gray"
       End If
-      m_DOT.AddNode strNodeID, collectionItem.Name, , strColor, strStyle, , , getLink(collectionItem)
+      m_DOT.AddNode strNodeID, collectionItem.Name, , strColor, strStyle, , , GetLink(collectionItem)
       m_DOT.Node(strNodeID).LayoutMode = collectionItem.CodeModule.Parent.Type
 
       If Len(strColor) > 0 Then strColor = vbNullString
@@ -149,7 +148,7 @@ Private Sub addDOTobjects(ByVal markFirstItem As Boolean)
 
 End Sub
 
-Private Function getLink(cmr As CodeModuleReader) As String
+Private Function GetLink(cmr As CodeModuleReader) As String
 
    Dim strName As String
    Dim i As Long
@@ -180,7 +179,7 @@ Private Function getLink(cmr As CodeModuleReader) As String
          ' lassen
    End Select
 
-   getLink = LCase(strName) & ".html"
+   GetLink = LCase(strName) & ".html"
 
 End Function
 

source/codelib/_codelib/addins/StructViewer/GraphvizStructViewer.cls

@@ -276,20 +276,22 @@ End Function
 '---------------------------------------------------------------------------------------
 Public Function ClassUsed(ByVal ClassName As String) As Boolean
 
-   Dim SearchString(5) As String
+   Dim SearchString(6) As String
    Dim i As Long
    Dim IsUsed As Boolean
-   Dim MaxCnt As Long
+   Dim MaxIndex As Long
 
    SearchString(0) = " As " & Trim$(ClassName) & vbNewLine
    SearchString(1) = " As " & Trim$(ClassName) & ","
    SearchString(2) = " As " & Trim$(ClassName) & " "
 
-   MaxCnt = 2
-   For i = 0 To MaxCnt
-      SearchString(MaxCnt + 1 + i) = " New " & Mid(SearchString(i), 5)
+   MaxIndex = 2
+   For i = 0 To MaxIndex
+      SearchString(MaxIndex + 1 + i) = " New " & Mid(SearchString(i), 5)
    Next
 
+   SearchString(6) = " " & Trim$(ClassName) & "." ' to detect the use of static classes
+   
    If StrPtr(m_CodeModuleText) = 0 Then
       m_CodeModuleText = PlainCodeText
    End If
@@ -340,11 +342,11 @@ Public Function ProcedureUsed(ByRef CodeModuleProc As CodeModuleProcedure) As Bo
    If StrPtr(m_CodeModuleText) = 0 Then
       m_CodeModuleText = PlainCodeText
    End If
-   
+
    'Text durchsuchen
    For i = LBound(SearchStringArray) To UBound(SearchStringArray)
-#If USEREGEX = 1 Then
-      With RegEx
+#If USEREGEXP = 1 Then
+      With RegExp
          .Pattern = SearchStringArray(i)
          .Global = False
          IsUsed = .Test(m_CodeModuleText)
@@ -395,7 +397,7 @@ Public Function HeaderItemUsed(ByRef HdrItm As CodeModuleHeaderItem) As Boolean
 
    For i = LBound(SearchStringArray) To UBound(SearchStringArray)
 #If USEREGEX = 1 Then
-      With RegEx
+      With RegExp
          .Pattern = SearchStringArray(i)
          .Global = False
          IsUsed = .Test(m_CodeModuleText)

source/codelib/_codelib/addins/shared/CodeModuleReader.cls

@@ -122,7 +122,7 @@ Public Sub ReadStruct()
    Dim vbc As Object
 #End If
    Dim TempModuleReader As CodeModuleReader
-   Dim baseModuleReader As CodeModuleReader
+   Dim BaseModuleReader As CodeModuleReader
 
    Dim strBaseCodeModuleName As String
    Dim lngCount As Long
@@ -137,7 +137,7 @@ Public Sub ReadStruct()
       Set TempModuleReader = New CodeModuleReader
       Set TempModuleReader.CodeModule = vbc.CodeModule
       m_CodeModuleReaderCollection.Add TempModuleReader, TempModuleReader.Name
-      If TempModuleReader.Name = strBaseCodeModuleName Then Set baseModuleReader = TempModuleReader
+      If TempModuleReader.Name = strBaseCodeModuleName Then Set BaseModuleReader = TempModuleReader
    Next
 
    'Abhängigkeiten ermitteln
@@ -147,7 +147,7 @@ Public Sub ReadStruct()
       Next
    Else
 
-      If baseModuleReader Is Nothing Then
+      If BaseModuleReader Is Nothing Then
          Err.Raise vbObjectError, "ReadStruct", "Das Code-Modul '" & strBaseCodeModuleName & "' wurde nicht gefunden!"
       End If
 
@@ -156,15 +156,15 @@ Public Sub ReadStruct()
       Dim checkReader As CodeModuleReader
 
       Set newCol = New Collection
-      Call baseModuleReader.CheckDependency(, m_CodeModuleReaderCollection)
-      newCol.Add baseModuleReader, baseModuleReader.Name
+      Call BaseModuleReader.CheckDependency(, m_CodeModuleReaderCollection)
+      newCol.Add BaseModuleReader, BaseModuleReader.Name
 
       lngCount = 1
       Do While lngCount <= newCol.Count
          Set TempModuleReader = newCol(lngCount)
          lngCount = lngCount + 1
          For Each checkReader In TempModuleReader.RequiredModules
-            If Not modulReaderExistsInCollection(newCol, checkReader) Then
+            If Not ModulReaderExistsInCollection(newCol, checkReader) Then
                Call checkReader.CheckDependency(, m_CodeModuleReaderCollection)
                newCol.Add checkReader, checkReader.Name
             End If
@@ -180,18 +180,17 @@ Public Sub ReadStruct()
 
 End Sub
 
-Private Function modulReaderExistsInCollection(col As Collection, cmr As CodeModuleReader) As Boolean
+Private Function ModulReaderExistsInCollection(col As Collection, cmr As CodeModuleReader) As Boolean
    Dim TempModuleReader As CodeModuleReader
    For Each TempModuleReader In col
       If TempModuleReader.Name = cmr.Name Then
-         modulReaderExistsInCollection = True
+         ModulReaderExistsInCollection = True
          Exit For
       End If
    Next
 End Function
 
-
-Private Function getLink(cmr As CodeModuleReader) As String
+Private Function GetLink(cmr As CodeModuleReader) As String
 
    Dim strName As String
    Dim i As Long
@@ -222,7 +221,7 @@ Private Function getLink(cmr As CodeModuleReader) As String
          ' lassen
    End Select
 
-   getLink = LCase(strName) & ".html"
+   GetLink = LCase(strName) & ".html"
 
 End Function
 

source/codelib/_codelib/addins/shared/CodeModuleStructReader.cls

@@ -8,15 +8,16 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Class Module: GraphvizDOT (Josef Pötzl)
+' Class: api.graphviz.GraphvizDOT
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
+'
 ' GraphvizDOT
-' </summary>
-' <remarks>
-' </remarks>
-'**/
+'
+' Author:
+'     Josef Poetzl
+'
+'---------------------------------------------------------------------------------------
+
 '---------------------------------------------------------------------------------------
 '<codelib>
 '  <file>api/graphviz/GraphvizDOT.cls</file>

source/codelib/api/graphviz/GraphvizDOT.cls

@@ -8,15 +8,16 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Class Module: GraphvizDOTconnection (Josef Pötzl)
+' Class: api.graphviz.GraphvizDOTconnection
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
-' Graphviz-Verbindung zw. zwei Knoten
-' </summary>
-' <remarks>
-' </remarks>
-'**/
+'
+' Graphviz connection between two nodes
+'
+' Author:
+'     Josef Poetzl
+'
+'---------------------------------------------------------------------------------------
+
 '---------------------------------------------------------------------------------------
 '<codelib>
 '  <file>api/graphviz/GraphvizDOTconnection.cls</file>

source/codelib/api/graphviz/GraphvizDOTconnection.cls

@@ -8,15 +8,17 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Class Module: GraphvizDOTgraph (Josef Pötzl)
+' Class: api.graphviz.GraphvizDOTgraph
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
-' Klasse zum Erstellen der Graphviz-Graph-Definition
-' </summary>
-' <remarks>
-' </remarks>
-'**/
+'
+' Class for creating the graphviz graph definition
+'
+'
+' Author:
+'     Josef Poetzl
+'
+'---------------------------------------------------------------------------------------
+
 '---------------------------------------------------------------------------------------
 '<codelib>
 '  <file>api/graphviz/GraphvizDOTgraph.cls</file>

source/codelib/api/graphviz/GraphvizDOTgraph.cls

@@ -8,15 +8,16 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 '---------------------------------------------------------------------------------------
-' Class Module: GraphvizDOTnode (Josef Pötzl)
+' Class: api.graphviz.GraphvizDOTnode
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
-' Graphviz-Knoten
-' </summary>
-' <remarks>
-' </remarks>
-'**/
+'
+' Graphviz node
+'
+' Author:
+'     Josef Poetzl
+'
+'---------------------------------------------------------------------------------------
+
 '---------------------------------------------------------------------------------------
 '<codelib>
 '  <file>api/graphviz/GraphvizDOTnode.cls</file>

source/codelib/api/graphviz/GraphvizDOTnode.cls

@@ -5,6 +5,9 @@ Attribute VB_Name = "modWinAPI_Registry"
 '
 ' Access to Windows Registry
 '
+' Author:
+'     Josef Poetzl
+'
 '---------------------------------------------------------------------------------------
 
 '---------------------------------------------------------------------------------------