Refactoring: normalizing the namespaces.

Lisias · Lisias · commit 9946fea00a97 · 2023-05-14T22:31:46.000-03:00
diff --git a/Source/ModuleManagerWatchDog/ErrorMessages.cs b/Source/ModuleManagerWatchDog/ErrorMessages.cs
@@ -14,7 +14,7 @@ You should have received a copy of the SKL Standard License 1.0
 	<https://ksp.lisias.net/SKL-1_0.txt>.
 
 */
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	internal static class ErrorMessage
 	{
diff --git a/Source/ModuleManagerWatchDog/GUI/RebootTheGameAlertBox.cs b/Source/ModuleManagerWatchDog/GUI/RebootTheGameAlertBox.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using UnityEngine;
 
-namespace ModuleManagerWatchDog.GUI.Dialogs
+namespace WatchDog.ModuleManager.GUI.Dialogs
 {
 	internal static class ShowRebootTheGameAlertBox
 	{
diff --git a/Source/ModuleManagerWatchDog/GUI/ShowStopperAlertBox.cs b/Source/ModuleManagerWatchDog/GUI/ShowStopperAlertBox.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using UnityEngine;
 
-namespace ModuleManagerWatchDog.GUI.Dialogs
+namespace WatchDog.ModuleManager.GUI.Dialogs
 {
 	internal static class ShowStopperAlertBox
 	{
diff --git a/Source/ModuleManagerWatchDog/GUI/WarningAlertbox.cs b/Source/ModuleManagerWatchDog/GUI/WarningAlertbox.cs
@@ -21,7 +21,7 @@ You should have received a copy of the SKL Standard License 1.0
 
 using UnityEngine;
 
-namespace ModuleManagerWatchDog.GUI.Dialogs
+namespace WatchDog.ModuleManager.GUI.Dialogs
 {
 	internal class WarningAlertBox : AbstractDialog
 	{
diff --git a/Source/ModuleManagerWatchDog/Globals.cs b/Source/ModuleManagerWatchDog/Globals.cs
@@ -17,7 +17,7 @@ You should have received a copy of the SKL Standard License 1.0
 using System;
 using SIO = System.IO;
 
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	public class Globals
 	{
diff --git a/Source/ModuleManagerWatchDog/InstallChecker.cs b/Source/ModuleManagerWatchDog/InstallChecker.cs
@@ -20,7 +20,7 @@ You should have received a copy of the SKL Standard License 1.0
 using System.Reflection;
 using SIO = System.IO;
 
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	internal class InstallChecker
 	{
@@ -79,7 +79,7 @@ private void Handle(string msg)
 
 		private string CheckMyself()
 		{
-			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Namespace);
+			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Assembly.GetName().Name);
 
 #if DEBUG
 			Log.dbg("CheckMyself");
diff --git a/Source/ModuleManagerWatchDog/ModuleManagerWatchDog.csproj b/Source/ModuleManagerWatchDog/ModuleManagerWatchDog.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{C4A875CC-E958-429F-944B-D0702EA76A89}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>ModuleManagerWatchDog</RootNamespace>
+    <RootNamespace>WatchDog.ModuleManager</RootNamespace>
     <AssemblyName>ModuleManagerWatchDog</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <BaseIntermediateOutputPath>..\..\obj\ModuleManagerWatchDog</BaseIntermediateOutputPath>
diff --git a/Source/ModuleManagerWatchDog/Startup.cs b/Source/ModuleManagerWatchDog/Startup.cs
@@ -16,14 +16,14 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using UnityEngine;
 
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	[KSPAddon(KSPAddon.Startup.Instantly, true)]
 	internal class Startup : MonoBehaviour
 	{
 		private void Start()
 		{
-			Log.force("Version {0}", Version.Text);
+			Log.force("Version {0}", ModuleManagerWatchDog.Version.Text);
 			{
 				InstallChecker ic = new InstallChecker();
 				ic.Execute();
diff --git a/Source/ModuleManagerWatchDog/Util/Log.cs b/Source/ModuleManagerWatchDog/Util/Log.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using System.Diagnostics;
 
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	public static class Log
 	{
diff --git a/Source/ModuleManagerWatchDog/Util/SanityLib.cs b/Source/ModuleManagerWatchDog/Util/SanityLib.cs
@@ -20,7 +20,7 @@ You should have received a copy of the SKL Standard License 1.0
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ModuleManagerWatchDog
+namespace WatchDog.ModuleManager
 {
 	public static class SanityLib
 	{
diff --git a/Source/ModuleManagerWatchDog/Util/Toolbox.cs b/Source/ModuleManagerWatchDog/Util/Toolbox.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-namespace ModuleManagerWatchDog.Util
+namespace WatchDog.ModuleManager.Util
 {
 	internal static class Toolbox
 	{
diff --git a/Source/WatchDogForInterstellarRedist/ErrorMessages.cs b/Source/WatchDogForInterstellarRedist/ErrorMessages.cs
@@ -14,7 +14,7 @@ You should have received a copy of the SKL Standard License 1.0
 	<https://ksp.lisias.net/SKL-1_0.txt>.
 
 */
-namespace WatchDogForInterstellarRedist
+namespace WatchDog.InterstellarRedist
 {
 	public static class ErrorMessage
 	{
diff --git a/Source/WatchDogForInterstellarRedist/GUI/ShowStopperAlertBox.cs b/Source/WatchDogForInterstellarRedist/GUI/ShowStopperAlertBox.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using UnityEngine;
 
-namespace WatchDogForInterstellarRedist.GUI
+namespace WatchDog.InterstellarRedist.GUI
 {
 	internal static class ShowStopperAlertBox
 	{
diff --git a/Source/WatchDogForInterstellarRedist/Startup.cs b/Source/WatchDogForInterstellarRedist/Startup.cs
@@ -20,9 +20,9 @@ You should have received a copy of the SKL Standard License 1.0
 
 using UnityEngine;
 
-using ModuleManagerWatchDog;
+using SanityLib = WatchDog.ModuleManager.SanityLib;
 
-namespace WatchDogForInterstellarRedist
+namespace WatchDog.InterstellarRedist
 {
 	[KSPAddon(KSPAddon.Startup.Instantly, true)]
 	internal class Startup : MonoBehaviour
@@ -68,7 +68,7 @@ private void Start()
 
 		private string CheckMyself()
 		{
-			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Namespace);
+			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Assembly.GetName().Name);
 
 			// Obviously, would be pointless to check for it not being installed! (0 == count). :)
 			if (1 != loaded.Count()) return ErrorMessage.ERR_MULTIPLE_TOOL;
diff --git a/Source/WatchDogForInterstellarRedist/Util/Log.cs b/Source/WatchDogForInterstellarRedist/Util/Log.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using System.Diagnostics;
 
-namespace WatchDogForInterstellarRedist
+namespace WatchDog.InterstellarRedist
 {
 	public static class Log
 	{
diff --git a/Source/WatchDogForInterstellarRedist/WatchDogForInterstellarRedist.csproj b/Source/WatchDogForInterstellarRedist/WatchDogForInterstellarRedist.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{580A1F8F-30A3-4ABC-A6B6-C70BF6A66BF3}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>WatchDogForInterstellarRedist</RootNamespace>
+    <RootNamespace>WatchDog.InterstellarRedist</RootNamespace>
     <AssemblyName>WatchDogForInterstellarRedist</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <BaseIntermediateOutputPath>..\..\obj\WatchDogForInterstellarRedist</BaseIntermediateOutputPath>
diff --git a/Source/WatchDogForScaleRedist/ErrorMessages.cs b/Source/WatchDogForScaleRedist/ErrorMessages.cs
@@ -14,7 +14,7 @@ You should have received a copy of the SKL Standard License 1.0
 	<https://ksp.lisias.net/SKL-1_0.txt>.
 
 */
-namespace WatchDogForScaleRedist
+namespace WatchDog.ScaleRedist
 {
 	public static class ErrorMessage
 	{
diff --git a/Source/WatchDogForScaleRedist/GUI/ShowStopperAlertBox.cs b/Source/WatchDogForScaleRedist/GUI/ShowStopperAlertBox.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using UnityEngine;
 
-namespace WatchDogForScaleRedist.GUI
+namespace WatchDog.ScaleRedist.GUI
 {
 	internal static class ShowStopperAlertBox
 	{
diff --git a/Source/WatchDogForScaleRedist/Startup.cs b/Source/WatchDogForScaleRedist/Startup.cs
@@ -20,9 +20,9 @@ You should have received a copy of the SKL Standard License 1.0
 
 using UnityEngine;
 
-using ModuleManagerWatchDog;
+using SanityLib = WatchDog.ModuleManager.SanityLib;
 
-namespace WatchDogForScaleRedist
+namespace WatchDog.ScaleRedist
 {
 	[KSPAddon(KSPAddon.Startup.Instantly, true)]
 	internal class Startup : MonoBehaviour
@@ -85,7 +85,7 @@ private void Execute()
 
 		private string CheckMyself()
 		{
-			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Namespace);
+			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Assembly.GetName().Name);
 
 			// Obviously, would be pointless to check for it not being installed! (0 == count). :)
 			if (1 != loaded.Count()) return ErrorMessage.ERR_MULTIPLE_TOOL;
diff --git a/Source/WatchDogForScaleRedist/Util/Log.cs b/Source/WatchDogForScaleRedist/Util/Log.cs
@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0
 */
 using System.Diagnostics;
 
-namespace WatchDogForScaleRedist
+namespace WatchDog.ScaleRedist
 {
 	public static class Log
 	{
diff --git a/Source/WatchDogForScaleRedist/WatchDogForScaleRedist.csproj b/Source/WatchDogForScaleRedist/WatchDogForScaleRedist.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{2A16D384-BD05-45C2-9FAD-4CE2882854A8}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>WatchDogForScaleRedist</RootNamespace>
+    <RootNamespace>WatchDog.ScaleRedist</RootNamespace>
     <AssemblyName>WatchDogForScaleRedist</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <BaseIntermediateOutputPath>..\..\obj\WatchDogForScaleRedist</BaseIntermediateOutputPath>
diff --git a/Source/WatchDogInstallChecker/Startup.cs b/Source/WatchDogInstallChecker/Startup.cs
@@ -96,7 +96,7 @@ private void OnDestroy()
 
 		private string CheckMyself()
 		{
-			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName("WatchDogInstallChecker");
+			IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Assembly.GetName().Name);
 
 			// Obviously, would be pointless to check for it not being installed! (0 == count). :)
 			if (1 != loaded.Count()) return ErrorMessage.ERR_MULTIPLE_TOOL;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ You should have received a copy of the SKL Standard License 1.0`
`14`	`14`	`<https://ksp.lisias.net/SKL-1_0.txt>.`
`15`	`15`
`16`	`16`	`*/`
`17`		`-namespace ModuleManagerWatchDog`
	`17`	`+namespace WatchDog.ModuleManager`
`18`	`18`	`{`
`19`	`19`	`internal static class ErrorMessage`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ You should have received a copy of the SKL Standard License 1.0`
`16`	`16`	`*/`
`17`	`17`	`using UnityEngine;`
`18`	`18`
`19`		`-namespace ModuleManagerWatchDog.GUI.Dialogs`
	`19`	`+namespace WatchDog.ModuleManager.GUI.Dialogs`
`20`	`20`	`{`
`21`	`21`	`internal static class ShowRebootTheGameAlertBox`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ You should have received a copy of the SKL Standard License 1.0`
`21`	`21`
`22`	`22`	`using UnityEngine;`
`23`	`23`
`24`		`-namespace ModuleManagerWatchDog.GUI.Dialogs`
	`24`	`+namespace WatchDog.ModuleManager.GUI.Dialogs`
`25`	`25`	`{`
`26`	`26`	`internal class WarningAlertBox : AbstractDialog`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ You should have received a copy of the SKL Standard License 1.0`
`17`	`17`	`using System;`
`18`	`18`	`using SIO = System.IO;`
`19`	`19`
`20`		`-namespace ModuleManagerWatchDog`
	`20`	`+namespace WatchDog.ModuleManager`
`21`	`21`	`{`
`22`	`22`	`public class Globals`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ You should have received a copy of the SKL Standard License 1.0`
`20`	`20`	`using System.Reflection;`
`21`	`21`	`using SIO = System.IO;`
`22`	`22`
`23`		`-namespace ModuleManagerWatchDog`
	`23`	`+namespace WatchDog.ModuleManager`
`24`	`24`	`{`
`25`	`25`	`internal class InstallChecker`
`26`	`26`	`{`
`@@ -79,7 +79,7 @@ private void Handle(string msg)`
`79`	`79`
`80`	`80`	`private string CheckMyself()`
`81`	`81`	`{`
`82`		`- IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Namespace);`
	`82`	`+ IEnumerable<AssemblyLoader.LoadedAssembly> loaded = SanityLib.FetchLoadedAssembliesByName(this.GetType().Assembly.GetName().Name);`
`83`	`83`
`84`	`84`	`#if DEBUG`
`85`	`85`	`Log.dbg("CheckMyself");`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ You should have received a copy of the SKL Standard License 1.0`
`16`	`16`	`*/`
`17`	`17`	`using UnityEngine;`
`18`	`18`
`19`		`-namespace ModuleManagerWatchDog`
	`19`	`+namespace WatchDog.ModuleManager`
`20`	`20`	`{`
`21`	`21`	`[KSPAddon(KSPAddon.Startup.Instantly, true)]`
`22`	`22`	`internal class Startup : MonoBehaviour`
`23`	`23`	`{`
`24`	`24`	`private void Start()`
`25`	`25`	`{`
`26`		`- Log.force("Version {0}", Version.Text);`
	`26`	`+ Log.force("Version {0}", ModuleManagerWatchDog.Version.Text);`
`27`	`27`	`{`
`28`	`28`	`InstallChecker ic = new InstallChecker();`
`29`	`29`	`ic.Execute();`