Previous commit also fixed that the AfterSaveAction(s) weren't called. This commit adds ILanguagePart to support more modular Language code.

[release]

Author: Lakritzator

Dapplo.Config.Tests/ConfigTests/Interfaces/IIniConfigSubInterfaceTest.cs

@@ -28,7 +28,7 @@
 
 namespace Dapplo.Config.Tests.ConfigTests.Interfaces
 {
-	public interface IIniConfigSubInterfaceTest : ISubSection
+	public interface IIniConfigSubInterfaceTest : IIniSubSection
 	{
 		string SubValue { get; set; }
 

Dapplo.Config.Tests/Dapplo.Config.Tests.csproj

@@ -190,6 +190,7 @@
     <Compile Include="HelperExtensions.cs" />
     <Compile Include="LanguageTests\Interfaces\ILanguageLoaderFailTest.cs" />
     <Compile Include="LanguageTests\Interfaces\ILanguageLoaderMyModule.cs" />
+    <Compile Include="LanguageTests\Interfaces\ILanguageLoaderPartTest.cs" />
     <Compile Include="LanguageTests\Interfaces\ILanguageLoaderTest.cs" />
     <Compile Include="LanguageTests\LanguageLoaderTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Dapplo.Config.Tests/LanguageTests/Interfaces/ILanguageLoaderPartTest.cs

@@ -0,0 +1,36 @@
+//  Dapplo - building blocks for desktop applications
+//  Copyright (C) 2015-2016 Dapplo
+// 
+//  For more information see: http://dapplo.net/
+//  Dapplo repositories are hosted on GitHub: https://github.com/dapplo
+// 
+//  This file is part of Dapplo.Config
+// 
+//  Dapplo.Config is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Lesser General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  Dapplo.Config is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Lesser General Public License for more details.
+// 
+//  You should have a copy of the GNU Lesser General Public License
+//  along with Dapplo.Config. If not, see <http://www.gnu.org/licenses/lgpl.txt>.
+
+#region using
+
+using System.ComponentModel;
+using Dapplo.Config.Language;
+
+#endregion
+
+namespace Dapplo.Config.Tests.LanguageTests.Interfaces
+{
+	public interface ILanguageLoaderPartTest : ILanguagePart
+	{
+		[DefaultValue(LanguageLoaderTest.Ok)]
+		string Ok2 { get; }
+	}
+}

Dapplo.Config.Tests/LanguageTests/Interfaces/ILanguageLoaderTest.cs

@@ -29,7 +29,7 @@
 namespace Dapplo.Config.Tests.LanguageTests.Interfaces
 {
 	[Language("Test")]
-	public interface ILanguageLoaderTest : ILanguage, INotifyPropertyChanged
+	public interface ILanguageLoaderTest : ILanguage, INotifyPropertyChanged, ILanguageLoaderPartTest
 	{
 		[DefaultValue(LanguageLoaderTest.Ok)]
 		string Ok { get; }

Dapplo.Config.Tests/LanguageTests/LanguageLoaderTest.cs

@@ -117,6 +117,14 @@ public async Task TestIndexer()
 			Assert.True(_languageLoader["test"].Keys().Contains("dapplo"));
 		}
 
+		[Fact]
+		public async Task TestLanguagePart()
+		{
+			var language = await _languageLoader.RegisterAndGetAsync<ILanguageLoaderTest>();
+			var part = _languageLoader.GetPart<ILanguageLoaderPartTest>();
+			Assert.Equal("Ok", part.Ok2);
+		}
+
 		[Fact]
 		public async Task Test_LanguageChanged()
 		{

Dapplo.Config/Dapplo.Config.csproj

@@ -65,7 +65,8 @@
     <Compile Include="Ini\IniSectionEventArgs.cs" />
     <Compile Include="Ini\IniValue.cs" />
     <Compile Include="Ini\IniConfig.cs" />
-    <Compile Include="Ini\ISubSection.cs" />
+    <Compile Include="Ini\IIniSubSection.cs" />
+    <Compile Include="Language\ILanguagePart.cs" />
     <Compile Include="Language\Implementation\ILanguageInternal.cs" />
     <Compile Include="Support\TypeDescriptorContext.cs" />
     <Compile Include="Language\ILanguage.cs" />

Dapplo.Config/Ini/ISubSection.cs Dapplo.Config/Ini/IIniSubSection.cs

@@ -24,7 +24,7 @@ namespace Dapplo.Config.Ini
 	/// <summary>
 	///     Marker interface for sub sections
 	/// </summary>
-	public interface ISubSection
+	public interface IIniSubSection
 	{
 	}
 }

Dapplo.Config/Ini/IniConfig.cs

@@ -640,15 +640,21 @@ public T Get<T>() where T : IIniSection
 		}
 
 		/// <summary>
-		///     Get the IniSection which contains the sub section.
+		///     Get the IniSection which contains the specified sub section.
 		/// </summary>
 		/// <typeparam name="T">Type which extends ISubSection</typeparam>
 		/// <returns>T</returns>
-		public T GetSubSection<T>() where T : ISubSection
+		public T GetSubSection<T>() where T : IIniSubSection
 		{
 			var type = typeof(T);
-
-			return (T)Sections.FirstOrDefault(s => type.IsInstanceOfType(s));
+			if (type.IsInstanceOfType(typeof(IIniSection)))
+			{
+				throw new ArgumentException("Cannot be of type IIniSection", nameof(T));
+			}
+			lock (_iniSections)
+			{
+				return (T)_iniSections.Where(s => type.IsInstanceOfType(s.Value)).Select(s => s.Value).FirstOrDefault();
+			}
 		}
 
 		/// <summary>

Dapplo.Config/Language/ILanguagePart.cs

@@ -0,0 +1,34 @@
+#region Dapplo 2016 - GNU Lesser General Public License
+
+// Dapplo - building blocks for .NET applications
+// Copyright (C) 2016 Dapplo
+// 
+// For more information see: http://dapplo.net/
+// Dapplo repositories are hosted on GitHub: https://github.com/dapplo
+// 
+// This file is part of Dapplo.Config
+// 
+// Dapplo.Config is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// Dapplo.Config is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+// 
+// You should have a copy of the GNU Lesser General Public License
+// along with Dapplo.Config. If not, see <http://www.gnu.org/licenses/lgpl.txt>.
+
+#endregion
+
+namespace Dapplo.Config.Language
+{
+	/// <summary>
+	///     Marker interface which allows a ILanguage interface to be devided, which allows more modular code.
+	/// </summary>
+	public interface ILanguagePart
+	{
+	}
+}

Dapplo.Config/Language/LanguageLoader.cs

@@ -297,6 +297,24 @@ public T Get<T>() where T : ILanguage
 			return (T) Get(type);
 		}
 
+		/// <summary>
+		///     Get the ILanguage which contains the specified ILanguagePart.
+		/// </summary>
+		/// <typeparam name="T">Type which extends ISubSection</typeparam>
+		/// <returns>T</returns>
+		public T GetPart<T>() where T : ILanguagePart
+		{
+			var type = typeof(T);
+			if (type.IsInstanceOfType(typeof(ILanguage)))
+			{
+				throw new ArgumentException("Cannot be of type ILanguage", nameof(T));
+			}
+			lock (_languageTypeConfigs)
+			{
+				return (T) _languageTypeConfigs.Where(s => type.IsInstanceOfType(s.Value)).Select(l => l.Value).FirstOrDefault();
+			}
+		}
+
 		/// <summary>
 		///     Start the intial load, but if none was made yet
 		/// </summary>