vs_utils/Utils
1
0
Fork 0
Code Issues Pull Requests Releases 25 Wiki Activity

Change a lot of typos and violations against C# defination

Browse Source
This commit is contained in:
BlubbFish 2017-03-09 22:32:42 +00:00
parent ca97ec2106
commit a523e62a48
9 changed files with 483 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
CmdArgs.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
namespace BlubbFish.Utils namespace BlubbFish.Utils
{ {
@ -15,7 +14,7 @@ namespace BlubbFish.Utils
#region Classes #region Classes
public class VaildArguments public class VaildArguments
{ {
public VaildArguments(ArgLength length, bool required) public VaildArguments(ArgLength length, Boolean required)
{ {
this.Required = required; this.Required = required;
this.Length = length; this.Length = length;
@ -27,34 +26,35 @@ namespace BlubbFish.Utils
} }
public ArgLength Length { get; private set; } public ArgLength Length { get; private set; }
public bool Required { get; private set; } public Boolean Required { get; private set; }
} }
private class ArgTouple private class ArgTouple
{ {
public ArgTouple(string type, string data) public ArgTouple(String type, String data)
{ {
this.type = type; this.Type = type;
this.data = data; this.Data = data;
} }
public ArgTouple(string type) public ArgTouple(String type)
{ {
this.type = type; this.Type = type;
} }
public string type { get; private set; } public String Type { get; private set; }
public string data { get; private set; } public String Data { get; private set; }
internal void setData(string data) internal void SetData(String data)
{ {
if (data != "") if (data != "") {
this.data = data; this.Data = data;
}
} }
} }
#endregion #endregion
private string[] args; private String[] args;
private List<ArgTouple> argList; private List<ArgTouple> argList;
private Dictionary<string, VaildArguments> argsPosible = new Dictionary<string, VaildArguments>(); private Dictionary<String, VaildArguments> argsPosible = new Dictionary<String, VaildArguments>();
private static CmdArgs instances = null; private static CmdArgs instances = null;
private bool isSetArguments = false; private Boolean isSetArguments = false;
private CmdArgs() private CmdArgs()
{ {
@ -64,25 +64,25 @@ namespace BlubbFish.Utils
/// Gibt eine Instanz der Klasse zurück /// Gibt eine Instanz der Klasse zurück
/// </summary> /// </summary>
/// <returns>Klasse</returns> /// <returns>Klasse</returns>
public static CmdArgs getInstance() public static CmdArgs Instance
{
if (instances == null)
{ {
get {
if (instances == null) {
instances = new CmdArgs(); instances = new CmdArgs();
} }
return instances; return instances;
} }
}
/// <summary> /// <summary>
/// Übernimmt die Argumente für die Klasse /// Übernimmt die Argumente für die Klasse
/// </summary> /// </summary>
/// <param name="arguments">Mögliche Komandozeilenargumente</param> /// <param name="arguments">Mögliche Komandozeilenargumente</param>
/// <param name="args">Tatsächliche Komandozeilenargumente</param> /// <param name="args">Tatsächliche Komandozeilenargumente</param>
public void setArguments(Dictionary<string, VaildArguments> arguments, string[] args) public void SetArguments(Dictionary<String, VaildArguments> arguments, String[] args)
{ {
this.args = args; this.args = args;
if (!this.isSetArguments) if (!this.isSetArguments) {
{
this.isSetArguments = true; this.isSetArguments = true;
this.argsPosible = arguments; this.argsPosible = arguments;
this.Init(); this.Init();
@ -92,19 +92,13 @@ namespace BlubbFish.Utils
private void Init() private void Init()
{ {
this.argList = new List<ArgTouple>(); this.argList = new List<ArgTouple>();
for (int i = 0; i < this.args.Length; i++) for (Int32 i = 0; i < this.args.Length; i++) {
{ if (this.argsPosible.Keys.Contains(this.args[i])) {
if (this.argsPosible.Keys.Contains(args[i])) ArgTouple arg = new ArgTouple(this.args[i]);
{ if (this.argsPosible[this.args[i]].Length == ArgLength.Touple) {
ArgTouple arg = new ArgTouple(args[i]); if (this.args.Length > i + 1) {
if (argsPosible[args[i]].Length == ArgLength.Touple) arg.SetData(this.args[++i]);
{ } else {
if (args.Length > i + 1)
{
arg.setData(args[++i]);
}
else
{
throw new ArgumentException(); throw new ArgumentException();
} }
} }
@ -117,7 +111,7 @@ namespace BlubbFish.Utils
/// Menge der angegebenen Komandozeilen-Argumente /// Menge der angegebenen Komandozeilen-Argumente
/// </summary> /// </summary>
/// <returns>Menge</returns> /// <returns>Menge</returns>
public int GetArgsLength() public Int32 GetArgsLength()
{ {
return this.argList.Count; return this.argList.Count;
} }
@ -127,13 +121,13 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Name des Arguments</param> /// <param name="name">Name des Arguments</param>
/// <returns>true wenn angegeben</returns> /// <returns>true wenn angegeben</returns>
public bool HasArgumentType(string name) public Boolean HasArgumentType(String name)
{ {
foreach (ArgTouple t in this.argList) foreach (ArgTouple t in this.argList) {
{ if (t.Type == name) {
if (t.type == name)
return true; return true;
} }
}
return false; return false;
} }
@ -142,57 +136,47 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Name des Arguments</param> /// <param name="name">Name des Arguments</param>
/// <returns>Inhalt des Arguments oder ArgumentNullException</returns> /// <returns>Inhalt des Arguments oder ArgumentNullException</returns>
public string GetArgumentData(string name) public String GetArgumentData(String name)
{
foreach (ArgTouple t in this.argList)
{
if (t.type == name && t.data != null)
return t.data;
else
{ {
foreach (ArgTouple t in this.argList) {
if (t.Type == name && t.Data != null) {
return t.Data;
} else {
throw new ArgumentNullException(); throw new ArgumentNullException();
} }
} }
return null; return null;
} }
public bool HasAllRequiredArguments() public Boolean HasAllRequiredArguments()
{
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible)
{
if (item.Value.Required && !this.HasArgumentType(item.Key))
{ {
foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
if (item.Value.Required && !this.HasArgumentType(item.Key)) {
return false; return false;
} }
} }
return true; return true;
} }
public string getUsageList(string name) public String GetUsageList(String name)
{ {
string ret = "Usage: "+name+" Parameter\nParameter:\n"; String ret = "Usage: " + name + " Parameter\nParameter:\n";
string req =""; String req = "";
string opt = ""; String opt = "";
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible) foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
{ if (item.Value.Required) {
if (item.Value.Required) req += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
{
req += item.Key+" "+((item.Value.Length == ArgLength.Touple)?" [data]\n":"\n");
} }
} }
if (req != "") if (req != "") {
{
ret += "Benötigte Parameter:\n" + req; ret += "Benötigte Parameter:\n" + req;
} }
foreach (KeyValuePair<string, VaildArguments> item in this.argsPosible) foreach (KeyValuePair<String, VaildArguments> item in this.argsPosible) {
{ if (!item.Value.Required) {
if (!item.Value.Required)
{
opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n"); opt += item.Key + " " + ((item.Value.Length == ArgLength.Touple) ? " [data]\n" : "\n");
} }
} }
if (opt != "") if (opt != "") {
{
ret += "Optionale Parameter:\n" + opt; ret += "Optionale Parameter:\n" + opt;
} }
return ret; return ret;

47
FileLogger.cs
View File

@ -5,54 +5,63 @@ using System.Text;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
namespace BlubbFish.Utils { namespace BlubbFish.Utils
public class FileLogger { {
private static Dictionary<string, FileLogger> instances = new Dictionary<string, FileLogger>(); public class FileLogger
{
private static Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>();
private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar; private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar;
private StreamWriter file; private StreamWriter file;
private FileLogger(string filename, bool append) { private FileLogger(String filename, Boolean append)
{
filename = logDir + filename; filename = logDir + filename;
if(!File.Exists(filename)) { if (!File.Exists(filename)) {
string folder = Path.GetDirectoryName(Path.GetFullPath(filename)); String folder = Path.GetDirectoryName(Path.GetFullPath(filename));
if(!Directory.Exists(folder)) { if (!Directory.Exists(folder)) {
Directory.CreateDirectory(folder); Directory.CreateDirectory(folder);
} }
} }
this.file = new StreamWriter(filename, append, Encoding.UTF8); this.file = new StreamWriter(filename, append, Encoding.UTF8) {
this.file.AutoFlush = true; AutoFlush = true
};
} }
public static FileLogger getInstance(string filename, bool append) { public static FileLogger GetInstance(String filename, Boolean append)
if(!instances.Keys.Contains(filename)) { {
if (!instances.Keys.Contains(filename)) {
instances.Add(filename, new FileLogger(filename, append)); instances.Add(filename, new FileLogger(filename, append));
} }
return instances[filename]; return instances[filename];
} }
public static void setLogDir(String v) { public static void SetLogDir(String v)
{
v = v.Replace("..", ""); v = v.Replace("..", "");
v = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar + v; v = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar + v;
if(Directory.Exists(v)) { if (Directory.Exists(v)) {
logDir = v; logDir = v;
} else { } else {
Directory.CreateDirectory(v); Directory.CreateDirectory(v);
logDir = 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; logDir = logDir + Path.DirectorySeparatorChar;
} }
} }
public void setArray(string[] text) { public void SetArray(String[] text)
this.file.Write(String.Join(file.NewLine, text) + file.NewLine); {
this.file.Write(String.Join(this.file.NewLine, text) + this.file.NewLine);
this.file.Flush(); this.file.Flush();
} }
public void setLine(string text) { public void SetLine(String text)
{
this.file.WriteLine(text); this.file.WriteLine(text);
this.file.Flush(); this.file.Flush();
} }
public void setLine(string text, DateTime d) { public void SetLine(String text, DateTime d)
this.setLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text); {
this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text);
} }
} }
} }

46
FileMutex.cs
View File

@ -1,46 +1,52 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading.Tasks;
namespace BlubbFish.Utils { namespace BlubbFish.Utils
public class FileMutex { {
public class FileMutex
{
private static FileMutex instance; private static FileMutex instance;
private String filename; private String filename;
private StreamWriter file; private StreamWriter file;
private FileMutex() { } private FileMutex() { }
public static FileMutex Instance { public static FileMutex Instance
{
get { get {
if(FileMutex.instance == null) { if (instance == null) {
FileMutex.instance = new FileMutex(); instance = new FileMutex();
} }
return FileMutex.instance; return instance;
} }
} }
public void setName(string name) { 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"; 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() { public Boolean Create()
if(File.Exists(this.filename)) {
if (File.Exists(this.filename)) {
return false; return false;
this.file = new StreamWriter(this.filename);
this.initFile();
return File.Exists(this.filename) && file != null;
} }
private void initFile() { this.file = new StreamWriter(this.filename);
this.file.Write("Created: " + DateTime.Now.ToUniversalTime()+"\n"); InitFile();
return File.Exists(this.filename) && this.file != null;
}
private void InitFile()
{
this.file.Write("Created: " + DateTime.Now.ToUniversalTime() + "\n");
this.file.Flush(); this.file.Flush();
} }
public bool delete() { public Boolean Delete()
{
this.file.Close(); this.file.Close();
File.Delete(this.filename); File.Delete(this.filename);
return !File.Exists(this.filename); return !File.Exists(this.filename);

153
InIReader.cs
View File

@ -10,143 +10,124 @@ namespace BlubbFish.Utils
{ {
public class InIReader public class InIReader
{ {
private Dictionary<string, Dictionary<string, string>> cont; private Dictionary<String, Dictionary<String, String>> cont;
private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini"); private FileSystemWatcher k = new FileSystemWatcher(Directory.GetCurrentDirectory(), "*.ini");
private string filename; private String filename;
private static Dictionary<string, InIReader> instances = new Dictionary<string, InIReader>(); private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
private InIReader(string filename) private InIReader(String filename)
{ {
this.filename = filename; this.filename = filename;
k.Changed += new FileSystemEventHandler(this.readAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
loadFile(); LoadFile();
} }
public static InIReader getInstance(string filename) public static InIReader GetInstance(String filename)
{
if (!instances.Keys.Contains(filename))
{ {
if (!instances.Keys.Contains(filename)) {
instances.Add(filename, new InIReader(filename)); instances.Add(filename, new InIReader(filename));
} }
return instances[filename]; return instances[filename];
} }
private void readAgain(object sender, EventArgs e) private void ReadAgain(Object sender, EventArgs e)
{ {
this.loadFile(); this.LoadFile();
} }
private void loadFile() private void LoadFile()
{ {
this.cont = new Dictionary<string, Dictionary<string, string>>(); this.cont = new Dictionary<String, Dictionary<String, String>>();
StreamReader file = new StreamReader(this.filename); StreamReader file = new StreamReader(this.filename);
List<String> buf = new List<string>(); List<String> buf = new List<String>();
string fline = ""; String fline = "";
while (fline != null) while (fline != null) {
{
fline = file.ReadLine(); fline = file.ReadLine();
if (fline != null && fline.Length > 0 && fline.Substring(0,1) != ";") if (fline != null && fline.Length > 0 && fline.Substring(0, 1) != ";") {
buf.Add(fline); buf.Add(fline);
} }
}
file.Close(); file.Close();
Dictionary<string, string> sub = new Dictionary<string, string>(); Dictionary<String, String> sub = new Dictionary<String, String>();
string cap = ""; String cap = "";
foreach (string line in buf) foreach (String line in buf) {
{
Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase); Match match = Regex.Match(line, @"^\[[a-zA-Z0-9\-_ ]+\]\w*$", RegexOptions.IgnoreCase);
if (match.Success) if (match.Success) {
{ if (sub.Count != 0 && cap != "") {
if (sub.Count != 0 && cap != "")
{
this.cont.Add(cap, sub); this.cont.Add(cap, sub);
} }
cap = line; cap = line;
sub = new Dictionary<string, string>(); sub = new Dictionary<String, String>();
} } else {
else if (line != "" && cap != "") {
{ String key = line.Substring(0, line.IndexOf('='));
if (line != "" && cap != "") String value = line.Substring(line.IndexOf('=') + 1);
{
string key = line.Substring(0, line.IndexOf('='));
string value = line.Substring(line.IndexOf('=') + 1);
sub.Add(key, value); sub.Add(key, value);
} }
} }
} }
if (sub.Count != 0 && cap != "") if (sub.Count != 0 && cap != "") {
{
this.cont.Add(cap, sub); this.cont.Add(cap, sub);
} }
} }
public List<String> getSections() public List<String> GetSections()
{ {
return cont.Keys.ToList<String>(); return this.cont.Keys.ToList<String>();
} }
public String getValue(String section, String key) public String GetValue(String section, String key)
{
if (!section.StartsWith("["))
{ {
if (!section.StartsWith("[")) {
section = "[" + section + "]"; section = "[" + section + "]";
} }
if (cont.Keys.Contains(section)) if (this.cont.Keys.Contains(section)) {
{ if (this.cont[section].Keys.Contains(key)) {
if (cont[section].Keys.Contains(key)) return this.cont[section][key];
{
return cont[section][key];
} }
} }
return null; return null;
} }
public void SetValue(string section, string key, string value) public void SetValue(String section, String key, String value)
{
if (!section.StartsWith("["))
{ {
if (!section.StartsWith("[")) {
section = "[" + section + "]"; section = "[" + section + "]";
} }
if (cont.Keys.Contains(section)) if (this.cont.Keys.Contains(section)) {
{ if (this.cont[section].Keys.Contains(key)) {
if (cont[section].Keys.Contains(key)) this.cont[section][key] = value;
{ } else {
cont[section][key] = value; this.cont[section].Add(key, value);
} }
else } else {
{ Dictionary<String, String> sub = new Dictionary<String, String> {
cont[section].Add(key, value); { key, value }
};
this.cont.Add(section, sub);
} }
} this.Changed();
else
{
Dictionary<string, string> sub = new Dictionary<string, string>();
sub.Add(key, value);
cont.Add(section, sub);
}
this.changed();
} }
private void changed() private void Changed()
{ {
k.Changed -= null; this.k.Changed -= null;
saveSettings(); SaveSettings();
loadFile(); LoadFile();
k.Changed += new FileSystemEventHandler(this.readAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
} }
private void saveSettings() private void SaveSettings()
{ {
StreamWriter file = new StreamWriter(this.filename); StreamWriter file = new StreamWriter(this.filename);
file.BaseStream.SetLength(0); file.BaseStream.SetLength(0);
file.BaseStream.Flush(); file.BaseStream.Flush();
file.BaseStream.Seek(0, SeekOrigin.Begin); file.BaseStream.Seek(0, SeekOrigin.Begin);
foreach (KeyValuePair<string, Dictionary<string, string>> cap in this.cont) foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.cont) {
{
file.WriteLine(cap.Key); file.WriteLine(cap.Key);
foreach (KeyValuePair<string, string> sub in cap.Value) foreach (KeyValuePair<String, String> sub in cap.Value) {
{
file.WriteLine(sub.Key + "=" + sub.Value); file.WriteLine(sub.Key + "=" + sub.Value);
} }
file.WriteLine(); file.WriteLine();
@ -160,18 +141,16 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Sektionsname</param> /// <param name="name">Sektionsname</param>
/// <returns>true if added, false if error</returns> /// <returns>true if added, false if error</returns>
public bool addSection(string name) public Boolean AddSection(String name)
{
if (!name.StartsWith("["))
{ {
if (!name.StartsWith("[")) {
name = "[" + name + "]"; name = "[" + name + "]";
} }
if (this.cont.Keys.Contains(name)) if (this.cont.Keys.Contains(name)) {
{
return false; return false;
} }
this.cont.Add(name, new Dictionary<string, string>()); this.cont.Add(name, new Dictionary<String, String>());
this.changed(); this.Changed();
return true; return true;
} }
@ -180,18 +159,16 @@ namespace BlubbFish.Utils
/// </summary> /// </summary>
/// <param name="name">Sektionsname</param> /// <param name="name">Sektionsname</param>
/// <returns>true if removed, false if error</returns> /// <returns>true if removed, false if error</returns>
public bool removeSection(string name) public Boolean RemoveSection(String name)
{
if (!name.StartsWith("["))
{ {
if (!name.StartsWith("[")) {
name = "[" + name + "]"; name = "[" + name + "]";
} }
if (!this.cont.Keys.Contains(name)) if (!this.cont.Keys.Contains(name)) {
{
return false; return false;
} }
this.cont.Remove(name); this.cont.Remove(name);
this.changed(); this.Changed();
return false; return false;
} }
} }

6
OwnController.cs
View File

@ -12,11 +12,11 @@ namespace BlubbFish.Utils
/// <summary> /// <summary>
/// Führt den Controller aus. /// Führt den Controller aus.
/// </summary> /// </summary>
public void execute() public void Execute()
{ {
this.init(); this.Init();
} }
abstract protected void init(); abstract protected void Init();
abstract public void Dispose(); abstract public void Dispose();
} }
} }

13
OwnModel.cs
View File

@ -12,8 +12,7 @@ namespace BlubbFish.Utils
private List<OwnView> observer = new List<OwnView>(); private List<OwnView> observer = new List<OwnView>();
public static T Instance public static T Instance
{ {
get get {
{
return _instance.Value; return _instance.Value;
} }
} }
@ -22,15 +21,15 @@ namespace BlubbFish.Utils
return Activator.CreateInstance(typeof(T), true) as T; return Activator.CreateInstance(typeof(T), true) as T;
} }
public void setObserver(OwnView tray) public void SetObserver(OwnView tray)
{ {
this.observer.Add(tray); this.observer.Add(tray);
tray.update(); tray.Update();
} }
protected void update() protected void Update()
{ {
this.observer.ForEach(delegate(OwnView tray) { tray.update(); }); this.observer.ForEach(delegate (OwnView tray) { tray.Update(); });
} }
abstract protected void init(); abstract protected void Init();
} }
} }

71
OwnObject.cs
View File

@ -3,12 +3,15 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace BlubbFish.Utils { namespace BlubbFish.Utils
abstract public class OwnObject { {
private List<Tuple<DateTime, string, string, LogLevel>> loglist = new List<Tuple<DateTime, string, string, LogLevel>>(); abstract public class OwnObject
{
private List<Tuple<DateTime, String, String, LogLevel>> loglist = new List<Tuple<DateTime, String, String, LogLevel>>();
public delegate void LogEvent(string location, string message, LogLevel level, DateTime date); public delegate void LogEvent(String location, String message, LogLevel level, DateTime date);
public enum LogLevel : int { public enum LogLevel : Int32
{
Debug = 1, Debug = 1,
Notice = 2, Notice = 2,
Info = 4, Info = 4,
@ -16,21 +19,22 @@ namespace BlubbFish.Utils {
Error = 16 Error = 16
} }
public event LogEvent eventDebug; public event LogEvent EventDebug;
public event LogEvent eventNotice; public event LogEvent EventNotice;
public event LogEvent eventInfo; public event LogEvent EventInfo;
public event LogEvent eventWarn; public event LogEvent EventWarn;
public event LogEvent eventError; public event LogEvent EventError;
public event LogEvent EventLog; public event LogEvent EventLog;
/// <summary> /// <summary>
/// Get the Complete Log /// Get the Complete Log
/// </summary> /// </summary>
public List<string> getLog(LogLevel level, bool classNames, bool timeStamps) { public List<String> GetLog(LogLevel level, Boolean classNames, Boolean timeStamps)
List<string> ret = new List<string>(); {
foreach(Tuple<DateTime, string, string, LogLevel> t in this.loglist) { List<String> ret = new List<String>();
if(t.Item4 >= level) { foreach (Tuple<DateTime, String, String, LogLevel> t in this.loglist) {
ret.Add(logToString(t.Item2, t.Item3, t.Item4, t.Item1, classNames, timeStamps)); if (t.Item4 >= level) {
ret.Add(LogToString(t.Item2, t.Item3, t.Item4, t.Item1, classNames, timeStamps));
} }
} }
return ret; return ret;
@ -39,34 +43,37 @@ namespace BlubbFish.Utils {
/// <summary> /// <summary>
/// Formates a LogMessage to a String /// Formates a LogMessage to a String
/// </summary> /// </summary>
public static string logToString(string location, string message, LogLevel level, DateTime date, bool classNames, bool timeStamps) { 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; {
return (timeStamps ? "[" + date.ToString("R") + "]: " + level.ToString() + " " : "") + (classNames ? location + ", " : "") + message;
} }
protected void addLog(string location, string message, LogLevel level) { protected void AddLog(String location, String message, LogLevel level)
this.addLog(location, message, level, DateTime.Now); {
this.AddLog(location, message, level, DateTime.Now);
} }
protected void addLog(string location, string message, LogLevel level, DateTime date) { protected void AddLog(String location, String message, LogLevel level, DateTime date)
if(eventDebug != null && level >= LogLevel.Debug) { {
eventDebug(location, message, level, date); if (EventDebug != null && level >= LogLevel.Debug) {
EventDebug(location, message, level, date);
} }
if(eventNotice != null && level >= LogLevel.Notice) { if (EventNotice != null && level >= LogLevel.Notice) {
eventNotice(location, message, level, date); EventNotice(location, message, level, date);
} }
if(eventInfo != null && level >= LogLevel.Info) { if (EventInfo != null && level >= LogLevel.Info) {
eventInfo(location, message, level, date); EventInfo(location, message, level, date);
} }
if(eventWarn != null && level >= LogLevel.Warn) { if (EventWarn != null && level >= LogLevel.Warn) {
eventWarn(location, message, level, date); EventWarn(location, message, level, date);
} }
if(eventError != null && level >= LogLevel.Error) { if (EventError != null && level >= LogLevel.Error) {
eventError(location, message, level, date); EventError(location, message, level, date);
} }
if(EventLog != null) { if (EventLog != null) {
EventLog(location, message, level, date); EventLog(location, message, level, date);
} }
this.loglist.Add(new Tuple<DateTime, string, string, LogLevel>(date, location, message, level)); this.loglist.Add(new Tuple<DateTime, String, String, LogLevel>(date, location, message, level));
} }
} }
} }

4
OwnView.cs
View File

@ -11,11 +11,11 @@ namespace BlubbFish.Utils
/// <summary> /// <summary>
/// Called if the Oberver (Model) updates its View /// Called if the Oberver (Model) updates its View
/// </summary> /// </summary>
abstract public void update(); abstract public void Update();
/// <summary> /// <summary>
/// Called if view is viewed /// Called if view is viewed
/// </summary> /// </summary>
abstract protected void init(); abstract protected void Init();
/// <summary> /// <summary>
/// Called if Form is Disposed /// Called if Form is Disposed
/// </summary> /// </summary>

6
Properties/AssemblyInfo.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Utils")] [assembly: AssemblyProduct("Utils")]
[assembly: AssemblyCopyright("Copyright © 2014 - 03.03.2017")] [assembly: AssemblyCopyright("Copyright © 2014 - 09.03.2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2.1")] [assembly: AssemblyVersion("1.0.2.2")]
[assembly: AssemblyFileVersion("1.0.2.1")] [assembly: AssemblyFileVersion("1.0.2.2")]