Merge pull request iluwatar#10 from mafagafogigante/mafagafo-observer

Changes to the observer pattern
david120911 · Oct 21, 2014 · 9b1c698 · 9b1c698
2 parents 6faa8df + 5109c8f
commit 9b1c698
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/observer/etc/observer.jpg b/observer/etc/observer.jpg
diff --git a/observer/src/main/java/com/iluwatar/Hobbits.java b/observer/src/main/java/com/iluwatar/Hobbits.java
@@ -6,8 +6,7 @@ public class Hobbits implements WeatherObserver {
 	public void update(WeatherType currentWeather) {
 		switch (currentWeather) {
 		case COLD:
-			System.out
-					.println("The hobbits are shivering in the cold weather.");
+			System.out.println("The hobbits are shivering in the cold weather.");
 			break;
 		case RAINY:
 			System.out.println("The hobbits look for cover from the rain.");
@@ -16,8 +15,7 @@ public void update(WeatherType currentWeather) {
 			System.out.println("The happy hobbits bade in the warm sun.");
 			break;
 		case WINDY:
-			System.out
-					.println("The hobbits hold their hats tightly in the windy weather.");
+			System.out.println("The hobbits hold their hats tightly in the windy weather.");
 			break;
 		default:
 			break;

diff --git a/observer/src/main/java/com/iluwatar/Weather.java b/observer/src/main/java/com/iluwatar/Weather.java
@@ -28,23 +28,9 @@ public void removeObserver(WeatherObserver obs) {
 	}
 
 	public void timePasses() {
-		switch (currentWeather) {
-		case COLD:
-			currentWeather = WeatherType.SUNNY;
-			break;
-		case RAINY:
-			currentWeather = WeatherType.WINDY;
-			break;
-		case SUNNY:
-			currentWeather = WeatherType.RAINY;
-			break;
-		case WINDY:
-			currentWeather = WeatherType.COLD;
-			break;
-		default:
-			break;
-		}
-		System.out.println("The weather now changes to " + currentWeather);
+		WeatherType[] enumValues = WeatherType.values();
+		currentWeather = enumValues[(currentWeather.ordinal() + 1) % enumValues.length];
+		System.out.println("The weather changed to " + currentWeather + ".");
 		notifyObservers();
 	}
 

diff --git a/observer/src/main/java/com/iluwatar/WeatherType.java b/observer/src/main/java/com/iluwatar/WeatherType.java
@@ -4,8 +4,9 @@ public enum WeatherType {
 
 	SUNNY, RAINY, WINDY, COLD;
 
+	@Override
 	public String toString() {
 		return this.name().toLowerCase();
-	};
+	}
 
 }