Skip to content

Commit 2ea5b19

Browse files
author
Dave Wyatt
committed
Ran ReSharper to clean up code style violations.
1 parent 024b834 commit 2ea5b19

10 files changed

Lines changed: 82 additions & 104 deletions

Cmdlets.cs renamed to Commands/Cmdlets.cs

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using System.Management.Automation;
1+
using System.Management.Automation;
52

63
namespace PSLogging.Commands
74
{
85
[Cmdlet(VerbsCommon.Add, "LogFile")]
96
public class AddLogFileCommand : PSCmdlet
107
{
118
private StreamType _streams = StreamType.All;
12-
private ScriptBlock _errorCallback = (ScriptBlock)null;
9+
private ScriptBlock _errorCallback;
1310
private string _path;
1411
private LogFile _inputObject;
1512

@@ -21,16 +18,8 @@ public string Path
2118
{
2219
get { return _path; }
2320

24-
set
25-
{
26-
if (System.IO.Path.IsPathRooted(value))
27-
{
28-
_path = value;
29-
}
30-
else
31-
{
32-
_path = System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
33-
}
21+
set {
22+
_path = System.IO.Path.IsPathRooted(value) ? value : System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
3423
}
3524
}
3625

@@ -62,7 +51,7 @@ public LogFile InputObject
6251

6352
protected override void EndProcessing()
6453
{
65-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
54+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
6655

6756
LogFile logFile;
6857

@@ -83,7 +72,7 @@ protected override void EndProcessing()
8372
[Cmdlet(VerbsCommon.Get, "LogFile")]
8473
public class GetLogFileCommand : PSCmdlet
8574
{
86-
private string _path = null;
75+
private string _path;
8776

8877
[Parameter(Mandatory = false,
8978
Position = 0,
@@ -93,26 +82,18 @@ public class GetLogFileCommand : PSCmdlet
9382
public string Path
9483
{
9584
get { return _path; }
96-
set
97-
{
98-
if (System.IO.Path.IsPathRooted(value))
99-
{
100-
_path = value;
101-
}
102-
else
103-
{
104-
_path = System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
105-
}
85+
set {
86+
_path = System.IO.Path.IsPathRooted(value) ? value : System.IO.Path.Combine(SessionState.Path.CurrentLocation.Path, value);
10687
}
10788
}
10889

10990
protected override void EndProcessing()
11091
{
111-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
92+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
11293

113-
foreach (IHostIOSubscriber subscriber in interceptor.Subscribers)
94+
foreach (IHostIoSubscriber subscriber in interceptor.Subscribers)
11495
{
115-
LogFile logFile = subscriber as LogFile;
96+
var logFile = subscriber as LogFile;
11697

11798
if (logFile != null && (_path == null || System.IO.Path.GetFullPath(logFile.Path) == System.IO.Path.GetFullPath(_path)))
11899
{
@@ -132,7 +113,7 @@ public class DisableLogFileCommand : PSCmdlet
132113

133114
protected override void EndProcessing()
134115
{
135-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
116+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
136117
interceptor.RemoveSubscriber(InputObject);
137118
}
138119
} // End DisableLogFileCommand class
@@ -142,7 +123,7 @@ public class SuspendLoggingCommand : PSCmdlet
142123
{
143124
protected override void EndProcessing()
144125
{
145-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
126+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
146127
interceptor.Paused = true;
147128
}
148129
} // End SuspendLoggingCommand class
@@ -152,21 +133,21 @@ public class ResumeLoggingCommand : PSCmdlet
152133
{
153134
protected override void EndProcessing()
154135
{
155-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
136+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
156137
interceptor.Paused = false;
157138
}
158139
} // End ResumeLoggingCommand class
159140

160141
[Cmdlet(VerbsCommon.Add, "OutputSubscriber")]
161142
public class AddOutputSubscriberCommand : PSCmdlet
162143
{
163-
private ScriptBlock _onWriteOutput = null;
164-
private ScriptBlock _onWriteDebug = null;
165-
private ScriptBlock _onWriteVerbose = null;
166-
private ScriptBlock _onWriteError = null;
167-
private ScriptBlock _onWriteWarning = null;
144+
private ScriptBlock _onWriteOutput;
145+
private ScriptBlock _onWriteDebug;
146+
private ScriptBlock _onWriteVerbose;
147+
private ScriptBlock _onWriteError;
148+
private ScriptBlock _onWriteWarning;
168149

169-
private ScriptBlockOutputSubscriber _inputObject = null;
150+
private ScriptBlockOutputSubscriber _inputObject;
170151

171152
#region Parameters
172153
[Parameter(ParameterSetName = "New")]
@@ -217,7 +198,7 @@ public ScriptBlockOutputSubscriber InputObject
217198

218199
protected override void EndProcessing()
219200
{
220-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
201+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
221202

222203
ScriptBlockOutputSubscriber subscriber;
223204

@@ -240,11 +221,11 @@ public class GetOutputSubscriberCommand : PSCmdlet
240221
{
241222
protected override void EndProcessing()
242223
{
243-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
224+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
244225

245-
foreach (IHostIOSubscriber subscriber in interceptor.Subscribers)
226+
foreach (IHostIoSubscriber subscriber in interceptor.Subscribers)
246227
{
247-
ScriptBlockOutputSubscriber scriptBlockSubscriber = subscriber as ScriptBlockOutputSubscriber;
228+
var scriptBlockSubscriber = subscriber as ScriptBlockOutputSubscriber;
248229
if (scriptBlockSubscriber != null) WriteObject(scriptBlockSubscriber);
249230
}
250231
}
@@ -260,7 +241,7 @@ public class DisableOutputSubscriberCommand : PSCmdlet
260241

261242
protected override void EndProcessing()
262243
{
263-
HostIOInterceptor interceptor = HostIOInterceptor.GetInterceptor();
244+
HostIoInterceptor interceptor = HostIoInterceptor.GetInterceptor();
264245
interceptor.RemoveSubscriber(InputObject);
265246
}
266247
} // End DisableOutputSubscriberCommand class

‎Common.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PSLogging
44
{
5-
[Flags()]
5+
[Flags]
66
public enum StreamType
77
{
88
None = 0,

‎HostIOInterceptor.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
using System.Security;
99
using System.Text;
1010

11-
public class HostIOInterceptor : PSHostUserInterface
11+
public class HostIoInterceptor : PSHostUserInterface
1212
{
1313
#region Static Fields
1414

15-
private static HostIOInterceptor _instance = new HostIOInterceptor();
15+
private readonly static HostIoInterceptor Instance = new HostIoInterceptor();
1616

1717
#endregion
1818

1919
#region Static Methods
2020

21-
public static HostIOInterceptor GetInterceptor()
21+
public static HostIoInterceptor GetInterceptor()
2222
{
23-
return _instance;
23+
return Instance;
2424
}
2525

2626
#endregion
@@ -29,19 +29,19 @@ public static HostIOInterceptor GetInterceptor()
2929

3030
private PSHostUserInterface _psInterface;
3131

32-
private List<IHostIOSubscriber> _subscribers;
33-
private StringBuilder _writeCache;
32+
private readonly List<IHostIoSubscriber> _subscribers;
33+
private readonly StringBuilder _writeCache;
3434

35-
private bool _paused = false;
35+
private bool _paused;
3636

3737
#endregion
3838

3939
#region Constructors and Destructors
4040

41-
private HostIOInterceptor()
41+
private HostIoInterceptor()
4242
{
4343
_psInterface = null;
44-
_subscribers = new List<IHostIOSubscriber>();
44+
_subscribers = new List<IHostIoSubscriber>();
4545
_writeCache = new StringBuilder();
4646
}
4747

@@ -55,13 +55,13 @@ public bool Paused
5555
set { _paused = value; }
5656
}
5757

58-
public PSHostUserInterface HostUI
58+
public PSHostUserInterface HostUi
5959
{
6060
get { return _psInterface; }
6161
set { if (value != null && value != _psInterface) _psInterface = value; }
6262
}
6363

64-
public IEnumerable<IHostIOSubscriber> Subscribers
64+
public IEnumerable<IHostIoSubscriber> Subscribers
6565
{
6666
get
6767
{
@@ -81,12 +81,12 @@ public override PSHostRawUserInterface RawUI
8181

8282
#region Public Methods and Operators
8383

84-
public void AddSubscriber(IHostIOSubscriber subscriber)
84+
public void AddSubscriber(IHostIoSubscriber subscriber)
8585
{
8686
if (!_subscribers.Contains(subscriber)) _subscribers.Add(subscriber);
8787
}
8888

89-
public bool RemoveSubscriber(IHostIOSubscriber subscriber)
89+
public bool RemoveSubscriber(IHostIoSubscriber subscriber)
9090
{
9191
return _subscribers.Remove(subscriber);
9292
}
@@ -100,7 +100,7 @@ public override Dictionary<string, PSObject> Prompt(
100100

101101
if (!_paused)
102102
{
103-
foreach (IHostIOSubscriber subscriber in _subscribers)
103+
foreach (IHostIoSubscriber subscriber in _subscribers)
104104
{
105105
subscriber.Prompt(result);
106106
}
@@ -118,7 +118,7 @@ public override int PromptForChoice(
118118

119119
if (!_paused)
120120
{
121-
foreach (IHostIOSubscriber subscriber in _subscribers)
121+
foreach (IHostIoSubscriber subscriber in _subscribers)
122122
{
123123
subscriber.ChoicePrompt(choices[result]);
124124
}
@@ -136,7 +136,7 @@ public override PSCredential PromptForCredential(
136136

137137
if (!_paused)
138138
{
139-
foreach (IHostIOSubscriber subscriber in _subscribers)
139+
foreach (IHostIoSubscriber subscriber in _subscribers)
140140
{
141141
subscriber.CredentialPrompt(result);
142142
}
@@ -160,7 +160,7 @@ public override PSCredential PromptForCredential(
160160

161161
if (!_paused)
162162
{
163-
foreach (IHostIOSubscriber subscriber in _subscribers)
163+
foreach (IHostIoSubscriber subscriber in _subscribers)
164164
{
165165
subscriber.CredentialPrompt(result);
166166
}
@@ -177,7 +177,7 @@ public override string ReadLine()
177177

178178
if (!_paused)
179179
{
180-
foreach (IHostIOSubscriber subscriber in _subscribers)
180+
foreach (IHostIoSubscriber subscriber in _subscribers)
181181
{
182182
subscriber.ReadFromHost(result);
183183
}
@@ -224,8 +224,8 @@ public override void WriteDebugLine(string message)
224224
{
225225
if (!_paused)
226226
{
227-
string[] lines = message.Split(new string[] { "\r\n" }, StringSplitOptions.None);
228-
foreach (IHostIOSubscriber subscriber in _subscribers)
227+
string[] lines = message.Split(new[] { "\r\n" }, StringSplitOptions.None);
228+
foreach (IHostIoSubscriber subscriber in _subscribers)
229229
{
230230
foreach (string line in lines)
231231
{
@@ -244,8 +244,8 @@ public override void WriteErrorLine(string message)
244244
{
245245
if (!_paused)
246246
{
247-
string[] lines = message.Split(new string[] { "\r\n" }, StringSplitOptions.None);
248-
foreach (IHostIOSubscriber subscriber in _subscribers)
247+
string[] lines = message.Split(new[] { "\r\n" }, StringSplitOptions.None);
248+
foreach (IHostIoSubscriber subscriber in _subscribers)
249249
{
250250
foreach (string line in lines)
251251
{
@@ -264,8 +264,8 @@ public override void WriteLine()
264264
{
265265
if (!_paused)
266266
{
267-
string[] lines = _writeCache.ToString().Split(new string[] { "\r\n" }, StringSplitOptions.None);
268-
foreach (IHostIOSubscriber subscriber in _subscribers)
267+
string[] lines = _writeCache.ToString().Split(new[] { "\r\n" }, StringSplitOptions.None);
268+
foreach (IHostIoSubscriber subscriber in _subscribers)
269269
{
270270
foreach (string line in lines)
271271
{
@@ -286,8 +286,8 @@ public override void WriteLine(string value)
286286
{
287287
if (!_paused)
288288
{
289-
string[] lines = (_writeCache.ToString() + value).Split(new string[] { "\r\n" }, StringSplitOptions.None);
290-
foreach (IHostIOSubscriber subscriber in _subscribers)
289+
string[] lines = (_writeCache + value).Split(new[] { "\r\n" }, StringSplitOptions.None);
290+
foreach (IHostIoSubscriber subscriber in _subscribers)
291291
{
292292
foreach (string line in lines)
293293
{
@@ -307,8 +307,8 @@ public override void WriteLine(ConsoleColor foregroundColor, ConsoleColor backgr
307307
{
308308
if (!_paused)
309309
{
310-
string[] lines = (_writeCache.ToString() + value).Split(new string[] { "\r\n" }, StringSplitOptions.None);
311-
foreach (IHostIOSubscriber subscriber in _subscribers)
310+
string[] lines = (_writeCache + value).Split(new[] { "\r\n" }, StringSplitOptions.None);
311+
foreach (IHostIoSubscriber subscriber in _subscribers)
312312
{
313313
foreach (string line in lines)
314314
{
@@ -328,7 +328,7 @@ public override void WriteProgress(long sourceId, ProgressRecord record)
328328
{
329329
if (!_paused)
330330
{
331-
foreach (IHostIOSubscriber subscriber in _subscribers)
331+
foreach (IHostIoSubscriber subscriber in _subscribers)
332332
{
333333
subscriber.WriteProgress(sourceId, record);
334334
}
@@ -344,8 +344,8 @@ public override void WriteVerboseLine(string message)
344344
{
345345
if (!_paused)
346346
{
347-
string[] lines = message.Split(new string[] { "\r\n" }, StringSplitOptions.None);
348-
foreach (IHostIOSubscriber subscriber in _subscribers)
347+
string[] lines = message.Split(new[] { "\r\n" }, StringSplitOptions.None);
348+
foreach (IHostIoSubscriber subscriber in _subscribers)
349349
{
350350
foreach (string line in lines)
351351
{
@@ -364,8 +364,8 @@ public override void WriteWarningLine(string message)
364364
{
365365
if (!_paused)
366366
{
367-
string[] lines = message.Split(new string[] { "\r\n" }, StringSplitOptions.None);
368-
foreach (IHostIOSubscriber subscriber in _subscribers)
367+
string[] lines = message.Split(new[] { "\r\n" }, StringSplitOptions.None);
368+
foreach (IHostIoSubscriber subscriber in _subscribers)
369369
{
370370
foreach (string line in lines)
371371
{

‎HostIOSubscriberBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Management.Automation.Host;
44

55
namespace PSLogging {
6-
public class HostIOSubscriberBase : IHostIOSubscriber {
6+
public class HostIoSubscriberBase : IHostIoSubscriber {
77
public virtual void WriteProgress(long sourceId, ProgressRecord record) { }
88

99
public virtual void ChoicePrompt(ChoiceDescription choice) { }

0 commit comments

Comments
 (0)