Skip to content

Commit abecf95

Browse files
abishekadityaabishekaditya
committed
Refactoring with R#
1 parent 37b915b commit abecf95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+197
-378
lines changed

‎CommandPattern/App.config

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
23
<configuration>
3-
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
5-
</startup>
4+
<startup>
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
6+
</startup>
67
</configuration>

‎CommandPattern/Command.cs

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
interface Command
3+
internal interface ICommand
104
{
115
void Execute();
126
void Undo();
137
}
14-
}
8+
}

‎CommandPattern/CommandPattern.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@
3434
<ItemGroup>
3535
<Reference Include="System" />
3636
<Reference Include="System.Core" />
37-
<Reference Include="System.Xml.Linq" />
38-
<Reference Include="System.Data.DataSetExtensions" />
39-
<Reference Include="Microsoft.CSharp" />
40-
<Reference Include="System.Data" />
41-
<Reference Include="System.Net.Http" />
42-
<Reference Include="System.Xml" />
4337
</ItemGroup>
4438
<ItemGroup>
4539
<Compile Include="Command.cs" />

‎CommandPattern/Garage.cs

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
62

73
namespace CommandPattern
84
{
9-
class Garage
5+
internal class Garage
106
{
11-
private string name;
7+
private readonly string _name;
128

139
public Garage(string name)
1410
{
15-
this.name = name;
11+
this._name = name;
1612
}
13+
1714
internal void Open()
1815
{
19-
Console.WriteLine($"{name} Garage Opened");
16+
Console.WriteLine($"{_name} Garage Opened");
2017
}
2118

2219
internal void Close()
2320
{
24-
Console.WriteLine($"{name} Garage Closed");
21+
Console.WriteLine($"{_name} Garage Closed");
2522
}
26-
2723
}
28-
}
24+
}

‎CommandPattern/GarageDoorCloseCommand.cs

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
class GarageDoorCloseCommand : Command
3+
internal class GarageDoorCloseCommand : ICommand
104
{
11-
Garage garage;
5+
private readonly Garage _garage;
126

137
public GarageDoorCloseCommand(Garage g)
148
{
15-
garage = g;
9+
_garage = g;
1610
}
11+
1712
public void Execute()
1813
{
19-
garage.Close();
14+
_garage.Close();
2015
}
2116

2217
public void Undo()
2318
{
24-
garage.Open();
19+
_garage.Open();
2520
}
2621
}
27-
}
22+
}

‎CommandPattern/GarageDoorOpenCommand.cs

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
class GarageDoorOpenCommand : Command
3+
internal class GarageDoorOpenCommand : ICommand
104
{
11-
Garage garage;
5+
private readonly Garage _garage;
126

137
public GarageDoorOpenCommand(Garage g)
148
{
15-
garage = g;
9+
_garage = g;
1610
}
11+
1712
public void Execute()
1813
{
19-
garage.Open();
14+
_garage.Open();
2015
}
2116

2217
public void Undo()
2318
{
24-
garage.Close();
19+
_garage.Close();
2520
}
2621
}
27-
}
22+
}

‎CommandPattern/Light.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ namespace CommandPattern
44
{
55
public class Light
66
{
7-
private string name;
7+
private readonly string _name;
88

99
public Light(string name)
1010
{
11-
this.name = name;
11+
this._name = name;
1212
}
1313

1414
internal void On()
1515
{
16-
Console.WriteLine($"{name} Light On");
16+
Console.WriteLine($"{_name} Light On");
1717
}
1818

1919
internal void Off()
2020
{
21-
Console.WriteLine($"{name} Light Off");
21+
Console.WriteLine($"{_name} Light Off");
2222
}
2323
}
2424
}

‎CommandPattern/LightOffCommand.cs

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
class LightOffCommand : Command
3+
internal class LightOffCommand : ICommand
104
{
11-
Light light;
5+
private readonly Light _light;
126

137
public LightOffCommand(Light l)
148
{
15-
light = l;
9+
_light = l;
1610
}
1711

1812
public void Execute()
1913
{
20-
light.Off();
14+
_light.Off();
2115
}
2216

2317
public void Undo()
2418
{
25-
light.On();
19+
_light.On();
2620
}
2721
}
28-
}
22+
}

