Skip to content

Commit 82d3be2

Browse files
review cesarBLG: Use correct case for all public methods
1 parent fc94364 commit 82d3be2

File tree

5 files changed

+93
-93
lines changed

5 files changed

+93
-93
lines changed

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanel.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ public SwitchOnPanel(Viewer viewer)
3737
Status = new SwitchOnPanelStatus(Viewer);
3838
}
3939

40-
public void initDefinition(UserCommand userCommand)
40+
public void InitDefinition(UserCommand userCommand)
4141
{
42-
Definition.init(userCommand);
42+
Definition.Init(userCommand);
4343
}
4444

45-
public void initDefinitionEmpty()
45+
public void InitDefinitionEmpty()
4646
{
47-
Definition.initEmpty();
47+
Definition.InitEmpty();
4848
}
4949

50-
public void initIs()
50+
public void InitIs()
5151
{
5252
if (Definition.NoOffButtons == 1)
5353
{

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SwitchOnPanelDefinition(Viewer viewer)
3737
Viewer = viewer;
3838
}
3939

40-
public void init(UserCommand userCommand)
40+
public void Init(UserCommand userCommand)
4141
{
4242
MSTSLocomotive locomotive = Viewer.PlayerLocomotive as MSTSLocomotive;
4343

@@ -126,7 +126,7 @@ public void init(UserCommand userCommand)
126126
}
127127

128128
// empty button
129-
public void initEmpty()
129+
public void InitEmpty()
130130
{
131131
NoOffButtons = 0;
132132
UserCommand = new UserCommand[] { ORTS.Common.Input.UserCommand.GamePauseMenu };
@@ -312,7 +312,7 @@ public override bool Equals(object obj)
312312
return ((SwitchOnPanelDefinition)obj).Description == Description;
313313
}
314314

315-
public static void deepCopy(SwitchOnPanelDefinition to, SwitchOnPanelDefinition from)
315+
public static void DeepCopy(SwitchOnPanelDefinition to, SwitchOnPanelDefinition from)
316316
{
317317
to.NoOffButtons = from.NoOffButtons;
318318
to.Description = from.Description;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ public override bool Equals(object obj)
563563
((SwitchOnPanelStatus)obj).Blinking == Blinking;
564564
}
565565

566-
public static void deepCopy(SwitchOnPanelStatus to, SwitchOnPanelStatus from)
566+
public static void DeepCopy(SwitchOnPanelStatus to, SwitchOnPanelStatus from)
567567
{
568568
to.Status = from.Status;
569569
to.Color = from.Color;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchPanelModule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ protected override Task OnMessageReceivedAsync(IWebSocketContext context, byte[]
5555
break;
5656
case "buttonDown":
5757
value = int.Parse(switchPanelEvent.Data.ToString());
58-
SwitchesOnPanelStatic.setIsPressed((UserCommand)Enum.ToObject(typeof(UserCommand), value));
58+
SwitchesOnPanelStatic.SetIsPressed((UserCommand)Enum.ToObject(typeof(UserCommand), value));
5959
break;
6060
case "buttonUp":
6161
value = int.Parse(switchPanelEvent.Data.ToString());
62-
SwitchesOnPanelStatic.setIsReleased((UserCommand)Enum.ToObject(typeof(UserCommand), value));
62+
SwitchesOnPanelStatic.SetIsReleased((UserCommand)Enum.ToObject(typeof(UserCommand), value));
6363
break;
6464
}
6565
return Task.CompletedTask;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -44,107 +44,107 @@ public SwitchesOnPanel(Viewer viewer)
4444
}
4545

4646
foreach (SwitchOnPanel switchOnPanel in SwitchesOnPanelArray)
47-
switchOnPanel.initDefinitionEmpty();
47+
switchOnPanel.InitDefinitionEmpty();
4848

4949
foreach (SwitchOnPanel switchOnPanel in SwitchesOnPanelArray)
50-
switchOnPanel.initIs();
50+
switchOnPanel.InitIs();
5151
}
5252

