Skip to content

Commit 11775a3

Browse files
arthurkehrwaldarthurkehrwald
committed
Nitpicking
1 parent 989fc54 commit 11775a3

File tree

8 files changed

+36
-35
lines changed

8 files changed

+36
-35
lines changed

‎Runtime/MediaController/Messages/Device/DeviceMonitor.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111

1212
using System;
1313
using Newtonsoft.Json;
14-
using UnityEngine;
1514

1615
namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Device
1716
{
1817
public abstract class DeviceMonitor<TMessage, TDeviceState>
1918
: MonitorBase<TMessage, DeviceMessage>
2019
where TMessage : SpecificDeviceMessageBase, IEquatable<TMessage>
2120
{
22-
private string _deviceName;
21+
private readonly string _deviceName;
2322

2423
protected DeviceMonitor(BcpInterface bcpInterface, string deviceName)
2524
: base(bcpInterface)
@@ -29,17 +28,19 @@ protected DeviceMonitor(BcpInterface bcpInterface, string deviceName)
2928

3029
protected override string BcpCommand => DeviceMessage.Command;
3130
protected abstract string Type { get; }
31+
3232
protected delegate TMessage ParseStateDelegate(
3333
TDeviceState deserializedState,
3434
string deviceName
3535
);
36+
3637
protected abstract ParseStateDelegate ParseState { get; }
3738

3839
protected override bool MatchesMonitoringCriteria(DeviceMessage msg)
3940
{
4041
return base.MatchesMonitoringCriteria(msg)
41-
&& msg.Type == Type
42-
&& msg.Name == _deviceName;
42+
&& msg.Type == Type
43+
&& msg.Name == _deviceName;
4344
}
4445

4546
protected override void MessageHandler_Received(object sender, DeviceMessage msg)
@@ -64,7 +65,7 @@ protected override TMessage GetValueFromMessage(DeviceMessage msg)
6465
TMessage specificDeviceMessage = ParseState(deserializedState, msg.Name);
6566
return specificDeviceMessage;
6667
}
67-
68+
6869
protected abstract void HandleAttributeChange(DeviceAttributeChange change);
6970
}
70-
}
71+
}

‎Runtime/MediaController/Messages/MachineVariable/MachineVariableMonitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.MachineVariable
1515
{
16-
public class MachineVariableMonitor<TVar> : MpfVariableMonitorBase<TVar, MachineVariableMessage>
17-
where TVar : IEquatable<TVar>
16+
public class MachineVariableMonitor<T> : MpfVariableMonitorBase<T, MachineVariableMessage>
17+
where T : IEquatable<T>
1818
{
1919
public MachineVariableMonitor(BcpInterface bcpInterface, string varName)
2020
: base(bcpInterface, varName) { }

‎Runtime/MediaController/Messages/Mode/ModeMonitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
// SOFTWARE.
1111

1212
using System;
13-
using UnityEngine;
1413

1514
namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Mode
1615
{
16+
// Does not derive from <c>MonitorBase</c> because it needs to listen receive two different message types
1717
public class ModeMonitor : IDisposable
1818
{
19-
private string _modeName;
19+
private readonly string _modeName;
2020
private BcpMessageHandler<ModeStartMessage> _modeStartMessageHandler;
2121
private BcpMessageHandler<ModeStopMessage> _modeStopMessageHandler;
2222

‎Runtime/MediaController/Messages/MonitorBase.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,26 @@ public abstract class MonitorBase<TVar, TMessage> : IDisposable
1818
where TMessage : EventArgs
1919
{
2020
protected abstract string BcpCommand { get; }
21-
private BcpInterface _bcpInterface;
22-
private BcpMessageHandler<TMessage> _messageHandler;
21+
private readonly BcpInterface _bcpInterface;
22+
private readonly BcpMessageHandler<TMessage> _messageHandler;
2323

2424
public event EventHandler<TVar> ValueChanged;
2525
private TVar _varValue;
26+
2627
public TVar VarValue
2728
{
2829
get => _varValue;
2930
protected set
3031
{
3132
WasEverUpdated = true;
32-
if ((value == null && VarValue == null) || value != null && value.Equals(_varValue))
33+
if ((value == null && VarValue == null) || value != null && Equals(value, VarValue))
3334
return;
3435
_varValue = value;
3536
ValueChanged?.Invoke(this, _varValue);
3637
}
3738
}
3839

39-
public bool WasEverUpdated { get; private set; } = false;
40+
public bool WasEverUpdated { get; private set; }
4041

4142
protected MonitorBase(BcpInterface bcpInterface)
4243
{
@@ -72,4 +73,4 @@ protected virtual void MessageHandler_Received(object sender, TMessage msg)
7273

7374
protected abstract TVar GetValueFromMessage(TMessage msg);
7475
}
75-
}
76+
}

‎Runtime/MediaController/Messages/MpfVariableMonitorBase.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
// SOFTWARE.
1111

1212
using System;
13-
using UnityEngine;
1413

1514
namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages
1615
{
17-
public abstract class MpfVariableMonitorBase<TVar, TMessage> : MonitorBase<TVar, TMessage>
16+
public abstract class
17+
MpfVariableMonitorBase<TVar, TMessage> : MonitorBase<TVar, TMessage>
1818
where TVar : IEquatable<TVar>
1919
where TMessage : MpfVariableMessageBase
2020
{
21-
protected string _varName;
21+
private readonly string _varName;
2222

2323
protected MpfVariableMonitorBase(BcpInterface bcpInterface, string varName)
2424
: base(bcpInterface)
@@ -38,14 +38,10 @@ protected override TVar GetValueFromMessage(TMessage msg)
3838
return (TVar)Convert.ChangeType(msg.Value, typeof(TVar));
3939
}
4040
catch (Exception e)
41-
when (e is InvalidCastException
42-
|| e is FormatException
43-
|| e is OverflowException
44-
|| e is ArgumentNullException
45-
)
41+
when (e is InvalidCastException or FormatException or OverflowException or ArgumentNullException)
4642
{
4743
throw new ParameterException(MpfVariableMessageBase.ValueParamName, null, e);
4844
}
4945
}
5046
}
51-
}
47+
}