‎CommandPattern/LightOnCommand.cs

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
class LightOnCommand : Command
3+
internal class LightOnCommand : ICommand
104
{
11-
Light light;
5+
private readonly Light _light;
126

137
public LightOnCommand(Light l)
148
{
15-
light = l;
9+
_light = l;
1610
}
1711

1812
public void Execute()
1913
{
20-
light.On();
14+
_light.On();
2115
}
2216

2317
public void Undo()
2418
{
25-
light.Off();
19+
_light.Off();
2620
}
2721
}
28-
}
22+
}

‎CommandPattern/MacroCommand.cs

+8-18
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
class MacroCommand : Command
3+
internal class MacroCommand : ICommand
104
{
11-
Command[] commands;
5+
private readonly ICommand[] _commands;
126

13-
public MacroCommand(Command[] commands)
7+
public MacroCommand(ICommand[] commands)
148
{
15-
this.commands = commands;
9+
_commands = commands;
1610
}
1711

1812
public void Execute()
1913
{
20-
foreach (var item in commands)
21-
{
14+
foreach (var item in _commands)
2215
item.Execute();
23-
}
2416
}
2517

2618
public void Undo()
2719
{
28-
foreach (var item in commands)
29-
{
20+
foreach (var item in _commands)
3021
item.Undo();
31-
}
3222
}
3323
}
34-
}
24+
}

‎CommandPattern/NoCommand.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
namespace CommandPattern
44
{
5-
internal class NoCommand : Command
5+
internal class NoCommand : ICommand
66
{
7-
public NoCommand()
8-
{
9-
}
10-
117
public void Execute()
128
{
139
Console.WriteLine("No Command Assigned");

‎CommandPattern/OnOffStruct.cs

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace CommandPattern
1+
namespace CommandPattern
82
{
9-
struct OnOffStruct
3+
internal struct OnOffStruct
104
{
11-
public Command On;
12-
public Command Off;
5+
public ICommand On;
6+
public ICommand Off;
137
}
14-
}
8+
}

‎CommandPattern/Program.cs

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
62

73
namespace CommandPattern
84
{
9-
class Program
5+
internal class Program
106
{
11-
static void Main(string[] args)
7+
private static void Main()
128
{
139
var remote = new RemoteControl(3);
1410

@@ -21,11 +17,13 @@ static void Main(string[] args)
2117
var carDoorClose = new GarageDoorCloseCommand(car);
2218
var carDoorOpen = new GarageDoorOpenCommand(car);
2319

24-
var garage_button = new OnOffStruct();
25-
garage_button.On = bikeDoorOpen;
26-
garage_button.Off = bikeDoorClose;
20+
var garageButton = new OnOffStruct
21+
{
22+
On = bikeDoorOpen,
23+
Off = bikeDoorClose
24+
};
2725

28-
remote[0] = garage_button;
26+
remote[0] = garageButton;
2927
remote.PushOn(0);
3028
remote.PushUndo();
3129
remote.PushUndo();
@@ -35,21 +33,22 @@ static void Main(string[] args)
3533
Console.WriteLine();
3634
var light = new Light("Hall");
3735

38-
Command[] partyOn = { new LightOffCommand(light) , bikeDoorOpen , carDoorOpen };
39-
Command[] partyOff = { new LightOnCommand(light), bikeDoorClose, carDoorClose };
36+
ICommand[] partyOn = {new LightOffCommand(light), bikeDoorOpen, carDoorOpen};
37+
ICommand[] partyOff = {new LightOnCommand(light), bikeDoorClose, carDoorClose};
4038

4139

42-
remote[2] = new OnOffStruct { On = new MacroCommand(partyOn), Off = new MacroCommand(partyOff) };
40+
remote[2] = new OnOffStruct {On = new MacroCommand(partyOn), Off = new MacroCommand(partyOff)};
4341

4442
try
4543
{
4644
remote.PushOn(2);
4745
Console.WriteLine();
4846
remote.PushOff(2);
49-
} catch (Exception)
47+
}
48+
catch (Exception)
5049
{
5150
Console.WriteLine("Oops");
5251
}
5352
}
5453
}
55-
}
54+
}

0 commit comments

Comments
 (0)