53-
public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
53+
public void SetDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
5454
{
5555
MSTSLocomotive locomotive = Viewer.PlayerLocomotive as MSTSLocomotive;
5656

5757
foreach (SwitchOnPanel switchOnPanel in SwitchesOnPanelArray)
58-
switchOnPanel.initDefinitionEmpty();
58+
switchOnPanel.InitDefinitionEmpty();
5959

6060
switch (locomotive.EngineType)
6161
{
6262
case TrainCar.EngineTypes.Electric:
63-
SwitchesOnPanelArray[0, 0].initDefinition(UserCommand.ControlDoorLeft);
64-
SwitchesOnPanelArray[0, 1].initDefinition(UserCommand.ControlForwards);
65-
SwitchesOnPanelArray[0, 2].initDefinition(UserCommand.ControlLight);
66-
SwitchesOnPanelArray[0, 3].initDefinition(UserCommand.ControlEmergencyPushButton);
67-
SwitchesOnPanelArray[0, 4].initDefinition(UserCommand.ControlAlerter);
68-
SwitchesOnPanelArray[0, 5].initDefinition(UserCommand.ControlSander);
69-
SwitchesOnPanelArray[0, 6].initDefinition(UserCommand.ControlWiper);
70-
SwitchesOnPanelArray[0, 9].initDefinition(UserCommand.ControlDoorRight);
71-
72-
SwitchesOnPanelArray[1, 0].initDefinition(UserCommand.ControlBatterySwitchClose);
73-
SwitchesOnPanelArray[1, 1].initDefinition(UserCommand.ControlMasterKey);
74-
SwitchesOnPanelArray[1, 2].initDefinition(UserCommand.ControlPantograph1);
75-
SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlPantograph2);
76-
SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlCircuitBreakerClosingOrder);
77-
SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
78-
SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
79-
SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
80-
SwitchesOnPanelArray[1, 8].initDefinition(UserCommand.ControlRetainersOn);
63+
SwitchesOnPanelArray[0, 0].InitDefinition(UserCommand.ControlDoorLeft);
64+
SwitchesOnPanelArray[0, 1].InitDefinition(UserCommand.ControlForwards);
65+
SwitchesOnPanelArray[0, 2].InitDefinition(UserCommand.ControlLight);
66+
SwitchesOnPanelArray[0, 3].InitDefinition(UserCommand.ControlEmergencyPushButton);
67+
SwitchesOnPanelArray[0, 4].InitDefinition(UserCommand.ControlAlerter);
68+
SwitchesOnPanelArray[0, 5].InitDefinition(UserCommand.ControlSander);
69+
SwitchesOnPanelArray[0, 6].InitDefinition(UserCommand.ControlWiper);
70+
SwitchesOnPanelArray[0, 9].InitDefinition(UserCommand.ControlDoorRight);
71+
72+
SwitchesOnPanelArray[1, 0].InitDefinition(UserCommand.ControlBatterySwitchClose);
73+
SwitchesOnPanelArray[1, 1].InitDefinition(UserCommand.ControlMasterKey);
74+
SwitchesOnPanelArray[1, 2].InitDefinition(UserCommand.ControlPantograph1);
75+
SwitchesOnPanelArray[1, 3].InitDefinition(UserCommand.ControlPantograph2);
76+
SwitchesOnPanelArray[1, 4].InitDefinition(UserCommand.ControlCircuitBreakerClosingOrder);
77+
SwitchesOnPanelArray[1, 5].InitDefinition(UserCommand.ControlHeadlightIncrease);
78+
SwitchesOnPanelArray[1, 6].InitDefinition(UserCommand.ControlHandbrakeFull);
79+
SwitchesOnPanelArray[1, 7].InitDefinition(UserCommand.ControlBrakeHoseConnect);
80+
SwitchesOnPanelArray[1, 8].InitDefinition(UserCommand.ControlRetainersOn);
8181
break;
8282

