Skip to content

Commit 7d3483d

Browse files
iluwatariluwatar
committed
Merge pull request iluwatar#280 from ankurkaushal/master
Reformat Code According to Google Style Guide iluwatar#224
2 parents 3dc9b2f + 44b7b94 commit 7d3483d

File tree

12 files changed

+170
-174
lines changed

12 files changed

+170
-174
lines changed

‎observer/src/main/java/com/iluwatar/observer/App.java

+31-32
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,44 @@
66

77
/**
88
*
9-
* The Observer pattern is a software design pattern in which an object, called
10-
* the subject, maintains a list of its dependents, called observers, and notifies
11-
* them automatically of any state changes, usually by calling one of their methods.
12-
* It is mainly used to implement distributed event handling systems. The Observer
13-
* pattern is also a key part in the familiar model–view–controller (MVC) architectural
14-
* pattern. The Observer pattern is implemented in numerous programming libraries and
15-
* systems, including almost all GUI toolkits.
9+
* The Observer pattern is a software design pattern in which an object, called the subject,
10+
* maintains a list of its dependents, called observers, and notifies them automatically of any
11+
* state changes, usually by calling one of their methods. It is mainly used to implement
12+
* distributed event handling systems. The Observer pattern is also a key part in the familiar
13+
* model–view–controller (MVC) architectural pattern. The Observer pattern is implemented in
14+
* numerous programming libraries and systems, including almost all GUI toolkits.
1615
* <p>
17-
* In this example {@link Weather} has a state that can be observed. The {@link Orcs}
18-
* and {@link Hobbits} register as observers and receive notifications when the
19-
* {@link Weather} changes.
16+
* In this example {@link Weather} has a state that can be observed. The {@link Orcs} and
17+
* {@link Hobbits} register as observers and receive notifications when the {@link Weather} changes.
2018
*
2119
*/
2220
public class App {
2321

24-
/**
25-
* Program entry point
26-
* @param args command line args
27-
*/
28-
public static void main(String[] args) {
22+
/**
23+
* Program entry point
24+
*
25+
* @param args command line args
26+
*/
27+
public static void main(String[] args) {
2928

30-
Weather weather = new Weather();
31-
weather.addObserver(new Orcs());
32-
weather.addObserver(new Hobbits());
29+
Weather weather = new Weather();
30+
weather.addObserver(new Orcs());
31+
weather.addObserver(new Hobbits());
3332

34-
weather.timePasses();
35-
weather.timePasses();
36-
weather.timePasses();
37-
weather.timePasses();
33+
weather.timePasses();
34+
weather.timePasses();
35+
weather.timePasses();
36+
weather.timePasses();
3837

39-
// Generic observer inspired by Java Generics and Collection by Naftalin & Wadler
40-
System.out.println("\n--Running generic version--");
41-
GWeather gWeather = new GWeather();
42-
gWeather.addObserver(new GOrcs());
43-
gWeather.addObserver(new GHobbits());
38+
// Generic observer inspired by Java Generics and Collection by Naftalin & Wadler
39+
System.out.println("\n--Running generic version--");
40+
GWeather gWeather = new GWeather();
41+
gWeather.addObserver(new GOrcs());
42+
gWeather.addObserver(new GHobbits());
4443

45-
gWeather.timePasses();
46-
gWeather.timePasses();
47-
gWeather.timePasses();
48-
gWeather.timePasses();
49-
}
44+
gWeather.timePasses();
45+
gWeather.timePasses();
46+
gWeather.timePasses();
47+
gWeather.timePasses();
48+
}
5049
}

‎observer/src/main/java/com/iluwatar/observer/Hobbits.java

