Refactoring ISingleton

iconstudio · Oct 6, 2023 · c7f60fb · c7f60fb
1 parent 122d32e
commit c7f60fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Editor/TestEditor/App.xaml.cs b/Editor/TestEditor/App.xaml.cs
@@ -93,7 +93,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
 			myProject.Activate();
 		}
 
-		public static App GetInstance() => ISingleton<App>.SingleInstance;
+		public static App GetInstance() => ISingleton<App>.Instance;
 
 		private static LRESULT MainHook(HWND hWnd, uint uMsg, WPARAM wParam, LPARAM lParam, nuint id, nuint refdata)
 		{

diff --git a/Editor/TestEditor/MainWindow.xaml.cs b/Editor/TestEditor/MainWindow.xaml.cs
@@ -41,6 +41,6 @@ public MainWindow()
 		}
 
 		public Frame GetContent() => rootFrame;
-		public static MainWindow GetInstance() => ISingleton<MainWindow>.SingleInstance;
+		public static MainWindow GetInstance() => ISingleton<MainWindow>.Instance;
 	}
 }
diff --git a/Editor/TestEditor/Utilities/ISingleton.cs b/Editor/TestEditor/Utilities/ISingleton.cs
@@ -2,36 +2,35 @@
 {
 	public interface ISingleton<T> where T : class, new()
 	{
-		private static T _Instance;
-
-		public static T SingleInstance => _Instance;
+		protected static T Instance { get; set; }
+		protected static T SingleInstance => Instance;
 
 		/// <param name="instance"></param>
 		/// <exception cref="SingletonException"></exception>
 		public static void SetInstance(T instance)
 		{
-			if (_Instance is not null)
+			if (Instance is not null)
 			{
 				throw new SingletonException($"Duplicated instance of {nameof(T)}");
 			}
 
-			_Instance = instance;
+			Instance = instance;
 		}
 		public static bool TryInstance(T instance)
 		{
-			if (_Instance is not null)
+			if (Instance is not null)
 			{
 				return false;
 			}
 
-			_Instance = instance;
+			Instance = instance;
 			return true;
 		}
 		public static T GetInstance()
 		{
-			lock (SingleInstance)
+			lock (Instance)
 			{
-				return SingleInstance;
+				return Instance;
 			}
 		}
 	}