Clean code via CodeMaid

Author: Dirkster99

source/Components/Settings/Settings/Interfaces/IOptions.cs

@@ -1,11 +1,9 @@
 namespace Settings.Interfaces
 {
-	using Settings.ProgramSettings;
-	using System.Collections.Generic;
-
 	public interface IOptions
 	{
 		#region properties
+
 		bool IsDirty { get; set; }
 		string LanguageSelected { get; set; }
 		bool ReloadOpenFilesOnAppStart { get; set; }
@@ -24,17 +22,21 @@ public interface IOptions
 		int DefaultFontSize { get; }
 		int FontSizeMin { get; }
 		int FontSizeMax { get; }
+
 		#endregion properties
 
 		#region methods
+
 		/// <summary>
 		/// Reset the dirty flag (e.g. after saving program options when they where edit).
 		/// </summary>
 		/// <param name="flag"></param>
 		void SetDirtyFlag(bool flag);
 
 		void SetIconSize(int size);
+
 		void SetFontSize(int size);
+
 		#endregion methods
 	}
-}
+}

source/Components/Settings/Settings/Interfaces/IProfile.cs

@@ -2,15 +2,15 @@
 {
 	using Settings.UserProfile;
 	using SettingsModel.Models;
-	using System;
 	using System.Collections.Generic;
 
 	public interface IProfile
 	{
 		#region properties
+
 		string GetLastActivePath();
-		string LastActiveSolution { get; set; }
 
+		string LastActiveSolution { get; set; }
 
 		string LastActiveTargetFile { get; set; }
 
@@ -27,9 +27,11 @@ public interface IProfile
 		/// Gets a collection of window position and size items.
 		/// </summary>
 		SerializableDictionary<string, ViewPosSizeModel> WindowPosSz { get; }
+
 		#endregion properties
 
 		#region methods
+
 		/// <summary>
 		/// Checks the MainWindow for visibility when re-starting application
 		/// (with different screen configuration).
@@ -45,6 +47,7 @@ public interface IProfile
 		/// <param name="model"></param>
 		/// <returns></returns>
 		void UpdateInsertWindowPosSize(string windowName, ViewPosSizeModel model);
+
 		#endregion methods
 	}
-}
+}

source/Components/Settings/Settings/Interfaces/ISettingsManager.cs

@@ -1,7 +1,7 @@
 namespace Settings.Interfaces
 {
-	using Settings.ProgramSettings;
 	using MLib.Interfaces;
+	using Settings.ProgramSettings;
 	using System.Collections.Generic;
 	using System.Xml.Serialization;
 
@@ -22,6 +22,7 @@ public interface ISettingsManager : IOptionsPanel
 		IEnumerable<LanguageCollection> GetSupportedLanguages();
 
 		#region properties
+
 		Settings.Interfaces.IProfile SessionData { get; }
 
 		int IconSizeMin { get; }
@@ -50,6 +51,7 @@ public interface ISettingsManager : IOptionsPanel
 		/// </summary>
 		[XmlIgnore]
 		IThemeInfos Themes { get; }
+
 		#endregion properties
 	}
-}
+}

source/Components/Settings/Settings/Interfaces/IViewPosSizeModel.cs

@@ -1,7 +1,5 @@
 namespace Settings.Interfaces
 {
-	using System;
-
 	public interface IViewPosSizeModel
 	{
 		bool DefaultConstruct { get; }
@@ -13,4 +11,4 @@ public interface IViewPosSizeModel
 
 		void SetValidPos(double SystemParameters_VirtualScreenLeft, double SystemParameters_VirtualScreenTop);
 	}
-}
+}

source/Components/Settings/Settings/Internal/SettingsManagerImpl.cs

@@ -1,8 +1,8 @@
 namespace Settings.Internal
 {
+	using MLib.Interfaces;
 	using Settings.Interfaces;
 	using Settings.ProgramSettings;
-	using MLib.Interfaces;
 	using Settings.UserProfile;
 	using SettingsModel.Interfaces;
 	using System;
@@ -20,13 +20,16 @@
 	internal class SettingsManagerImpl : ISettingsManager
 	{
 		#region fields
+
 		protected static readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		private readonly IOptionsPanel mSettingsDataPanel = null;
 
 		private IProfile mSessionData = null;
+
 		#endregion fields
 
 		#region constructor
+
 		/// <summary>
 		/// Class cosntructor
 		/// </summary>
@@ -44,9 +47,11 @@ protected SettingsManagerImpl()
 			mSettingsDataPanel = new OptionsPanel();
 			SessionData = new Profile();
 		}
+
 		#endregion constructor
 
 		#region properties
+
 		/// <summary>
 		/// Implement <seealso cref="IOptionsPanel"/> method to query options from model container.
 		/// </summary>
@@ -76,6 +81,7 @@ private set
 		}
 
 		#region min max definitions for useful option values