+19-20
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@
77
*/
88
public class Hobbits implements WeatherObserver {
99

10-
@Override
11-
public void update(WeatherType currentWeather) {
12-
switch (currentWeather) {
13-
case COLD:
14-
System.out.println("The hobbits are shivering in the cold weather.");
15-
break;
16-
case RAINY:
17-
System.out.println("The hobbits look for cover from the rain.");
18-
break;
19-
case SUNNY:
20-
System.out.println("The happy hobbits bade in the warm sun.");
21-
break;
22-
case WINDY:
23-
System.out.println("The hobbits hold their hats tightly in the windy weather.");
24-
break;
25-
default:
26-
break;
27-
}
28-
}
29-
10+
@Override
11+
public void update(WeatherType currentWeather) {
12+
switch (currentWeather) {
13+
case COLD:
14+
System.out.println("The hobbits are shivering in the cold weather.");
15+
break;
16+
case RAINY:
17+
System.out.println("The hobbits look for cover from the rain.");
18+
break;
19+
case SUNNY:
20+
System.out.println("The happy hobbits bade in the warm sun.");
21+
break;
22+
case WINDY:
23+
System.out.println("The hobbits hold their hats tightly in the windy weather.");
24+
break;
25+
default:
26+
break;
27+
}
28+
}
3029
}

‎observer/src/main/java/com/iluwatar/observer/Orcs.java

+19-20
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@
77
*/
88
public class Orcs implements WeatherObserver {
99

10-
@Override
11-
public void update(WeatherType currentWeather) {
12-
switch (currentWeather) {
13-
case COLD:
14-
System.out.println("The orcs are freezing cold.");
15-
break;
16-
case RAINY:
17-
System.out.println("The orcs are dripping wet.");
18-
break;
19-
case SUNNY:
20-
System.out.println("The sun hurts the orcs' eyes.");
21-
break;
22-
case WINDY:
23-
System.out.println("The orc smell almost vanishes in the wind.");
24-
break;
25-
default:
26-
break;
27-
}
28-
}
29-
10+
@Override
11+
public void update(WeatherType currentWeather) {
12+
switch (currentWeather) {
13+
case COLD:
14+
System.out.println("The orcs are freezing cold.");
15+
break;
16+
case RAINY:
17+
System.out.println("The orcs are dripping wet.");
18+
break;
19+
case SUNNY:
20+
System.out.println("The sun hurts the orcs' eyes.");
21+
break;
22+
case WINDY:
23+
System.out.println("The orc smell almost vanishes in the wind.");
24+
break;
25+
default:
26+
break;
27+
}
28+
}
3029
}

‎observer/src/main/java/com/iluwatar/observer/Weather.java

+30-30
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,38 @@
55

66
/**
77
*
8-
* Weather can be observed by implementing {@link WeatherObserver} interface and
9-
* registering as listener.
8+
* Weather can be observed by implementing {@link WeatherObserver} interface and registering as
9+
* listener.
1010
*
1111
*/
1212
public class Weather {
1313

14-
private WeatherType currentWeather;
15-
private List<WeatherObserver> observers;
16-
17-
public Weather() {
18-
observers = new ArrayList<>();
19-
currentWeather = WeatherType.SUNNY;
20-
}
21-
22-
public void addObserver(WeatherObserver obs) {
23-
observers.add(obs);
24-
}
25-
26-
public void removeObserver(WeatherObserver obs) {
27-
observers.remove(obs);
28-
}
29-
30-
public void timePasses() {
31-
WeatherType[] enumValues = WeatherType.values();
32-
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
33-
System.out.println("The weather changed to " + currentWeather + ".");
34-
notifyObservers();
35-
}
36-
37-
private void notifyObservers() {
38-
for (WeatherObserver obs : observers) {
39-
obs.update(currentWeather);
40-
}
41-
}
14+
private WeatherType currentWeather;
15+
private List<WeatherObserver> observers;
16+
17+
public Weather() {
18+
observers = new ArrayList<>();
19+
currentWeather = WeatherType.SUNNY;
20+
}
21+
22+
public void addObserver(WeatherObserver obs) {
23+
observers.add(obs);
24+
}
25+
26+
public void removeObserver(WeatherObserver obs) {
27+
observers.remove(obs);
28+
}
29+
30+
public void timePasses() {
31+
WeatherType[] enumValues = WeatherType.values();
32+
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
33+
System.out.println("The weather changed to " + currentWeather + ".");
34+
notifyObservers();
35+
}
36+
37+
private void notifyObservers() {
38+
for (WeatherObserver obs : observers) {
39+
obs.update(currentWeather);
40+
}
41+
}
4242
}

