Skip to content

Commit 11c41c7

Browse files
committed
New
1 parent 1413732 commit 11c41c7

File tree

1 file changed

+18
-27
lines changed

1 file changed

+18
-27
lines changed

AUTO_FUNCTIONS/Installer.vb

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Public Class Installer
1313
Public ASSEMBLY_NAME As Assembly
1414
Public ASSEMBLY_KEYNAME As String
1515
Public ASSEMBLY_DISPLAY_NAME As String
16-
Public Const NEWLINE As String = vbCrLf
16+
Public Const NEWLINE As String = vbCrLf & vbCrLf
1717
Public REGISTRATION_SERVICES As RegistrationServices
1818

1919

@@ -75,12 +75,7 @@ Public Class Installer
7575

7676
Catch ex As Exception
7777

78-
Dim BOXTEXT As String = Nothing
79-
BOXTEXT &= "Assembly Name = " & ASSEMBLY_DISPLAY_NAME & NEWLINE
80-
BOXTEXT &= "Assembly GUID = " & ASSEMBLY_GUID & NEWLINE
81-
BOXTEXT &= "Message = " & ex.Message
82-
83-
MsgBox(BOXTEXT, vbCritical + vbOKOnly, " Error Registering Assembly")
78+
INSTALL_ERROR("Error Registering Assembly", ex.Message)
8479

8580
End Try
8681

@@ -102,13 +97,7 @@ Public Class Installer
10297

10398
Catch ex As Exception
10499

105-
Dim BOXTEXT As String = Nothing
106-
BOXTEXT &= "Assembly Name = " & ASSEMBLY_DISPLAY_NAME & NEWLINE
107-
BOXTEXT &= "Assembly GUID = " & ASSEMBLY_GUID & NEWLINE
108-
BOXTEXT &= "Registry Key = " & SetKey.ToString & NEWLINE
109-
BOXTEXT &= "Message = " & ex.Message
110-
111-
MsgBox(BOXTEXT, vbCritical + vbOKOnly, " Error updating registry")
100+
INSTALL_ERROR("Error updating registry", ex.Message, "Registry Key = " & SetKey.ToString)
112101

113102
End Try
114103

@@ -125,13 +114,7 @@ Public Class Installer
125114

126115
Catch ex As Exception
127116

128-
Dim BOXTEXT As String = Nothing
129-
BOXTEXT &= "Assembly Name = " & ASSEMBLY_DISPLAY_NAME & NEWLINE
130-
BOXTEXT &= "Assembly GUID = " & ASSEMBLY_GUID & NEWLINE
131-
BOXTEXT &= "Registry SubKey = " & ASSEMBLY_KEYNAME & "Programmable" & NEWLINE
132-
BOXTEXT &= "Message = " & ex.Message
133-
134-
MsgBox(BOXTEXT, vbCritical + vbOKOnly, " Error deleting subkey")
117+
INSTALL_ERROR("Error deleting subkey", ex.Message, "Registry SubKey = " & ASSEMBLY_KEYNAME & "Programmable")
135118

136119
End Try
137120

@@ -145,15 +128,23 @@ Public Class Installer
145128

146129
Catch ex As Exception
147130

148-
Dim BOXTEXT As String = Nothing
149-
BOXTEXT &= "Assembly Name = " & ASSEMBLY_DISPLAY_NAME & NEWLINE
150-
BOXTEXT &= "Assembly GUID = " & ASSEMBLY_GUID & NEWLINE
151-
BOXTEXT &= "Message = " & ex.Message
152-
153-
MsgBox(BOXTEXT, vbCritical + vbOKOnly, " Error UnRegistering Assembly")
131+
INSTALL_ERROR("Error UnRegistering Assembly", ex.Message)
154132

155133
End Try
156134

157135
End Sub
158136

137+
Public Sub INSTALL_ERROR(BOX_TITLE As String, MESSAGE As String, Optional EXTRA_TEXT As String = NEWLINE)
138+
139+
Dim BOXTEXT As String = ""
140+
141+
BOXTEXT &= "Assembly Name = " & ASSEMBLY_DISPLAY_NAME & NEWLINE
142+
BOXTEXT &= "Assembly GUID = " & ASSEMBLY_GUID & NEWLINE
143+
BOXTEXT &= "Message = " & MESSAGE & NEWLINE
144+
BOXTEXT &= EXTRA_TEXT
145+
146+
MsgBox(BOXTEXT, vbCritical + vbOKOnly, " " & BOX_TITLE)
147+
148+
End Sub
149+
159150
End Class

0 commit comments

Comments
 (0)