+
 		/// <summary>
 		/// Gets the minimum font size that should be used in this application.
 		/// </summary>
@@ -159,16 +165,19 @@ public int DefaultFixedFontSize
 				return 12;
 			}
 		}
+
 		#endregion min max definitions for useful option values
 
 		/// <summary>
 		/// Gets the internal name and Uri source for all available themes.
 		/// </summary>
 		[XmlIgnore]
 		public IThemeInfos Themes { get; private set; }
+
 		#endregion properties
 
 		#region methods
+
 		/// <summary>
 		/// Get a list of all supported languages in Edi.
 		/// </summary>
@@ -196,6 +205,7 @@ public void CheckSettingsOnLoad(double SystemParameters_VirtualScreenLeft,
 		}
 
 		#region Load Save UserSessionData
+
 		/// <summary>
 		/// Save program options into persistence.
 		/// See <seealso cref="SaveOptions"/> to save program options on program end.
@@ -279,10 +289,11 @@ public bool SaveSessionData(string sessionDataFileName, IProfile model)
 			{
 				if (xw != null)
 					xw.Close(); // Cleanup
-
 			}
 		}
+
 		#endregion Load Save UserSessionData
+
 		#endregion methods
 	}
-}
+}

source/Components/Settings/Settings/ProgramSettings/LanguageCollection.cs

@@ -5,7 +5,7 @@
 	/// <summary>
 	/// Base class for enumeration over languages (and their locale) that
 	/// are supported with specific (non-English) button and tool tip strings.
-	/// 
+	///
 	/// The class definition is based on BCP 47 which in turn is used to
 	/// set the UI and thread culture (which in turn selects the correct
 	/// string resource in MsgBox assembly).
@@ -43,4 +43,4 @@ public string DisplayName
 			}
 		}
 	}
-}
+}

source/Components/Settings/Settings/ProgramSettings/OptionsPanel.cs

@@ -29,4 +29,4 @@ private set
 			}
 		}
 	}
-}
+}

source/Components/Settings/Settings/SerializableDictionary.cs

@@ -10,18 +10,21 @@
 	/// <summary>
 	/// This class represents a serializable dictionary implementation
 	/// of the standard generic dictionary class in .Net.
-	/// 
+	///
 	/// Source: http://www.jankowskimichal.pl/en/2010/10/serializabledictionary/
 	/// </summary>
 	[Serializable]
 	public class SerializableDictionary<TKey, TVal> : Dictionary<TKey, TVal>, IXmlSerializable, ISerializable
 	{
 		#region Private Members
+
 		private XmlSerializer _keySerializer;
 		private XmlSerializer _valueSerializer;
-		#endregion
+
+		#endregion Private Members
 
 		#region Constructors
+
 		public SerializableDictionary()
 		{
 		}
@@ -51,9 +54,10 @@ public SerializableDictionary(int capacity, IEqualityComparer<TKey> comparer)
 		{
 		}
 
-		#endregion
+		#endregion Constructors
 
 		#region Private Properties
+
 		protected XmlSerializer ValueSerializer
 		{
 			get { return _valueSerializer ?? (_valueSerializer = new XmlSerializer(typeof(TVal))); }
@@ -63,9 +67,11 @@ private XmlSerializer KeySerializer
 		{
 			get { return _keySerializer ?? (_keySerializer = new XmlSerializer(typeof(TKey))); }
 		}
-		#endregion
+
+		#endregion Private Properties
 
 		#region ISerializable Members
+
 		protected SerializableDictionary(SerializationInfo info, StreamingContext context)
 		{
 			int itemCount = info.GetInt32("itemsCount");
@@ -86,9 +92,11 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
 				itemIdx++;
 			}
 		}
-		#endregion
+
+		#endregion ISerializable Members
 
 		#region IXmlSerializable Members
+
 		void IXmlSerializable.WriteXml(XmlWriter writer)
 		{
 			foreach (KeyValuePair<TKey, TVal> kvp in this)
@@ -143,6 +151,7 @@ System.Xml.Schema.XmlSchema IXmlSerializable.GetSchema()
 		{
 			return null;
 		}
-		#endregion
+
+		#endregion IXmlSerializable Members
 	}
-}
+}

source/Components/Settings/Settings/Settings.csproj

@@ -78,8 +78,8 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="MLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Dirkster.MLib.1.2.0\lib\net4\MLib.dll</HintPath>
+    <Reference Include="MLib, Version=1.3.1.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Dirkster.MLib.1.3.1.2\lib\net40\MLib.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

source/Components/Settings/Settings/SettingsManager.cs

@@ -27,4 +27,4 @@ public static ISettingsManager GetInstance(IThemeInfos themeInfos)
 			return new SettingsManagerImpl(themeInfos);
 		}
 	}
-}
+}