8383
case TrainCar.EngineTypes.Diesel:
84-
SwitchesOnPanelArray[0, 0].initDefinition(UserCommand.ControlDoorLeft);
85-
SwitchesOnPanelArray[0, 1].initDefinition(UserCommand.ControlForwards);
86-
SwitchesOnPanelArray[0, 2].initDefinition(UserCommand.ControlGearUp);
87-
SwitchesOnPanelArray[0, 3].initDefinition(UserCommand.ControlLight);
88-
SwitchesOnPanelArray[0, 4].initDefinition(UserCommand.ControlEmergencyPushButton);
89-
SwitchesOnPanelArray[0, 5].initDefinition(UserCommand.ControlAlerter);
90-
SwitchesOnPanelArray[0, 6].initDefinition(UserCommand.ControlSander);
91-
SwitchesOnPanelArray[0, 7].initDefinition(UserCommand.ControlWiper);
92-
SwitchesOnPanelArray[0, 9].initDefinition(UserCommand.ControlDoorRight);
93-
94-
SwitchesOnPanelArray[1, 0].initDefinition(UserCommand.ControlBatterySwitchClose);
95-
SwitchesOnPanelArray[1, 1].initDefinition(UserCommand.ControlMasterKey);
96-
SwitchesOnPanelArray[1, 2].initDefinition(UserCommand.ControlDieselPlayer);
97-
SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlDieselHelper);
98-
SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlTractionCutOffRelayClosingOrder);
99-
SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
100-
SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
101-
SwitchesOnPanelArray[1, 7].initDefinition(UserCommand.ControlBrakeHoseConnect);
102-
SwitchesOnPanelArray[1, 8].initDefinition(UserCommand.ControlRetainersOn);
84+
SwitchesOnPanelArray[0, 0].InitDefinition(UserCommand.ControlDoorLeft);
85+
SwitchesOnPanelArray[0, 1].InitDefinition(UserCommand.ControlForwards);
86+
SwitchesOnPanelArray[0, 2].InitDefinition(UserCommand.ControlGearUp);
87+
SwitchesOnPanelArray[0, 3].InitDefinition(UserCommand.ControlLight);
88+
SwitchesOnPanelArray[0, 4].InitDefinition(UserCommand.ControlEmergencyPushButton);
89+
SwitchesOnPanelArray[0, 5].InitDefinition(UserCommand.ControlAlerter);
90+
SwitchesOnPanelArray[0, 6].InitDefinition(UserCommand.ControlSander);
91+
SwitchesOnPanelArray[0, 7].InitDefinition(UserCommand.ControlWiper);
92+
SwitchesOnPanelArray[0, 9].InitDefinition(UserCommand.ControlDoorRight);
93+
94+
SwitchesOnPanelArray[1, 0].InitDefinition(UserCommand.ControlBatterySwitchClose);
95+
SwitchesOnPanelArray[1, 1].InitDefinition(UserCommand.ControlMasterKey);
96+
SwitchesOnPanelArray[1, 2].InitDefinition(UserCommand.ControlDieselPlayer);
97+
SwitchesOnPanelArray[1, 3].InitDefinition(UserCommand.ControlDieselHelper);
98+
SwitchesOnPanelArray[1, 4].InitDefinition(UserCommand.ControlTractionCutOffRelayClosingOrder);
99+
SwitchesOnPanelArray[1, 5].InitDefinition(UserCommand.ControlHeadlightIncrease);
100+
SwitchesOnPanelArray[1, 6].InitDefinition(UserCommand.ControlHandbrakeFull);
101+
SwitchesOnPanelArray[1, 7].InitDefinition(UserCommand.ControlBrakeHoseConnect);
102+
SwitchesOnPanelArray[1, 8].InitDefinition(UserCommand.ControlRetainersOn);
103103
break;
104104