‎Runtime/MediaController/Messages/PlayerAdded/PlayerCountMonitor.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.PlayerAdded
1414
public class PlayerCountMonitor : MonitorBase<int, PlayerAddedMessage>
1515
{
1616
public PlayerCountMonitor(BcpInterface bcpInterface)
17-
: base(bcpInterface) { }
17+
: base(bcpInterface)
18+
{
19+
}
1820

1921
// Assumes that player numbers are assigned consecutively starting at 1
2022
protected override int GetValueFromMessage(PlayerAddedMessage msg) => msg.PlayerNum;
2123

2224
protected override string BcpCommand => PlayerAddedMessage.Command;
2325
}
24-
}
26+
}

‎Runtime/MediaController/Messages/PlayerVariable/PlayerVariableMonitor.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.PlayerVariable
1717
{
18-
public class PlayerVariableMonitor<VarType>
19-
: MpfVariableMonitorBase<VarType, PlayerVariableMessage>
20-
where VarType : IEquatable<VarType>
18+
public class PlayerVariableMonitor<T>
19+
: MpfVariableMonitorBase<T, PlayerVariableMessage>
20+
where T : IEquatable<T>
2121
{
22-
private CurrentPlayerMonitor _currentPlayerMonitor;
22+
private readonly CurrentPlayerMonitor _currentPlayerMonitor;
2323

2424
protected override string BcpCommand => PlayerVariableMessage.Command;
25-
protected Dictionary<int, VarType> _varPerPlayer = new();
25+
private readonly Dictionary<int, T> _varPerPlayer = new();
2626

2727
public PlayerVariableMonitor(BcpInterface bcpInterface, string varName)
2828
: base(bcpInterface, varName)
@@ -47,16 +47,17 @@ protected override void MessageHandler_Received(object sender, PlayerVariableMes
4747
{
4848
if (base.MatchesMonitoringCriteria(msg))
4949
{
50-
VarType var = GetValueFromMessage(msg);
50+
T var = GetValueFromMessage(msg);
5151
_varPerPlayer[msg.PlayerNum] = var;
5252
}
53+
5354
base.MessageHandler_Received(sender, msg);
5455
}
5556

5657
protected override bool MatchesMonitoringCriteria(PlayerVariableMessage msg)
5758
{
5859
return base.MatchesMonitoringCriteria(msg)
59-
&& msg.PlayerNum == _currentPlayerMonitor.VarValue;
60+
&& msg.PlayerNum == _currentPlayerMonitor.VarValue;
6061
}
6162
}
62-
}
63+
}

‎Runtime/MediaController/Messages/Switch/SwitchMonitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Switch
1515
{
1616
public class SwitchMonitor : MonitorBase<bool, SwitchMessage>
1717
{
18-
protected string _switchName;
18+
private readonly string _switchName;
1919

2020
public SwitchMonitor(BcpInterface bcpInterface, string switchName)
2121
: base(bcpInterface)

0 commit comments

Comments
 (0)