diff --git a/CSE/Tools/ApplicationEvents.vb b/CSE/ApplicationEvents.vb
similarity index 100%
rename from CSE/Tools/ApplicationEvents.vb
rename to CSE/ApplicationEvents.vb
diff --git a/CSE/CSE.vbproj b/CSE/CSE.vbproj
index 3f0199c083d19c5674ae06a0a8b3b20bd8e8614f..65a2463afa30b1dbea50003ab60d14bd1d88c6bd 100644
--- a/CSE/CSE.vbproj
+++ b/CSE/CSE.vbproj
@@ -108,12 +108,12 @@
<Compile Include="Classes\cJsonFile.vb" />
<Compile Include="Classes\CResult.vb" />
<Compile Include="Classes\cPreferences.vb" />
+ <Compile Include="Classes\cSemanticVersion.vb" />
<Compile Include="Classes\csKey.vb" />
<Compile Include="Classes\cUTMCoord.vb" />
<Compile Include="Classes\cValidSec.vb" />
<Compile Include="Classes\cVehicle.vb" />
<Compile Include="Classes\cVirtMSC.vb" />
- <Compile Include="Classes\SemanticVersion.vb" />
<Compile Include="Export\Minor_routines_output.vb" />
<Compile Include="Export\output.vb" />
<Compile Include="Export\OutputTest.vb" />
@@ -131,10 +131,10 @@
<Compile Include="GUI\F_Preferences.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\F_Info.Designer.vb">
- <DependentUpon>F_Info.vb</DependentUpon>
+ <Compile Include="GUI\F_About.Designer.vb">
+ <DependentUpon>F_About.vb</DependentUpon>
</Compile>
- <Compile Include="GUI\F_Info.vb">
+ <Compile Include="GUI\F_About.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="declaration_public.vb" />
@@ -171,9 +171,9 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
- <Compile Include="Tools\ApplicationEvents.vb" />
- <Compile Include="Tools\Minor_routines.vb" />
- <Compile Include="Tools\cFile_v3.vb" />
+ <Compile Include="ApplicationEvents.vb" />
+ <Compile Include="Minor_routines.vb" />
+ <Compile Include="Classes\cFile_v3.vb" />
<Compile Include="CSE_Globals.vb" />
<Compile Include="CSE_Types.vb" />
</ItemGroup>
@@ -181,8 +181,8 @@
<EmbeddedResource Include="GUI\F_Preferences.resx">
<DependentUpon>F_Preferences.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\F_Info.resx">
- <DependentUpon>F_Info.vb</DependentUpon>
+ <EmbeddedResource Include="GUI\F_About.resx">
+ <DependentUpon>F_About.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\FB_Dialog.resx">
<DependentUpon>FB_Dialog.vb</DependentUpon>
@@ -296,6 +296,7 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CSE/Tools/cFile_v3.vb b/CSE/Classes/cFile_v3.vb
similarity index 100%
rename from CSE/Tools/cFile_v3.vb
rename to CSE/Classes/cFile_v3.vb
diff --git a/CSE/Classes/cSemanticVersion.vb b/CSE/Classes/cSemanticVersion.vb
index b8e85a125c126c8010f3c3202b6a9436bd092ec0..c8754a83baac7758a4cc5cdb176b45e926587044 100644
--- a/CSE/Classes/cSemanticVersion.vb
+++ b/CSE/Classes/cSemanticVersion.vb
@@ -65,7 +65,7 @@ Public NotInheritable Class cSemanticVersion
RegexOptions.Compiled Or RegexOptions.Singleline)
''' <summary>
- ''' Initializes a new instance of the <see cref="SemanticVersion"/> class.
+ ''' Initializes a new instance of the <see cref="cSemanticVersion"/> class.
''' </summary>
''' <param name="version">
''' The semantic version number to be parsed.
@@ -95,7 +95,7 @@ Public NotInheritable Class cSemanticVersion
End Sub
''' <summary>
- ''' Initializes a new instance of the <see cref="SemanticVersion"/> class.
+ ''' Initializes a new instance of the <see cref="cSemanticVersion"/> class.
''' </summary>
''' <param name="majorVersion">
''' The major version number.
@@ -168,10 +168,10 @@ Public NotInheritable Class cSemanticVersion
Public Property PrereleaseVersion As String
''' <summary>
- ''' Compares two <see cref="SemanticVersion"/> objects for equality.
+ ''' Compares two <see cref="cSemanticVersion"/> objects for equality.
''' </summary>
''' <param name="version">
- ''' The first <see cref="SemanticVersion"/> object to compare.
+ ''' The first <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <param name="other">
''' The second semantic version object to compare.
@@ -187,13 +187,13 @@ Public NotInheritable Class cSemanticVersion
End Operator
''' <summary>
- ''' Compares two <see cref="SemanticVersion"/> objects for equality.
+ ''' Compares two <see cref="cSemanticVersion"/> objects for equality.
''' </summary>
''' <param name="version">
- ''' The first <see cref="SemanticVersion"/> object to compare.
+ ''' The first <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <param name="other">
- ''' The second <see cref="SemanticVersion"/> object to compare.
+ ''' The second <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <returns>
''' <b>True</b> if the objects are not equal, or <b>false</b> if the
@@ -206,14 +206,14 @@ Public NotInheritable Class cSemanticVersion
End Operator
''' <summary>
- ''' Compares two <see cref="SemanticVersion"/> objects to determine if
+ ''' Compares two <see cref="cSemanticVersion"/> objects to determine if
''' the first object logically precedes the second object.
''' </summary>
''' <param name="version">
- ''' The first <see cref="SemanticVersion"/> object to compare.
+ ''' The first <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <param name="other">
- ''' The second <see cref="SemanticVersion"/> object to compare.
+ ''' The second <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <returns>
''' <b>True</b> if <paramref name="version"/> precedes
@@ -233,14 +233,14 @@ Public NotInheritable Class cSemanticVersion
End Operator
''' <summary>
- ''' Compares two <see cref="SemanticVersion"/> object to determine if
+ ''' Compares two <see cref="cSemanticVersion"/> object to determine if
''' the first object logically precedes the second object.
''' </summary>
''' <param name="version">
- ''' The first <see cref="SemanticVersion"/> object to compare.
+ ''' The first <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <param name="other">
- ''' The second <see cref="SemanticVersion"/> object to compare.
+ ''' The second <see cref="cSemanticVersion"/> object to compare.
''' </param>
''' <returns>
''' <b>True</b> if <paramref name="version"/> follows
@@ -295,7 +295,7 @@ Public NotInheritable Class cSemanticVersion
''' </list>
''' </returns>
''' <exception cref="ArgumentException">
- ''' <paramref name="obj"/> is not a <see cref="SemanticVersion"/>
+ ''' <paramref name="obj"/> is not a <see cref="cSemanticVersion"/>
''' object.
''' </exception>
Public Function CompareTo(ByVal obj As Object) As Integer Implements IComparable.CompareTo
@@ -307,10 +307,10 @@ Public NotInheritable Class cSemanticVersion
''' <summary>
''' Compares the current object with another
- ''' <see cref="SemanticVersion"/> object.
+ ''' <see cref="cSemanticVersion"/> object.
''' </summary>
''' <param name="other">
- ''' The other <see cref="SemanticVersion"/> object to compare to this
+ ''' The other <see cref="cSemanticVersion"/> object to compare to this
''' instance.
''' </param>
''' <returns>
@@ -380,11 +380,11 @@ Public NotInheritable Class cSemanticVersion
End Function
''' <summary>
- ''' Compares this instance to another <see cref="SemanticVersion"/>
+ ''' Compares this instance to another <see cref="cSemanticVersion"/>
''' object for equality.
''' </summary>
''' <param name="other">
- ''' The <see cref="SemanticVersion"/> object to compare to this
+ ''' The <see cref="cSemanticVersion"/> object to compare to this
''' instance.
''' </param>
''' <returns>
diff --git a/CSE/GUI/F_Info.Designer.vb b/CSE/GUI/F_About.Designer.vb
similarity index 99%
rename from CSE/GUI/F_Info.Designer.vb
rename to CSE/GUI/F_About.Designer.vb
index 5fff9bf0e6bc4823a8ab934b7f5a25c26d618f2b..f9c2dd250da57fe55918056d7f08d4ba84beb562 100644
--- a/CSE/GUI/F_Info.Designer.vb
+++ b/CSE/GUI/F_About.Designer.vb
@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_Info
+Partial Class F_About
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,7 +22,7 @@ Partial Class F_Info
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Info))
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_About))
Me.Label1 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
@@ -252,7 +252,7 @@ Partial Class F_Info
Me.Label13.TabIndex = 20
Me.Label13.Text = "Copyright: 2014 European Union"
'
- 'CSE_Info
+ 'F_Info
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -282,7 +282,7 @@ Partial Class F_Info
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximumSize = New System.Drawing.Size(480, 591)
Me.MinimumSize = New System.Drawing.Size(480, 591)
- Me.Name = "CSE_Info"
+ Me.Name = "F_Info"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "About CSE"
CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/CSE/GUI/F_Info.resx b/CSE/GUI/F_About.resx
similarity index 100%
rename from CSE/GUI/F_Info.resx
rename to CSE/GUI/F_About.resx
diff --git a/CSE/GUI/F_Info.vb b/CSE/GUI/F_About.vb
similarity index 99%
rename from CSE/GUI/F_Info.vb
rename to CSE/GUI/F_About.vb
index 1a96ab43bb0b0d419a4502a0b0f8efbd121e29e4..c1b57dc3c95332e7d0af7272d8b0f30e9c20f45f 100644
--- a/CSE/GUI/F_Info.vb
+++ b/CSE/GUI/F_About.vb
@@ -1,4 +1,4 @@
-Public Class F_Info
+Public Class F_About
'Initialisation
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index f2557ec935368293722eee685324a2d2cef91650..7432cd69a883706f8337977d685fd93eb743b746 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -475,7 +475,7 @@ Public Class F_Main
' Menu open the Infobox
Private Sub ToolStripMenuItemAbout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemAbout.Click
' Show the info GUI
- F_Info.Show()
+ F_About.Show()
End Sub
' Menu open the user manual
diff --git a/CSE/GUI/F_Preferences.designer.vb b/CSE/GUI/F_Preferences.designer.vb
index c9a9c7bd807d70c87d18774f21aaa34f536f0845..b13b991b0c3d47f9e444a5c404918f7fbc82ac91 100644
--- a/CSE/GUI/F_Preferences.designer.vb
+++ b/CSE/GUI/F_Preferences.designer.vb
@@ -215,7 +215,7 @@ Partial Class F_Preferences
Me.TextBoxNotepad.Size = New System.Drawing.Size(444, 20)
Me.TextBoxNotepad.TabIndex = 1
'
- 'CSE_Preferences
+ 'F_Preferences
'
Me.AcceptButton = Me.ButtonOK
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -230,7 +230,7 @@ Partial Class F_Preferences
Me.MaximizeBox = False
Me.MinimizeBox = False
Me.MinimumSize = New System.Drawing.Size(521, 294)
- Me.Name = "CSE_Preferences"
+ Me.Name = "F_Preferences"
Me.Text = "Preferences"
Me.GroupBoxWorDir.ResumeLayout(False)
Me.GroupBoxWorDir.PerformLayout()
diff --git a/CSE/Tools/Minor_routines.vb b/CSE/Minor_routines.vb
similarity index 100%
rename from CSE/Tools/Minor_routines.vb
rename to CSE/Minor_routines.vb