Skip to content

Commit aa7db8f

Browse files
author
Aaron Fisher
committed
Added New buttons to choose between old and new methods
1 parent 7f43644 commit aa7db8f

File tree

2 files changed

+101
-29
lines changed

2 files changed

+101
-29
lines changed

WindowsApplication2/Form1.Designer.vb

+73-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WindowsApplication2/Form1.vb

+28-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
Public Class Form1
2-
Private Sub btnChooseFile_Click(sender As Object, e As EventArgs) Handles btnExmlToXml.Click
2+
Dim method As String
3+
Private Sub btnChooseFile_Click(sender As Object, e As EventArgs) Handles btnExmlToXmlNew.Click
4+
method = "new"
35
dlgExmlToXml.ShowDialog()
46
End Sub
57

6-
Private Sub btnXmlToExml_Click(sender As Object, e As EventArgs) Handles btnXmlToExml.Click
8+
Private Sub btnXmlToExml_Click(sender As Object, e As EventArgs) Handles btnXmlToExmlNew.Click
9+
method = "new"
710
dlgXmlToExml.ShowDialog()
811
End Sub
912

@@ -14,7 +17,11 @@
1417
Debug.Print(dlgExmlToXml.ToString)
1518
For Each file In dlgExmlToXml.FileNames
1619
RawExmlString = My.Computer.FileSystem.ReadAllText(dlgExmlToXml.FileName)
17-
ParsedXML = ParseExmlString(RawExmlString)
20+
If method = "new" Then
21+
ParsedXML = ParseExmlStringNew(RawExmlString)
22+
Else
23+
ParsedXML = ParseExmlStringOld(RawExmlString)
24+
End If
1825
ParsedXML.Save(dlgExmlToXml.FileName & ".xml")
1926
Next
2027
End Sub
@@ -25,7 +32,11 @@
2532
Dim file As String
2633
For Each file In dlgXmlToExml.FileNames
2734
XMLString = My.Computer.FileSystem.ReadAllText(dlgXmlToExml.FileName)
28-
RevertedExml = RevertXmltoExml(XMLString)
35+
If method = "new" Then
36+
RevertedExml = RevertXmltoExmlNew(XMLString)
37+
Else
38+
RevertedExml = RevertXmltoExmlOld(XMLString)
39+
End If
2940
If dlgXmlToExml.FileName.EndsWith(".exml.xml") Then
3041
Dim NewFileName As String
3142
NewFileName = dlgXmlToExml.FileName.Remove(dlgXmlToExml.FileName.Length - 4, 4)
@@ -36,7 +47,7 @@
3647
Next
3748
End Sub
3849

39-
Public Function ParseExmlStringOLD(RawExmlString As String)
50+
Public Function ParseExmlStringOld(RawExmlString As String)
4051
Dim xdoc As New XDocument()
4152
xdoc = XDocument.Parse(RawExmlString)
4253
For Each element As XElement In xdoc.Descendants
@@ -63,7 +74,7 @@
6374
Return xdoc
6475
End Function
6576

66-
Public Function ParseExmlString(RawExmlString As String)
77+
Public Function ParseExmlStringNew(RawExmlString As String)
6778
Dim xdoc As New XDocument()
6879
xdoc = XDocument.Parse(RawExmlString)
6980
For Each element As XElement In xdoc.Descendants
@@ -94,7 +105,7 @@
94105
Return xdoc
95106
End Function
96107

97-
Public Function RevertXmltoExml(XMLString As String)
108+
Public Function RevertXmltoExmlNew(XMLString As String)
98109
Dim xdoc As New XDocument()
99110
xdoc = XDocument.Parse(XMLString)
100111
For Each element As XElement In xdoc.Descendants
@@ -115,7 +126,7 @@
115126
Return xdoc
116127
End Function
117128

118-
Public Function RevertXmltoExmlold(XMLString As String)
129+
Public Function RevertXmltoExmlOld(XMLString As String)
119130
Dim xdoc As New XDocument()
120131
xdoc = XDocument.Parse(XMLString)
121132
For Each element As XElement In xdoc.Descendants
@@ -138,4 +149,13 @@
138149
Return xdoc
139150
End Function
140151

152+
Private Sub btnExmlToXmlOld_Click(sender As Object, e As EventArgs) Handles btnExmlToXmlOld.Click
153+
method = "old"
154+
dlgExmlToXml.ShowDialog()
155+
End Sub
156+
157+
Private Sub btnXmlToExmlOld_Click(sender As Object, e As EventArgs) Handles btnXmlToExmlOld.Click
158+
method = "old"
159+
dlgXmlToExml.ShowDialog()
160+
End Sub
141161
End Class

0 commit comments

Comments
 (0)