105105
case TrainCar.EngineTypes.Steam:
106-
SwitchesOnPanelArray[0, 0].initDefinition(UserCommand.ControlDoorLeft);
107-
SwitchesOnPanelArray[0, 1].initDefinition(UserCommand.ControlForwards);
108-
SwitchesOnPanelArray[0, 2].initDefinition(UserCommand.ControlCylinderCocks);
109-
SwitchesOnPanelArray[0, 3].initDefinition(UserCommand.ControlLight);
110-
SwitchesOnPanelArray[0, 4].initDefinition(UserCommand.ControlEmergencyPushButton);
111-
SwitchesOnPanelArray[0, 5].initDefinition(UserCommand.ControlAlerter);
112-
SwitchesOnPanelArray[0, 6].initDefinition(UserCommand.ControlSander);
113-
SwitchesOnPanelArray[0, 7].initDefinition(UserCommand.ControlWiper);
114-
SwitchesOnPanelArray[0, 9].initDefinition(UserCommand.ControlDoorRight);
115-
116-
SwitchesOnPanelArray[1, 0].initDefinition(UserCommand.ControlBatterySwitchClose);
117-
SwitchesOnPanelArray[1, 1].initDefinition(UserCommand.ControlMasterKey);
118-
SwitchesOnPanelArray[1, 2].initDefinition(UserCommand.ControlHeadlightIncrease);
119-
SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlHandbrakeFull);
120-
SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlBrakeHoseConnect);
121-
SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlRetainersOn);
106+
SwitchesOnPanelArray[0, 0].InitDefinition(UserCommand.ControlDoorLeft);
107+
SwitchesOnPanelArray[0, 1].InitDefinition(UserCommand.ControlForwards);
108+
SwitchesOnPanelArray[0, 2].InitDefinition(UserCommand.ControlCylinderCocks);
109+
SwitchesOnPanelArray[0, 3].InitDefinition(UserCommand.ControlLight);
110+
SwitchesOnPanelArray[0, 4].InitDefinition(UserCommand.ControlEmergencyPushButton);
111+
SwitchesOnPanelArray[0, 5].InitDefinition(UserCommand.ControlAlerter);
112+
SwitchesOnPanelArray[0, 6].InitDefinition(UserCommand.ControlSander);
113+
SwitchesOnPanelArray[0, 7].InitDefinition(UserCommand.ControlWiper);
114+
SwitchesOnPanelArray[0, 9].InitDefinition(UserCommand.ControlDoorRight);
115+
116+
SwitchesOnPanelArray[1, 0].InitDefinition(UserCommand.ControlBatterySwitchClose);
117+
SwitchesOnPanelArray[1, 1].InitDefinition(UserCommand.ControlMasterKey);
118+
SwitchesOnPanelArray[1, 2].InitDefinition(UserCommand.ControlHeadlightIncrease);
119+
SwitchesOnPanelArray[1, 3].InitDefinition(UserCommand.ControlHandbrakeFull);
120+
SwitchesOnPanelArray[1, 4].InitDefinition(UserCommand.ControlBrakeHoseConnect);
121+
SwitchesOnPanelArray[1, 5].InitDefinition(UserCommand.ControlRetainersOn);
122122
break;
123123

124124
case TrainCar.EngineTypes.Control:
125125
// currently do not know what to do with this type as I have no example
126-
SwitchesOnPanelArray[0, 0].initDefinition(UserCommand.ControlDoorLeft);
127-
SwitchesOnPanelArray[0, 9].initDefinition(UserCommand.ControlDoorRight);
126+
SwitchesOnPanelArray[0, 0].InitDefinition(UserCommand.ControlDoorLeft);
127+
SwitchesOnPanelArray[0, 9].InitDefinition(UserCommand.ControlDoorRight);
128128
break;
129129
}
130130

