Skip to content

Commit 934aa45

Browse files
committed
Make Write/IWrite more flexible
1 parent 88df091 commit 934aa45

File tree

3 files changed

+36
-32
lines changed

3 files changed

+36
-32
lines changed

src/InEngine.Core/AbstractCommand.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,52 +79,52 @@ public virtual void Execute(IJobExecutionContext context)
7979
#endregion
8080

8181
#region Console output
82-
public IWrite Info(string val)
82+
public IWrite Info(object val)
8383
{
8484
return Write.Info(val);
8585
}
8686

87-
public IWrite Warning(string val)
87+
public IWrite Warning(object val)
8888
{
8989
return Write.Warning(val);
9090
}
9191

92-
public IWrite Error(string val)
92+
public IWrite Error(object val)
9393
{
9494
return Write.Error(val);
9595
}
9696

97-
public IWrite Line(string val)
97+
public IWrite Line(object val)
9898
{
9999
return Write.Line(val);
100100
}
101101

102-
public IWrite ColoredLine(string val, ConsoleColor consoleColor)
102+
public IWrite ColoredLine(object val, ConsoleColor consoleColor)
103103
{
104104
return Write.ColoredLine(val, consoleColor);
105105
}
106106

107-
public IWrite InfoText(string val)
107+
public IWrite InfoText(object val)
108108
{
109109
return Write.InfoText(val);
110110
}
111111

112-
public IWrite WarningText(string val)
112+
public IWrite WarningText(object val)
113113
{
114114
return Write.WarningText(val);
115115
}
116116

117-
public IWrite ErrorText(string val)
117+
public IWrite ErrorText(object val)
118118
{
119119
return Write.ErrorText(val);
120120
}
121121

122-
public IWrite Text(string val)
122+
public IWrite Text(object val)
123123
{
124124
return Write.Text(val);
125125
}
126126

127-
public IWrite ColoredText(string val, ConsoleColor consoleColor)
127+
public IWrite ColoredText(object val, ConsoleColor consoleColor)
128128
{
129129
return Write.ColoredText(val, consoleColor);
130130
}

src/InEngine.Core/IO/IWrite.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ namespace InEngine.Core.IO
55
public interface IWrite
66
{
77
IWrite Newline(int count = 1);
8-
IWrite Info(string val);
9-
IWrite Warning(string val);
10-
IWrite Error(string val);
11-
IWrite Line(string val);
12-
IWrite ColoredLine(string val, ConsoleColor consoleColor);
8+
IWrite Info(object val);
9+
IWrite Warning(object val);
10+
IWrite Error(object val);
11+
IWrite Line(object val);
12+
IWrite ColoredLine(object val, ConsoleColor consoleColor);
1313

14-
IWrite InfoText(string val);
15-
IWrite WarningText(string val);
16-
IWrite ErrorText(string val);
17-
IWrite Text(string val);
18-
IWrite ColoredText(string val, ConsoleColor consoleColor);
14+
IWrite InfoText(object val);
15+
IWrite WarningText(object val);
16+
IWrite ErrorText(object val);
17+
IWrite Text(object val);
18+
IWrite ColoredText(object val, ConsoleColor consoleColor);
1919

2020
string FlushBuffer();
2121
void ToFile(string path, string text, bool shouldAppend = false);

src/InEngine.Core/IO/Write.cs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,65 +23,69 @@ public IWrite Newline(int count = 1)
2323
return this;
2424
}
2525

26-
public IWrite Info(string val)
26+
public IWrite Info(object val)
2727
{
2828
return ColoredLine(val, InfoColor);
2929
}
3030

31-
public IWrite Error(string val)
31+
public IWrite Error(object val)
3232
{
3333
return ColoredLine(val, ErrorColor);
3434
}
3535

36-
public IWrite Warning(string val)
36+
public IWrite Warning(object val)
3737
{
3838
return ColoredLine(val, WarningColor);
3939
}
4040

41-
public IWrite Line(string val)
41+
public IWrite Line(object val)
4242
{
4343
return ColoredLine(val, LineColor);
4444
}
4545

46-
public IWrite ColoredLine(string val, ConsoleColor consoleColor)
46+
public IWrite ColoredLine(object val, ConsoleColor consoleColor)
4747
{
48+
if (val == null)
49+
val = String.Empty;
4850
consoleOutputLock.WaitOne();
4951
Console.ForegroundColor = consoleColor;
5052
Console.WriteLine(val);
5153
Console.ResetColor();
5254
consoleOutputLock.ReleaseMutex();
53-
Buffer.Add(val);
55+
Buffer.Add(val.ToString());
5456
return this;
5557
}
5658

57-
public IWrite InfoText(string val)
59+
public IWrite InfoText(object val)
5860
{
5961
return ColoredText(val, InfoColor);
6062
}
6163

62-
public IWrite ErrorText(string val)
64+
public IWrite ErrorText(object val)
6365
{
6466
return ColoredText(val, ErrorColor);
6567
}
6668

67-
public IWrite WarningText(string val)
69+
public IWrite WarningText(object val)
6870
{
6971
return ColoredText(val, WarningColor);
7072
}
7173

72-
public IWrite Text(string val)
74+
public IWrite Text(object val)
7375
{
7476
return ColoredText(val, LineColor);
7577
}
7678

77-
public IWrite ColoredText(string val, ConsoleColor consoleColor)
79+
public IWrite ColoredText(object val, ConsoleColor consoleColor)
7880
{
81+
if (val == null)
82+
val = String.Empty;
7983
consoleOutputLock.WaitOne();
8084
Console.ForegroundColor = consoleColor;
8185
Console.Write(val);
8286
Console.ResetColor();
8387
consoleOutputLock.ReleaseMutex();
84-
Buffer.Add(val);
88+
Buffer.Add(val.ToString());
8589
return this;
8690
}
8791

0 commit comments

Comments
 (0)