Apply var style

Mustafa ÖNCEL · Mustafa ÖNCEL · commit 68c5daa06f30 · 2018-11-19T06:14:35.000+03:00
diff --git a/LifeUtils/LifeUtils/Annotations/Annotations.cs b/LifeUtils/LifeUtils/Annotations/Annotations.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - Annotations.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/Annotations/Configurable.cs b/LifeUtils/LifeUtils/Annotations/Configurable.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - Configurable.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
@@ -70,8 +70,8 @@ public static void Init(Type type, IConfigFile config, string section = "Options
             PropertyInfo[] propertyInfos =
                 type.GetProperties(flags);
 
-            foreach (FieldInfo fieldInfo in fieldInfos)
-            foreach (ConfigurableAttribute attr in fieldInfo.GetCustomAttributes<ConfigurableAttribute>(true))
+            foreach (var fieldInfo in fieldInfos)
+            foreach (var attr in fieldInfo.GetCustomAttributes<ConfigurableAttribute>(true))
             {
                 if (attr.Key.Equals("")) attr.Key = fieldInfo.Name;
                 if (!config.ContainsKey(attr.Key, section))
@@ -82,8 +82,8 @@ public static void Init(Type type, IConfigFile config, string section = "Options
                 break;
             }
 
-            foreach (PropertyInfo propertyInfo in propertyInfos)
-            foreach (ConfigurableAttribute attr in propertyInfo.GetCustomAttributes<ConfigurableAttribute>(true))
+            foreach (var propertyInfo in propertyInfos)
+            foreach (var attr in propertyInfo.GetCustomAttributes<ConfigurableAttribute>(true))
             {
                 if (attr.Key.Equals("")) attr.Key = propertyInfo.Name;
                 if (!config.ContainsKey(attr.Key, section))
diff --git a/LifeUtils/LifeUtils/Annotations/Localizable.cs b/LifeUtils/LifeUtils/Annotations/Localizable.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - Localizable.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
@@ -72,8 +72,8 @@ public static void Init(Type type, IConfigFile config)
             PropertyInfo[] propertyInfos =
                 type.GetProperties(flags);
 
-            foreach (FieldInfo fieldInfo in fieldInfos)
-            foreach (LocalizableAttribute attr in fieldInfo.GetCustomAttributes<LocalizableAttribute>(true))
+            foreach (var fieldInfo in fieldInfos)
+            foreach (var attr in fieldInfo.GetCustomAttributes<LocalizableAttribute>(true))
             {
                 if (attr.Key.Equals("")) attr.Key = fieldInfo.Name;
                 if (!config.ContainsKey(attr.Key, section))
@@ -84,8 +84,8 @@ public static void Init(Type type, IConfigFile config)
                 break;
             }
 
-            foreach (PropertyInfo propertyInfo in propertyInfos)
-            foreach (LocalizableAttribute attr in propertyInfo.GetCustomAttributes<LocalizableAttribute>(true))
+            foreach (var propertyInfo in propertyInfos)
+            foreach (var attr in propertyInfo.GetCustomAttributes<LocalizableAttribute>(true))
             {
                 if (attr.Key.Equals("")) attr.Key = propertyInfo.Name;
                 if (!config.ContainsKey(attr.Key, section))
diff --git a/LifeUtils/LifeUtils/EnumUtils.cs b/LifeUtils/LifeUtils/EnumUtils.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - EnumUtils.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/FileUtils.cs b/LifeUtils/LifeUtils/FileUtils.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - FileUtils.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
@@ -53,23 +53,23 @@ public static string GetJavaHome()
         {
             try
             {
-                string javaHome = Environment.GetEnvironmentVariable("JAVA_HOME");
+                var javaHome = Environment.GetEnvironmentVariable("JAVA_HOME");
                 if (!string.IsNullOrEmpty(javaHome) && !string.IsNullOrWhiteSpace(javaHome))
                     return javaHome;
 
-                string jreHome = Environment.GetEnvironmentVariable("JRE_HOME");
+                var jreHome = Environment.GetEnvironmentVariable("JRE_HOME");
                 if (!string.IsNullOrEmpty(jreHome) && !string.IsNullOrWhiteSpace(jreHome))
                     return jreHome;
 
-                string jdkHome = Environment.GetEnvironmentVariable("JDK_HOME");
+                var jdkHome = Environment.GetEnvironmentVariable("JDK_HOME");
                 if (!string.IsNullOrEmpty(jdkHome) && !string.IsNullOrWhiteSpace(jdkHome))
                     return jdkHome;
 
-                string registryPath = GetJavaHomeFromRegistry()?.Trim();
+                var registryPath = GetJavaHomeFromRegistry()?.Trim();
                 if (!string.IsNullOrEmpty(registryPath) && !string.IsNullOrWhiteSpace(registryPath))
                     return registryPath;
 
-                string processPath = GetJavaHomeFromConsole();
+                var processPath = GetJavaHomeFromConsole();
 
                 return !string.IsNullOrEmpty(processPath) && !string.IsNullOrWhiteSpace(processPath)
                     ? processPath
@@ -88,7 +88,7 @@ public static string GetJavaHome()
         /// <returns>The java home from console.</returns>
         public static string GetJavaHomeFromConsole()
         {
-            Process process = new Process
+            var process = new Process
             {
                 StartInfo = new ProcessStartInfo
                 {
@@ -104,7 +104,7 @@ public static string GetJavaHomeFromConsole()
 
             process.Start();
 
-            string javaHome = process.StandardOutput.ReadToEnd();
+            var javaHome = process.StandardOutput.ReadToEnd();
 
             try
             {
@@ -129,10 +129,10 @@ public static string GetJavaHomeFromRegistry()
 
             try
             {
-                using (RegistryKey rk = Registry.LocalMachine.OpenSubKey(javaKey))
+                using (var rk = Registry.LocalMachine.OpenSubKey(javaKey))
                 {
-                    string currentVersion = rk?.GetValue("CurrentVersion").ToString();
-                    using (RegistryKey key = rk?.OpenSubKey(currentVersion))
+                    var currentVersion = rk?.GetValue("CurrentVersion").ToString();
+                    using (var key = rk?.OpenSubKey(currentVersion))
                     {
                         return key?.GetValue("JavaHome").ToString();
                     }
@@ -142,10 +142,10 @@ public static string GetJavaHomeFromRegistry()
             {
                 try
                 {
-                    using (RegistryKey rk = Registry.CurrentUser.OpenSubKey(javaKey))
+                    using (var rk = Registry.CurrentUser.OpenSubKey(javaKey))
                     {
-                        string currentVersion = rk?.GetValue("CurrentVersion").ToString();
-                        using (RegistryKey key = rk?.OpenSubKey(currentVersion))
+                        var currentVersion = rk?.GetValue("CurrentVersion").ToString();
+                        using (var key = rk?.OpenSubKey(currentVersion))
                         {
                             return key?.GetValue("JavaHome").ToString();
                         }
@@ -165,7 +165,7 @@ public static string GetJavaHomeFromRegistry()
         /// <param name="path">The directories path to delete it.</param>
         public static void DeleteDirectory(string path)
         {
-            foreach (string directory in Directory.GetDirectories(path)) DeleteDirectory(directory);
+            foreach (var directory in Directory.GetDirectories(path)) DeleteDirectory(directory);
             try
             {
                 Directory.Delete(path, true);
diff --git a/LifeUtils/LifeUtils/ICloseable.cs b/LifeUtils/LifeUtils/ICloseable.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - ICloseable.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/IConfigFile.cs b/LifeUtils/LifeUtils/IConfigFile.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - IConfigFile.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/IConverter.cs b/LifeUtils/LifeUtils/IConverter.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - IConverter.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/IFlushable.cs b/LifeUtils/LifeUtils/IFlushable.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - IFlushable.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/ITask.cs b/LifeUtils/LifeUtils/ITask.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - ITask.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/IniHandler.cs b/LifeUtils/LifeUtils/IniHandler.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - IniHandler.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
@@ -42,7 +42,7 @@ public struct IniHandler : IConfigFile
         /// <returns>The value of the key.</returns>
         public string Read(string key, string section)
         {
-            StringBuilder retVal = new StringBuilder(4096);
+            var retVal = new StringBuilder(4096);
             SafeNativeMethods.GetPrivateProfileString(section, key, "", retVal, 4096, _path);
             return retVal.ToString();
         }
@@ -74,7 +74,7 @@ public void Write(string key, string value, string section) =>
         /// <returns>True if the ini file contains specified key in the specified section.</returns>
         public bool ContainsKey(string key, string section)
         {
-            string value = Read(key, section);
+            var value = Read(key, section);
             return !string.IsNullOrEmpty(value);
         }
 
diff --git a/LifeUtils/LifeUtils/Kleenean.cs b/LifeUtils/LifeUtils/Kleenean.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - Kleenean.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/Minecraft/MinecraftVersion.cs b/LifeUtils/LifeUtils/Minecraft/MinecraftVersion.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - MinecraftVersion.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/Properties/AssemblyInfo.cs b/LifeUtils/LifeUtils/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - AssemblyInfo.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/SafeNativeMethods.cs b/LifeUtils/LifeUtils/SafeNativeMethods.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - SafeNativeMethods.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
diff --git a/LifeUtils/LifeUtils/Version.cs b/LifeUtils/LifeUtils/Version.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - Version.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 
@@ -50,7 +50,7 @@ public Version(params int[] version)
                 throw new ArgumentOutOfRangeException(nameof(version),
                     "Versions must have a minimum of 2 and a maximum of 3 numbers (" + version.Length +
                     " numbers given)");
-            for (int i = 0; i < version.Length; i++) _version[i] = version[i];
+            for (var i = 0; i < version.Length; i++) _version[i] = version[i];
             _suffix = null;
         }
 
@@ -72,18 +72,18 @@ public Version(int major, int minor, int revision, string suffix) :
         public Version(string version)
         {
             if (version == null) throw new ArgumentNullException(nameof(version));
-            Match match = VersionRegex.Match(version.Trim());
+            var match = VersionRegex.Match(version.Trim());
             if (match.Length < 1)
                 throw new ArgumentOutOfRangeException("'" + version + "' is not a valid version string");
-            for (int i = 0; i < _version.Length; i++)
+            for (var i = 0; i < _version.Length; i++)
                 if (match.Groups.Count > i + 1)
                 {
-                    string v = match.Groups[i + 1].Value;
+                    var v = match.Groups[i + 1].Value;
                     if (!string.IsNullOrEmpty(v))
                         _version[i] = int.Parse(v);
                 }
 
-            string sfx =
+            var sfx =
                 match.Groups[match.Groups.Count].ToString();
             _suffix = string.IsNullOrEmpty(sfx) ? null : sfx;
         }
@@ -98,7 +98,7 @@ public int CompareTo(Version other)
         {
             if (other is null)
                 return 1;
-            for (int i = 0; i < _version.Length; i++)
+            for (var i = 0; i < _version.Length; i++)
             {
                 if (_version[i] > other._version[i])
                     return 1;
@@ -191,7 +191,7 @@ public override string ToString() => GetMajor() + "." + GetMinor() + "." + GetRe
         /// <returns>The hash code of this version.</returns>
         public override int GetHashCode()
         {
-            int hashCode = 1359330549;
+            var hashCode = 1359330549;
             hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(_suffix);
             hashCode = hashCode * -1521134295 + EqualityComparer<int[]>.Default.GetHashCode(_version);
             return hashCode;
diff --git a/LifeUtils/LifeUtils/VersionInfo.cs b/LifeUtils/LifeUtils/VersionInfo.cs
@@ -2,7 +2,7 @@
 
 // 
 //        LifeUtils - LifeUtils - VersionInfo.cs
-//                  13.11.2018 12:12
+//                  19.11.2018 06:12
 
 #endregion
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`//`
`4`	`4`	`// LifeUtils - LifeUtils - FileUtils.cs`
`5`		`-// 13.11.2018 12:12`
	`5`	`+// 19.11.2018 06:12`
`6`	`6`
`7`	`7`	`#endregion`
`8`	`8`
`@@ -53,23 +53,23 @@ public static string GetJavaHome()`
`53`	`53`	`{`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- string javaHome = Environment.GetEnvironmentVariable("JAVA_HOME");`
	`56`	`+ var javaHome = Environment.GetEnvironmentVariable("JAVA_HOME");`
`57`	`57`	`if (!string.IsNullOrEmpty(javaHome) && !string.IsNullOrWhiteSpace(javaHome))`
`58`	`58`	`return javaHome;`
`59`	`59`
`60`		`- string jreHome = Environment.GetEnvironmentVariable("JRE_HOME");`
	`60`	`+ var jreHome = Environment.GetEnvironmentVariable("JRE_HOME");`
`61`	`61`	`if (!string.IsNullOrEmpty(jreHome) && !string.IsNullOrWhiteSpace(jreHome))`
`62`	`62`	`return jreHome;`
`63`	`63`
`64`		`- string jdkHome = Environment.GetEnvironmentVariable("JDK_HOME");`
	`64`	`+ var jdkHome = Environment.GetEnvironmentVariable("JDK_HOME");`
`65`	`65`	`if (!string.IsNullOrEmpty(jdkHome) && !string.IsNullOrWhiteSpace(jdkHome))`
`66`	`66`	`return jdkHome;`
`67`	`67`
`68`		`- string registryPath = GetJavaHomeFromRegistry()?.Trim();`
	`68`	`+ var registryPath = GetJavaHomeFromRegistry()?.Trim();`
`69`	`69`	`if (!string.IsNullOrEmpty(registryPath) && !string.IsNullOrWhiteSpace(registryPath))`
`70`	`70`	`return registryPath;`
`71`	`71`
`72`		`- string processPath = GetJavaHomeFromConsole();`
	`72`	`+ var processPath = GetJavaHomeFromConsole();`
`73`	`73`
`74`	`74`	`return !string.IsNullOrEmpty(processPath) && !string.IsNullOrWhiteSpace(processPath)`
`75`	`75`	`? processPath`
`@@ -88,7 +88,7 @@ public static string GetJavaHome()`
`88`	`88`	`/// <returns>The java home from console.</returns>`
`89`	`89`	`public static string GetJavaHomeFromConsole()`
`90`	`90`	`{`
`91`		`- Process process = new Process`
	`91`	`+ var process = new Process`
`92`	`92`	`{`
`93`	`93`	`StartInfo = new ProcessStartInfo`
`94`	`94`	`{`
`@@ -104,7 +104,7 @@ public static string GetJavaHomeFromConsole()`
`104`	`104`
`105`	`105`	`process.Start();`
`106`	`106`
`107`		`- string javaHome = process.StandardOutput.ReadToEnd();`
	`107`	`+ var javaHome = process.StandardOutput.ReadToEnd();`
`108`	`108`
`109`	`109`	`try`
`110`	`110`	`{`
`@@ -129,10 +129,10 @@ public static string GetJavaHomeFromRegistry()`
`129`	`129`
`130`	`130`	`try`
`131`	`131`	`{`
`132`		`- using (RegistryKey rk = Registry.LocalMachine.OpenSubKey(javaKey))`
	`132`	`+ using (var rk = Registry.LocalMachine.OpenSubKey(javaKey))`
`133`	`133`	`{`
`134`		`- string currentVersion = rk?.GetValue("CurrentVersion").ToString();`
`135`		`- using (RegistryKey key = rk?.OpenSubKey(currentVersion))`
	`134`	`+ var currentVersion = rk?.GetValue("CurrentVersion").ToString();`
	`135`	`+ using (var key = rk?.OpenSubKey(currentVersion))`
`136`	`136`	`{`
`137`	`137`	`return key?.GetValue("JavaHome").ToString();`
`138`	`138`	`}`
`@@ -142,10 +142,10 @@ public static string GetJavaHomeFromRegistry()`
`142`	`142`	`{`
`143`	`143`	`try`
`144`	`144`	`{`
`145`		`- using (RegistryKey rk = Registry.CurrentUser.OpenSubKey(javaKey))`
	`145`	`+ using (var rk = Registry.CurrentUser.OpenSubKey(javaKey))`
`146`	`146`	`{`
`147`		`- string currentVersion = rk?.GetValue("CurrentVersion").ToString();`
`148`		`- using (RegistryKey key = rk?.OpenSubKey(currentVersion))`
	`147`	`+ var currentVersion = rk?.GetValue("CurrentVersion").ToString();`
	`148`	`+ using (var key = rk?.OpenSubKey(currentVersion))`
`149`	`149`	`{`
`150`	`150`	`return key?.GetValue("JavaHome").ToString();`
`151`	`151`	`}`
`@@ -165,7 +165,7 @@ public static string GetJavaHomeFromRegistry()`
`165`	`165`	`/// <param name="path">The directories path to delete it.</param>`
`166`	`166`	`public static void DeleteDirectory(string path)`
`167`	`167`	`{`
`168`		`- foreach (string directory in Directory.GetDirectories(path)) DeleteDirectory(directory);`
	`168`	`+ foreach (var directory in Directory.GetDirectories(path)) DeleteDirectory(directory);`
`169`	`169`	`try`
`170`	`170`	`{`
`171`	`171`	`Directory.Delete(path, true);`