‎observer/src/main/java/com/iluwatar/observer/WeatherObserver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
*/
88
public interface WeatherObserver {
99

10-
void update(WeatherType currentWeather);
10+
void update(WeatherType currentWeather);
1111

1212
}

‎observer/src/main/java/com/iluwatar/observer/WeatherType.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
*/
88
public enum WeatherType {
99

10-
SUNNY, RAINY, WINDY, COLD;
11-
12-
@Override
13-
public String toString() {
14-
return this.name().toLowerCase();
15-
}
10+
SUNNY, RAINY, WINDY, COLD;
1611

12+
@Override
13+
public String toString() {
14+
return this.name().toLowerCase();
15+
}
1716
}

‎observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
*
99
*/
1010
public class GHobbits implements Race {
11-
@Override
12-
public void update(GWeather weather, WeatherType weatherType) {
13-
switch (weatherType) {
14-
case COLD:
15-
System.out.println("The hobbits are shivering in the cold weather.");
16-
break;
17-
case RAINY:
18-
System.out.println("The hobbits look for cover from the rain.");
19-
break;
20-
case SUNNY:
21-
System.out.println("The happy hobbits bade in the warm sun.");
22-
break;
23-
case WINDY:
24-
System.out.println("The hobbits hold their hats tightly in the windy weather.");
25-
break;
26-
default:
27-
break;
28-
}
11+
@Override
12+
public void update(GWeather weather, WeatherType weatherType) {
13+
switch (weatherType) {
14+
case COLD:
15+
System.out.println("The hobbits are shivering in the cold weather.");
16+
break;
17+
case RAINY:
18+
System.out.println("The hobbits look for cover from the rain.");
19+
break;
20+
case SUNNY:
21+
System.out.println("The happy hobbits bade in the warm sun.");
22+
break;
23+
case WINDY:
24+
System.out.println("The hobbits hold their hats tightly in the windy weather.");
25+
break;
26+
default:
27+
break;
2928
}
29+
}
3030
}

‎observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java

+19-19
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
*
99
*/
1010
public class GOrcs implements Race {
11-
12-
@Override
13-
public void update(GWeather weather, WeatherType weatherType) {
14-
switch (weatherType) {
15-
case COLD:
16-
System.out.println("The orcs are freezing cold.");
17-
break;
18-
case RAINY:
19-
System.out.println("The orcs are dripping wet.");
20-
break;
21-
case SUNNY:
22-
System.out.println("The sun hurts the orcs' eyes.");
23-
break;
24-
case WINDY:
25-
System.out.println("The orc smell almost vanishes in the wind.");
26-
break;
27-
default:
28-
break;
29-
}
11+
12+
@Override
13+
public void update(GWeather weather, WeatherType weatherType) {
14+
switch (weatherType) {
15+
case COLD:
16+
System.out.println("The orcs are freezing cold.");
17+
break;
18+
case RAINY:
19+
System.out.println("The orcs are dripping wet.");
20+
break;
21+
case SUNNY:
22+
System.out.println("The sun hurts the orcs' eyes.");
23+
break;
24+
case WINDY:
25+
System.out.println("The orc smell almost vanishes in the wind.");
26+
break;
27+
default:
28+
break;
3029
}
30+
}
3131
}

‎observer/src/main/java/com/iluwatar/observer/generic/GWeather.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
*/
1010
public class GWeather extends Observable<GWeather, Race, WeatherType> {
1111

12-
private WeatherType currentWeather;
12+
private WeatherType currentWeather;
1313

14-
public GWeather() {
15-
currentWeather = WeatherType.SUNNY;
16-
}
14+
public GWeather() {
15+
currentWeather = WeatherType.SUNNY;
16+
}
1717

18-
public void timePasses() {
19-
WeatherType[] enumValues = WeatherType.values();
20-
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
21-
System.out.println("The weather changed to " + currentWeather + ".");
22-
notifyObservers(currentWeather);
23-
}
18+
public void timePasses() {
19+
WeatherType[] enumValues = WeatherType.values();
20+
currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
21+
System.out.println("The weather changed to " + currentWeather + ".");
22+
notifyObservers(currentWeather);
23+
}
2424
}

0 commit comments

Comments
 (0)