Merge pull request #323 from zarunbal/revert-322-issue321

Revert "Issue321: Highlights should be there separated .json settings file"

Author: Hirogen

src/LogExpert.Tests/JSONSaveTest.cs

@@ -1,9 +1,6 @@
 using LogExpert.Config;
-
 using Newtonsoft.Json;
-
 using NUnit.Framework;
-
 using System.IO;
 
 namespace LogExpert.Tests
@@ -20,14 +17,14 @@ public void SaveOptionsAsJSON()
             string settingsFile = configDir + "\\settings.json";
 
             Settings settings = null;
-
+            
             Assert.DoesNotThrow(CastSettings);
             Assert.That(settings, Is.Not.Null);
             Assert.That(settings.alwaysOnTop, Is.True);
 
             ConfigManager.Settings.alwaysOnTop = false;
             ConfigManager.Save(SettingsFlags.All);
-
+            
             settings = null;
             Assert.DoesNotThrow(CastSettings);
 

src/LogExpert/Classes/CmdLine.cs

@@ -3,7 +3,7 @@
 
 /*
  * Taken from https://cmdline.codeplex.com/
- *
+ * 
  */
 
 namespace LogExpert.Classes
@@ -15,19 +15,23 @@ public class CmdLineException : Exception
     {
         #region cTor
 
-        public CmdLineException(string parameter, string message) : base($"Syntax error of parameter -{parameter}: {message}")
+        public CmdLineException(string parameter, string message)
+            :
+            base(string.Format("Syntax error of parameter -{0}: {1}", parameter, message))
         {
         }
 
-        public CmdLineException(string message) : base(message)
+        public CmdLineException(string message)
+            :
+            base(message)
         {
         }
 
         #endregion
     }
 
     /// <summary>
-    /// Represents a command line parameter.
+    /// Represents a command line parameter. 
     /// Parameters are words in the command line beginning with a hyphen (-).
     /// The value of the parameter is the next word in
     /// </summary>
@@ -99,7 +103,7 @@ public virtual void SetValue(string value)
     }
 
     /// <summary>
-    /// Represents an integer command line parameter.
+    /// Represents an integer command line parameter. 
     /// </summary>
     public class CmdLineInt : CmdLineParameter
     {
@@ -158,25 +162,22 @@ public CmdLineInt(string name, bool required, string helpMessage, int min, int m
         public override void SetValue(string value)
         {
             base.SetValue(value);
-            int i;
-
+            int i = 0;
             try
             {
                 i = Convert.ToInt32(value);
             }
             catch (Exception)
             {
-                throw new CmdLineException(Name, "Value is not an integer.");
+                throw new CmdLineException(base.Name, "Value is not an integer.");
             }
-
             if (i < _min)
             {
-                throw new CmdLineException(Name, $"Value must be greather or equal to {_min}.");
+                throw new CmdLineException(base.Name, string.Format("Value must be greather or equal to {0}.", _min));
             }
-
             if (i > _max)
             {
-                throw new CmdLineException(Name, $"Value must be less or equal to {_max}.");
+                throw new CmdLineException(base.Name, string.Format("Value must be less or equal to {0}.", _max));
             }
             Value = i;
         }
@@ -252,11 +253,11 @@ public CmdLineParameter this[string name]
         {
             get
             {
-                if (!parameters.TryGetValue(name, out CmdLineParameter value))
+                if (!parameters.ContainsKey(name))
                 {
                     throw new CmdLineException(name, "Not a registered parameter.");
                 }
-                return value;
+                return parameters[name];
             }
         }
 
@@ -306,8 +307,8 @@ public string[] Parse(string[] args)
                 if (args[i].Length > 1 && args[i][0] == '-')
                 {
                     // The current string is a parameter name
-                    string key = args[i][1..].ToLower();
-                    string value = string.Empty;
+                    string key = args[i].Substring(1, args[i].Length - 1).ToLower();
+                    string value = "";
                     i++;
                     if (i < args.Length)
                     {
@@ -322,17 +323,17 @@ public string[] Parse(string[] args)
                             i++;
                         }
                     }
-                    if (!parameters.TryGetValue(key, out CmdLineParameter cmdLineParameter))
+                    if (!parameters.ContainsKey(key))
                     {
                         throw new CmdLineException(key, "Parameter is not allowed.");
                     }
 
-                    if (cmdLineParameter.Exists)
+                    if (parameters[key].Exists)
                     {
                         throw new CmdLineException(key, "Parameter is specified more than once.");
                     }
 
-                    cmdLineParameter.SetValue(value);
+                    parameters[key].SetValue(value);
                 }
                 else
                 {
@@ -342,7 +343,7 @@ public string[] Parse(string[] args)
             }
 
 
-            // Check that required parameters are present in the command line.
+            // Check that required parameters are present in the command line. 
             foreach (string key in parameters.Keys)
             {
                 if (parameters[key].Required && !parameters[key].Exists)
@@ -393,7 +394,7 @@ public class ConsoleCmdLine : CmdLine
 
         public ConsoleCmdLine()
         {
-            RegisterParameter(new CmdLineString("help", false, "Prints the help screen."));
+            base.RegisterParameter(new CmdLineString("help", false, "Prints the help screen."));
         }
 
         #endregion
@@ -403,7 +404,7 @@ public ConsoleCmdLine()
         public new string[] Parse(string[] args)
         {
             string[] ret = null;
-            string error = string.Empty;
+            string error = "";
             try
             {
                 ret = base.Parse(args);
@@ -417,15 +418,15 @@ public ConsoleCmdLine()
             {
                 //foreach(string s in base.HelpScreen().Split('\n'))
                 //    Console.WriteLine(s);
-                Console.WriteLine(HelpScreen());
-                Environment.Exit(0);
+                Console.WriteLine(base.HelpScreen());
+                System.Environment.Exit(0);
             }
 
             if (error != "")
             {
                 Console.WriteLine(error);
                 Console.WriteLine("Use -help for more information.");
-                Environment.Exit(1);
+                System.Environment.Exit(1);
             }
             return ret;
         }

src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs

@@ -48,7 +48,7 @@ public static ILogLineColumnizer CloneColumnizer(ILogLineColumnizer columnizer)
                 object o = cti.Invoke(new object[] { });
                 if (o is IColumnizerConfigurator configurator)
                 {
-                    configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
+                    configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
                 }
                 return (ILogLineColumnizer)o;
             }