131-
SwitchesOnPanelArray[2, 0].initDefinition(UserCommand.GameChangeCab);
132-
SwitchesOnPanelArray[2, 1].initDefinition(UserCommand.GameSwitchManualMode);
133-
SwitchesOnPanelArray[2, 2].initDefinition(UserCommand.GameAutopilotMode);
134-
SwitchesOnPanelArray[2, 3].initDefinition(UserCommand.GameSwitchAhead);
135-
SwitchesOnPanelArray[2, 4].initDefinition(UserCommand.GameSwitchBehind);
136-
SwitchesOnPanelArray[2, 5].initDefinition(UserCommand.GameClearSignalForward);
137-
138-
SwitchesOnPanelArray[3, 0].initDefinition(UserCommand.GameMultiPlayerDispatcher);
139-
SwitchesOnPanelArray[3, 1].initDefinition(UserCommand.DisplayTrackMonitorWindow);
140-
SwitchesOnPanelArray[3, 2].initDefinition(UserCommand.DisplayTrainDrivingWindow);
141-
SwitchesOnPanelArray[3, 3].initDefinition(UserCommand.DisplayNextStationWindow);
142-
SwitchesOnPanelArray[3, 4].initDefinition(UserCommand.DisplaySwitchWindow);
143-
SwitchesOnPanelArray[3, 5].initDefinition(UserCommand.DisplayTrainOperationsWindow);
144-
SwitchesOnPanelArray[3, 6].initDefinition(UserCommand.DisplayTrainDpuWindow);
145-
SwitchesOnPanelArray[3, 7].initDefinition(UserCommand.DisplayTrainListWindow);
146-
SwitchesOnPanelArray[3, 8].initDefinition(UserCommand.DisplayEOTListWindow);
147-
SwitchesOnPanelArray[3, 9].initDefinition(UserCommand.DisplayHUD);
131+
SwitchesOnPanelArray[2, 0].InitDefinition(UserCommand.GameChangeCab);
132+
SwitchesOnPanelArray[2, 1].InitDefinition(UserCommand.GameSwitchManualMode);
133+
SwitchesOnPanelArray[2, 2].InitDefinition(UserCommand.GameAutopilotMode);
134+
SwitchesOnPanelArray[2, 3].InitDefinition(UserCommand.GameSwitchAhead);
135+
SwitchesOnPanelArray[2, 4].InitDefinition(UserCommand.GameSwitchBehind);
136+
SwitchesOnPanelArray[2, 5].InitDefinition(UserCommand.GameClearSignalForward);
137+
138+
SwitchesOnPanelArray[3, 0].InitDefinition(UserCommand.GameMultiPlayerDispatcher);
139+
SwitchesOnPanelArray[3, 1].InitDefinition(UserCommand.DisplayTrackMonitorWindow);
140+
SwitchesOnPanelArray[3, 2].InitDefinition(UserCommand.DisplayTrainDrivingWindow);
141+
SwitchesOnPanelArray[3, 3].InitDefinition(UserCommand.DisplayNextStationWindow);
142+
SwitchesOnPanelArray[3, 4].InitDefinition(UserCommand.DisplaySwitchWindow);
143+
SwitchesOnPanelArray[3, 5].InitDefinition(UserCommand.DisplayTrainOperationsWindow);
144+
SwitchesOnPanelArray[3, 6].InitDefinition(UserCommand.DisplayTrainDpuWindow);
145+
SwitchesOnPanelArray[3, 7].InitDefinition(UserCommand.DisplayTrainListWindow);
146+
SwitchesOnPanelArray[3, 8].InitDefinition(UserCommand.DisplayEOTListWindow);
147+
SwitchesOnPanelArray[3, 9].InitDefinition(UserCommand.DisplayHUD);
148148
}
149149

150150
private enum isTypeOfButtonAction
@@ -153,12 +153,12 @@ private enum isTypeOfButtonAction
153153
isReleased
154154
}
155155

156-
public void setIsPressed(UserCommand userCommand)
156+
public void SetIsPressed(UserCommand userCommand)
157157
{
158158
setIs(userCommand, isTypeOfButtonAction.isPressed);
159159
}
160160

161-
public void setIsReleased(UserCommand userCommand)
161+
public void SetIsReleased(UserCommand userCommand)
162162
{
163163
setIs(userCommand, isTypeOfButtonAction.isReleased);
164164
}
@@ -332,7 +332,7 @@ public bool IsChanged()
332332
{
333333
bool changed = false;
334334

335-
setDefinitions(SwitchesOnPanelArray);
335+
SetDefinitions(SwitchesOnPanelArray);
336336

337337
for (int i = 0; i < Rows; i++)
338338
{
@@ -343,16 +343,16 @@ public bool IsChanged()
343343

344344
if (!switchOnPanel.Definition.Equals(previousSwitchOnPanel.Definition))
345345
{
346-
SwitchOnPanelDefinition.deepCopy(previousSwitchOnPanel.Definition, switchOnPanel.Definition);
346+
SwitchOnPanelDefinition.DeepCopy(previousSwitchOnPanel.Definition, switchOnPanel.Definition);
347347
// initIs just in case the amount of buttons has changed after a cab change
348-
switchOnPanel.initIs();
348+
switchOnPanel.InitIs();
349349
changed = true;
350350
}
351351

352352
SwitchOnPanelStatus.getStatus(switchOnPanel.Definition.UserCommand[0], ref switchOnPanel.Status);
353353
if (!switchOnPanel.Status.Equals(previousSwitchOnPanel.Status))
354354
{
355-
SwitchOnPanelStatus.deepCopy(previousSwitchOnPanel.Status, switchOnPanel.Status);
355+
SwitchOnPanelStatus.DeepCopy(previousSwitchOnPanel.Status, switchOnPanel.Status);
356356
changed = true;
357357
}
358358
}

0 commit comments

Comments
 (0)