From a523e62a48dbfcf9fb454317ccfcd27c24989b66 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Thu, 9 Mar 2017 22:32:42 +0000 Subject: [PATCH] Change a lot of typos and violations against C# defination --- CmdArgs.cs | 368 ++++++++++++++++++------------------- FileLogger.cs | 47 +++-- FileMutex.cs | 44 +++-- InIReader.cs | 347 ++++++++++++++++------------------ OwnController.cs | 20 +- OwnModel.cs | 49 +++-- OwnObject.cs | 73 ++++---- OwnView.cs | 30 +-- Properties/AssemblyInfo.cs | 6 +- 9 files changed, 483 insertions(+), 501 deletions(-) diff --git a/CmdArgs.cs b/CmdArgs.cs index 0c52719..fb6f2cc 100644 --- a/CmdArgs.cs +++ b/CmdArgs.cs @@ -1,201 +1,185 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace BlubbFish.Utils { - public class CmdArgs + public class CmdArgs + { + public enum ArgLength { - public enum ArgLength - { - Single, - Touple - } - #region Classes - public class VaildArguments - { - public VaildArguments(ArgLength length, bool required) - { - this.Required = required; - this.Length = length; - } - public VaildArguments(ArgLength length) - { - this.Required = false; - this.Length = length; - } - - public ArgLength Length { get; private set; } - public bool Required { get; private set; } - } - private class ArgTouple - { - public ArgTouple(string type, string data) - { - this.type = type; - this.data = data; - } - public ArgTouple(string type) - { - this.type = type; - } - public string type { get; private set; } - public string data { get; private set; } - - internal void setData(string data) - { - if (data != "") - this.data = data; - } - } - #endregion - private string[] args; - private List argList; - private Dictionary argsPosible = new Dictionary(); - private static CmdArgs instances = null; - private bool isSetArguments = false; - - private CmdArgs() - { - } - - /// - /// Gibt eine Instanz der Klasse zurück - /// - /// Klasse - public static CmdArgs getInstance() - { - if (instances == null) - { - instances = new CmdArgs(); - } - return instances; - } - - /// - /// Übernimmt die Argumente für die Klasse - /// - /// Mögliche Komandozeilenargumente - /// Tatsächliche Komandozeilenargumente - public void setArguments(Dictionary arguments, string[] args) - { - this.args = args; - if (!this.isSetArguments) - { - this.isSetArguments = true; - this.argsPosible = arguments; - this.Init(); - } - } - - private void Init() - { - this.argList = new List(); - for (int i = 0; i < this.args.Length; i++) - { - if (this.argsPosible.Keys.Contains(args[i])) - { - ArgTouple arg = new ArgTouple(args[i]); - if (argsPosible[args[i]].Length == ArgLength.Touple) - { - if (args.Length > i + 1) - { - arg.setData(args[++i]); - } - else - { - throw new ArgumentException(); - } - } - this.argList.Add(arg); - } - } - } - - /// - /// Menge der angegebenen Komandozeilen-Argumente - /// - /// Menge - public int GetArgsLength() - { - return this.argList.Count; - } - - /// - /// Gibt zurück ob ein Argument angegeben wurde - /// - /// Name des Arguments - /// true wenn angegeben - public bool HasArgumentType(string name) - { - foreach (ArgTouple t in this.argList) - { - if (t.type == name) - return true; - } - return false; - } - - /// - /// Gibt den Inhalt des angegeben Arguments zurück, nur bei zweiteiligen Argumenten möglich - /// - /// Name des Arguments - /// Inhalt des Arguments oder ArgumentNullException - public string GetArgumentData(string name) - { - foreach (ArgTouple t in this.argList) - { - if (t.type == name && t.data != null) - return t.data; - else - { - throw new ArgumentNullException(); - } - } - return null; - } - - public bool HasAllRequiredArguments() - { - foreach (KeyValuePair item in this.argsPosible) - { - if (item.Value.Required && !this.HasArgumentType(item.Key)) - { - return false; - } - } - return true; - } - - public string getUsageList(string name) - { - string ret = "Usage: "+name+" Parameter\nParameter:\n"; - string req =""; - string opt = ""; - foreach (KeyValuePair item in this.argsPosible) - { - if (item.Value.Required) - { - req += item.Key+" "+((item.Value.Length == ArgLength.Touple)?" [data]\n":"\n"); - } - } - if (req != "") - { - ret += "Benötigte Parameter:\n" + req; - } - foreach (KeyValuePair item in this.argsPosible) - { - if (!item.Value.Required) - { - opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); - } - } - if (opt != "") - { - ret += "Optionale Parameter:\n" + opt; - } - return ret; - } + Single, + Touple } + #region Classes + public class VaildArguments + { + public VaildArguments(ArgLength length, Boolean required) + { + this.Required = required; + this.Length = length; + } + public VaildArguments(ArgLength length) + { + this.Required = false; + this.Length = length; + } + + public ArgLength Length { get; private set; } + public Boolean Required { get; private set; } + } + private class ArgTouple + { + public ArgTouple(String type, String data) + { + this.Type = type; + this.Data = data; + } + public ArgTouple(String type) + { + this.Type = type; + } + public String Type { get; private set; } + public String Data { get; private set; } + + internal void SetData(String data) + { + if (data != "") { + this.Data = data; + } + } + } + #endregion + private String[] args; + private List argList; + private Dictionary argsPosible = new Dictionary(); + private static CmdArgs instances = null; + private Boolean isSetArguments = false; + + private CmdArgs() + { + } + + /// + /// Gibt eine Instanz der Klasse zurück + /// + /// Klasse + public static CmdArgs Instance + { + get { + if (instances == null) { + instances = new CmdArgs(); + } + return instances; + } + } + + /// + /// Übernimmt die Argumente für die Klasse + /// + /// Mögliche Komandozeilenargumente + /// Tatsächliche Komandozeilenargumente + public void SetArguments(Dictionary arguments, String[] args) + { + this.args = args; + if (!this.isSetArguments) { + this.isSetArguments = true; + this.argsPosible = arguments; + this.Init(); + } + } + + private void Init() + { + this.argList = new List(); + for (Int32 i = 0; i < this.args.Length; i++) { + if (this.argsPosible.Keys.Contains(this.args[i])) { + ArgTouple arg = new ArgTouple(this.args[i]); + if (this.argsPosible[this.args[i]].Length == ArgLength.Touple) { + if (this.args.Length > i + 1) { + arg.SetData(this.args[++i]); + } else { + throw new ArgumentException(); + } + } + this.argList.Add(arg); + } + } + } + + /// + /// Menge der angegebenen Komandozeilen-Argumente + /// + /// Menge + public Int32 GetArgsLength() + { + return this.argList.Count; + } + + /// + /// Gibt zurück ob ein Argument angegeben wurde + /// + /// Name des Arguments + /// true wenn angegeben + public Boolean HasArgumentType(String name) + { + foreach (ArgTouple t in this.argList) { + if (t.Type == name) { + return true; + } + } + return false; + } + + /// + /// Gibt den Inhalt des angegeben Arguments zurück, nur bei zweiteiligen Argumenten möglich + /// + /// Name des Arguments + /// Inhalt des Arguments oder ArgumentNullException + public String GetArgumentData(String name) + { + foreach (ArgTouple t in this.argList) { + if (t.Type == name && t.Data != null) { + return t.Data; + } else { + throw new ArgumentNullException(); + } + } + return null; + } + + public Boolean HasAllRequiredArguments() + { + foreach (KeyValuePair item in this.argsPosible) { + if (item.Value.Required && !this.HasArgumentType(item.Key)) { + return false; + } + } + return true; + } + + public String GetUsageList(String name) + { + String ret = "Usage: " + name + " Parameter\nParameter:\n"; + String req = ""; + String opt = ""; + foreach (KeyValuePair item in this.argsPosible) { + if (item.Value.Required) { + req += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); + } + } + if (req != "") { + ret += "Benötigte Parameter:\n" + req; + } + foreach (KeyValuePair item in this.argsPosible) { + if (!item.Value.Required) { + opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); + } + } + if (opt != "") { + ret += "Optionale Parameter:\n" + opt; + } + return ret; + } + } } diff --git a/FileLogger.cs b/FileLogger.cs index 2763ea3..3d53fbe 100644 --- a/FileLogger.cs +++ b/FileLogger.cs @@ -5,54 +5,63 @@ using System.Text; using System.IO; using System.Reflection; -namespace BlubbFish.Utils { - public class FileLogger { - private static Dictionary instances = new Dictionary(); +namespace BlubbFish.Utils +{ + public class FileLogger + { + private static Dictionary instances = new Dictionary(); private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar; private StreamWriter file; - private FileLogger(string filename, bool append) { + private FileLogger(String filename, Boolean append) + { filename = logDir + filename; - if(!File.Exists(filename)) { - string folder = Path.GetDirectoryName(Path.GetFullPath(filename)); - if(!Directory.Exists(folder)) { + if (!File.Exists(filename)) { + String folder = Path.GetDirectoryName(Path.GetFullPath(filename)); + if (!Directory.Exists(folder)) { Directory.CreateDirectory(folder); } } - this.file = new StreamWriter(filename, append, Encoding.UTF8); - this.file.AutoFlush = true; + this.file = new StreamWriter(filename, append, Encoding.UTF8) { + AutoFlush = true + }; } - public static FileLogger getInstance(string filename, bool append) { - if(!instances.Keys.Contains(filename)) { + public static FileLogger GetInstance(String filename, Boolean append) + { + if (!instances.Keys.Contains(filename)) { instances.Add(filename, new FileLogger(filename, append)); } return instances[filename]; } - public static void setLogDir(String v) { + public static void SetLogDir(String v) + { v = v.Replace("..", ""); v = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar + v; - if(Directory.Exists(v)) { + if (Directory.Exists(v)) { logDir = v; } else { Directory.CreateDirectory(v); logDir = v; } - if(logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) { + if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) { logDir = logDir + Path.DirectorySeparatorChar; } } - public void setArray(string[] text) { - this.file.Write(String.Join(file.NewLine, text) + file.NewLine); + public void SetArray(String[] text) + { + this.file.Write(String.Join(this.file.NewLine, text) + this.file.NewLine); this.file.Flush(); } - public void setLine(string text) { + public void SetLine(String text) + { this.file.WriteLine(text); this.file.Flush(); } - public void setLine(string text, DateTime d) { - this.setLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text); + public void SetLine(String text, DateTime d) + { + this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text); } } } diff --git a/FileMutex.cs b/FileMutex.cs index 4d3b696..2479adc 100644 --- a/FileMutex.cs +++ b/FileMutex.cs @@ -1,46 +1,52 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; -namespace BlubbFish.Utils { - public class FileMutex { +namespace BlubbFish.Utils +{ + public class FileMutex + { private static FileMutex instance; private String filename; private StreamWriter file; private FileMutex() { } - public static FileMutex Instance { + public static FileMutex Instance + { get { - if(FileMutex.instance == null) { - FileMutex.instance = new FileMutex(); + if (instance == null) { + instance = new FileMutex(); } - return FileMutex.instance; + return instance; } } - public void setName(string name) { - string path = AppDomain.CurrentDomain.BaseDirectory; - this.filename = path + string.Join(string.Empty, Array.ConvertAll(new SHA512Managed().ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt"; + public void SetName(String name) + { + String path = AppDomain.CurrentDomain.BaseDirectory; + this.filename = path + String.Join(String.Empty, Array.ConvertAll(new SHA512Managed().ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt"; } - public bool create() { - if(File.Exists(this.filename)) + public Boolean Create() + { + if (File.Exists(this.filename)) { return false; + } + this.file = new StreamWriter(this.filename); - this.initFile(); - return File.Exists(this.filename) && file != null; + InitFile(); + return File.Exists(this.filename) && this.file != null; } - private void initFile() { - this.file.Write("Created: " + DateTime.Now.ToUniversalTime()+"\n"); + private void InitFile() + { + this.file.Write("Created: " + DateTime.Now.ToUniversalTime() + "\n"); this.file.Flush(); } - public bool delete() { + public Boolean Delete() + { this.file.Close(); File.Delete(this.filename); return !File.Exists(this.filename); diff --git a/InIReader.cs b/InIReader.cs index fc87deb..31f725b 100644 --- a/InIReader.cs +++ b/InIReader.cs @@ -8,191 +8,168 @@ using System.Threading.Tasks; namespace BlubbFish.Utils { - public class InIReader + public class InIReader + { + private Dictionary> cont; + private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini"); + private String filename; + + private static Dictionary instances = new Dictionary(); + + private InIReader(String filename) { - private Dictionary> cont; - private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini"); - private string filename; - - private static Dictionary instances = new Dictionary(); - - private InIReader(string filename) - { - this.filename = filename; - k.Changed += new FileSystemEventHandler(this.readAgain); - loadFile(); - } - - public static InIReader getInstance(string filename) - { - if (!instances.Keys.Contains(filename)) - { - instances.Add(filename, new InIReader(filename)); - } - return instances[filename]; - } - - private void readAgain(object sender, EventArgs e) - { - this.loadFile(); - } - - private void loadFile() - { - this.cont = new Dictionary>(); - StreamReader file = new StreamReader(this.filename); - List buf = new List(); - string fline = ""; - while (fline != null) - { - fline = file.ReadLine(); - if (fline != null && fline.Length > 0 && fline.Substring(0,1) != ";") - buf.Add(fline); - } - file.Close(); - Dictionary sub = new Dictionary(); - string cap = ""; - foreach (string line in buf) - { - Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase); - if (match.Success) - { - if (sub.Count != 0 && cap != "") - { - this.cont.Add(cap, sub); - } - cap = line; - sub = new Dictionary(); - } - else - { - if (line != "" && cap != "") - { - string key = line.Substring(0, line.IndexOf('=')); - string value = line.Substring(line.IndexOf('=') + 1); - sub.Add(key, value); - } - } - } - if (sub.Count != 0 && cap != "") - { - this.cont.Add(cap, sub); - } - } - - public List getSections() - { - return cont.Keys.ToList(); - } - - public String getValue(String section, String key) - { - if (!section.StartsWith("[")) - { - section = "[" + section + "]"; - } - if (cont.Keys.Contains(section)) - { - if (cont[section].Keys.Contains(key)) - { - return cont[section][key]; - } - } - return null; - } - - - public void SetValue(string section, string key, string value) - { - if (!section.StartsWith("[")) - { - section = "[" + section + "]"; - } - if (cont.Keys.Contains(section)) - { - if (cont[section].Keys.Contains(key)) - { - cont[section][key] = value; - } - else - { - cont[section].Add(key, value); - } - } - else - { - Dictionary sub = new Dictionary(); - sub.Add(key, value); - cont.Add(section, sub); - } - this.changed(); - } - - private void changed() - { - k.Changed -= null; - saveSettings(); - loadFile(); - k.Changed += new FileSystemEventHandler(this.readAgain); - } - - private void saveSettings() - { - StreamWriter file = new StreamWriter(this.filename); - file.BaseStream.SetLength(0); - file.BaseStream.Flush(); - file.BaseStream.Seek(0, SeekOrigin.Begin); - foreach (KeyValuePair> cap in this.cont) - { - file.WriteLine(cap.Key); - foreach (KeyValuePair sub in cap.Value) - { - file.WriteLine(sub.Key + "=" + sub.Value); - } - file.WriteLine(); - } - file.Flush(); - file.Close(); - } - - /// - /// Fügt eine neue Sektion in der Ini-Datei ein. - /// - /// Sektionsname - /// true if added, false if error - public bool addSection(string name) - { - if (!name.StartsWith("[")) - { - name = "[" + name + "]"; - } - if (this.cont.Keys.Contains(name)) - { - return false; - } - this.cont.Add(name, new Dictionary()); - this.changed(); - return true; - } - - /// - /// Löscht eine Sektion inklusive Unterpunkte aus der Ini-Datei. - /// - /// Sektionsname - /// true if removed, false if error - public bool removeSection(string name) - { - if (!name.StartsWith("[")) - { - name = "[" + name + "]"; - } - if (!this.cont.Keys.Contains(name)) - { - return false; - } - this.cont.Remove(name); - this.changed(); - return false; - } + this.filename = filename; + this.k.Changed += new FileSystemEventHandler(this.ReadAgain); + LoadFile(); } + + public static InIReader GetInstance(String filename) + { + if (!instances.Keys.Contains(filename)) { + instances.Add(filename, new InIReader(filename)); + } + return instances[filename]; + } + + private void ReadAgain(Object sender, EventArgs e) + { + this.LoadFile(); + } + + private void LoadFile() + { + this.cont = new Dictionary>(); + StreamReader file = new StreamReader(this.filename); + List buf = new List(); + String fline = ""; + while (fline != null) { + fline = file.ReadLine(); + if (fline != null && fline.Length > 0 && fline.Substring(0, 1) != ";") { + buf.Add(fline); + } + } + file.Close(); + Dictionary sub = new Dictionary(); + String cap = ""; + foreach (String line in buf) { + Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase); + if (match.Success) { + if (sub.Count != 0 && cap != "") { + this.cont.Add(cap, sub); + } + cap = line; + sub = new Dictionary(); + } else { + if (line != "" && cap != "") { + String key = line.Substring(0, line.IndexOf('=')); + String value = line.Substring(line.IndexOf('=') + 1); + sub.Add(key, value); + } + } + } + if (sub.Count != 0 && cap != "") { + this.cont.Add(cap, sub); + } + } + + public List GetSections() + { + return this.cont.Keys.ToList(); + } + + public String GetValue(String section, String key) + { + if (!section.StartsWith("[")) { + section = "[" + section + "]"; + } + if (this.cont.Keys.Contains(section)) { + if (this.cont[section].Keys.Contains(key)) { + return this.cont[section][key]; + } + } + return null; + } + + + public void SetValue(String section, String key, String value) + { + if (!section.StartsWith("[")) { + section = "[" + section + "]"; + } + if (this.cont.Keys.Contains(section)) { + if (this.cont[section].Keys.Contains(key)) { + this.cont[section][key] = value; + } else { + this.cont[section].Add(key, value); + } + } else { + Dictionary sub = new Dictionary { + { key, value } + }; + this.cont.Add(section, sub); + } + this.Changed(); + } + + private void Changed() + { + this.k.Changed -= null; + SaveSettings(); + LoadFile(); + this.k.Changed += new FileSystemEventHandler(this.ReadAgain); + } + + private void SaveSettings() + { + StreamWriter file = new StreamWriter(this.filename); + file.BaseStream.SetLength(0); + file.BaseStream.Flush(); + file.BaseStream.Seek(0, SeekOrigin.Begin); + foreach (KeyValuePair> cap in this.cont) { + file.WriteLine(cap.Key); + foreach (KeyValuePair sub in cap.Value) { + file.WriteLine(sub.Key + "=" + sub.Value); + } + file.WriteLine(); + } + file.Flush(); + file.Close(); + } + + /// + /// Fügt eine neue Sektion in der Ini-Datei ein. + /// + /// Sektionsname + /// true if added, false if error + public Boolean AddSection(String name) + { + if (!name.StartsWith("[")) { + name = "[" + name + "]"; + } + if (this.cont.Keys.Contains(name)) { + return false; + } + this.cont.Add(name, new Dictionary()); + this.Changed(); + return true; + } + + /// + /// Löscht eine Sektion inklusive Unterpunkte aus der Ini-Datei. + /// + /// Sektionsname + /// true if removed, false if error + public Boolean RemoveSection(String name) + { + if (!name.StartsWith("[")) { + name = "[" + name + "]"; + } + if (!this.cont.Keys.Contains(name)) { + return false; + } + this.cont.Remove(name); + this.Changed(); + return false; + } + } } diff --git a/OwnController.cs b/OwnController.cs index 4050b1d..e745eac 100644 --- a/OwnController.cs +++ b/OwnController.cs @@ -7,16 +7,16 @@ using System.Windows.Forms; namespace BlubbFish.Utils { - public abstract class OwnController + public abstract class OwnController + { + /// + /// Führt den Controller aus. + /// + public void Execute() { - /// - /// Führt den Controller aus. - /// - public void execute() - { - this.init(); - } - abstract protected void init(); - abstract public void Dispose(); + this.Init(); } + abstract protected void Init(); + abstract public void Dispose(); + } } diff --git a/OwnModel.cs b/OwnModel.cs index 42c2273..411c548 100644 --- a/OwnModel.cs +++ b/OwnModel.cs @@ -6,31 +6,30 @@ using System.Threading.Tasks; namespace BlubbFish.Utils { - public abstract class OwnModel where T : class + public abstract class OwnModel where T : class + { + private static readonly Lazy _instance = new Lazy(() => CreateInstanceOfT()); + private List observer = new List(); + public static T Instance { - private static readonly Lazy _instance = new Lazy(() => CreateInstanceOfT()); - private List observer = new List(); - public static T Instance - { - get - { - return _instance.Value; - } - } - private static T CreateInstanceOfT() - { - return Activator.CreateInstance(typeof(T), true) as T; - } - - public void setObserver(OwnView tray) - { - this.observer.Add(tray); - tray.update(); - } - protected void update() - { - this.observer.ForEach(delegate(OwnView tray) { tray.update(); }); - } - abstract protected void init(); + get { + return _instance.Value; + } } + private static T CreateInstanceOfT() + { + return Activator.CreateInstance(typeof(T), true) as T; + } + + public void SetObserver(OwnView tray) + { + this.observer.Add(tray); + tray.Update(); + } + protected void Update() + { + this.observer.ForEach(delegate (OwnView tray) { tray.Update(); }); + } + abstract protected void Init(); + } } diff --git a/OwnObject.cs b/OwnObject.cs index fc884b5..6fcb4d9 100644 --- a/OwnObject.cs +++ b/OwnObject.cs @@ -3,34 +3,38 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace BlubbFish.Utils { - abstract public class OwnObject { - private List> loglist = new List>(); +namespace BlubbFish.Utils +{ + abstract public class OwnObject + { + private List> loglist = new List>(); - public delegate void LogEvent(string location, string message, LogLevel level, DateTime date); - public enum LogLevel : int { + public delegate void LogEvent(String location, String message, LogLevel level, DateTime date); + public enum LogLevel : Int32 + { Debug = 1, Notice = 2, Info = 4, Warn = 8, Error = 16 } - - public event LogEvent eventDebug; - public event LogEvent eventNotice; - public event LogEvent eventInfo; - public event LogEvent eventWarn; - public event LogEvent eventError; + + public event LogEvent EventDebug; + public event LogEvent EventNotice; + public event LogEvent EventInfo; + public event LogEvent EventWarn; + public event LogEvent EventError; public event LogEvent EventLog; /// /// Get the Complete Log /// - public List getLog(LogLevel level, bool classNames, bool timeStamps) { - List ret = new List(); - foreach(Tuple t in this.loglist) { - if(t.Item4 >= level) { - ret.Add(logToString(t.Item2, t.Item3, t.Item4, t.Item1, classNames, timeStamps)); + public List GetLog(LogLevel level, Boolean classNames, Boolean timeStamps) + { + List ret = new List(); + foreach (Tuple t in this.loglist) { + if (t.Item4 >= level) { + ret.Add(LogToString(t.Item2, t.Item3, t.Item4, t.Item1, classNames, timeStamps)); } } return ret; @@ -39,34 +43,37 @@ namespace BlubbFish.Utils { /// /// Formates a LogMessage to a String /// - public static string logToString(string location, string message, LogLevel level, DateTime date, bool classNames, bool timeStamps) { - return (timeStamps ? "[" + date.ToString("R") + "]: "+level.ToString()+" " : "") + (classNames ? location + ", " : "") + message; + public static String LogToString(String location, String message, LogLevel level, DateTime date, Boolean classNames, Boolean timeStamps) + { + return (timeStamps ? "[" + date.ToString("R") + "]: " + level.ToString() + " " : "") + (classNames ? location + ", " : "") + message; } - protected void addLog(string location, string message, LogLevel level) { - this.addLog(location, message, level, DateTime.Now); + protected void AddLog(String location, String message, LogLevel level) + { + this.AddLog(location, message, level, DateTime.Now); } - protected void addLog(string location, string message, LogLevel level, DateTime date) { - if(eventDebug != null && level >= LogLevel.Debug) { - eventDebug(location, message, level, date); + protected void AddLog(String location, String message, LogLevel level, DateTime date) + { + if (EventDebug != null && level >= LogLevel.Debug) { + EventDebug(location, message, level, date); } - if(eventNotice != null && level >= LogLevel.Notice) { - eventNotice(location, message, level, date); + if (EventNotice != null && level >= LogLevel.Notice) { + EventNotice(location, message, level, date); } - if(eventInfo != null && level >= LogLevel.Info) { - eventInfo(location, message, level, date); + if (EventInfo != null && level >= LogLevel.Info) { + EventInfo(location, message, level, date); } - if(eventWarn != null && level >= LogLevel.Warn) { - eventWarn(location, message, level, date); + if (EventWarn != null && level >= LogLevel.Warn) { + EventWarn(location, message, level, date); } - if(eventError != null && level >= LogLevel.Error) { - eventError(location, message, level, date); + if (EventError != null && level >= LogLevel.Error) { + EventError(location, message, level, date); } - if(EventLog != null) { + if (EventLog != null) { EventLog(location, message, level, date); } - this.loglist.Add(new Tuple(date, location, message, level)); + this.loglist.Add(new Tuple(date, location, message, level)); } } } diff --git a/OwnView.cs b/OwnView.cs index 4b39e48..102e1a5 100644 --- a/OwnView.cs +++ b/OwnView.cs @@ -6,19 +6,19 @@ using System.Threading.Tasks; namespace BlubbFish.Utils { - public abstract class OwnView - { - /// - /// Called if the Oberver (Model) updates its View - /// - abstract public void update(); - /// - /// Called if view is viewed - /// - abstract protected void init(); - /// - /// Called if Form is Disposed - /// - abstract public void Dispose(); - } + public abstract class OwnView + { + /// + /// Called if the Oberver (Model) updates its View + /// + abstract public void Update(); + /// + /// Called if view is viewed + /// + abstract protected void Init(); + /// + /// Called if Form is Disposed + /// + abstract public void Dispose(); + } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index a08c1a0..885ce37 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Utils")] -[assembly: AssemblyCopyright("Copyright © 2014 - 03.03.2017")] +[assembly: AssemblyCopyright("Copyright © 2014 - 09.03.2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.1")] -[assembly: AssemblyFileVersion("1.0.2.1")] +[assembly: AssemblyVersion("1.0.2.2")] +[assembly: AssemblyFileVersion("1.0.2.2")]