updates for 2nd ed

bethrobson · Aug 21, 2020 · 8bac880 · 8bac880
1 parent 0162a60
commit 8bac880
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/src/headfirst/designpatterns/factory/pizzas/Pizza.java b/src/headfirst/designpatterns/factory/pizzas/Pizza.java
@@ -1,12 +1,12 @@
 package headfirst.designpatterns.factory.pizzas;
 
-import java.util.ArrayList;
+import java.util.*;
 
 abstract public class Pizza {
 	String name;
 	String dough;
 	String sauce;
-	ArrayList<String> toppings = new ArrayList<String>();
+	List<String> toppings = new ArrayList<String>();
 
 	public String getName() {
 		return name;

diff --git a/src/headfirst/designpatterns/observer/simple/Example.java b/src/headfirst/designpatterns/observer/simple/Example.java
@@ -8,5 +8,7 @@ public static void main(String[] args) {
 		SimpleObserver simpleObserver = new SimpleObserver(simpleSubject);
 
 		simpleSubject.setValue(80);
+
+		simpleSubject.removeObserver(simpleObserver);
 	}
 }
diff --git a/src/headfirst/designpatterns/observer/simple/SimpleSubject.java b/src/headfirst/designpatterns/observer/simple/SimpleSubject.java
@@ -15,10 +15,7 @@ public void registerObserver(Observer o) {
 	}
 
 	public void removeObserver(Observer o) {
-		int i = observers.indexOf(o);
-		if (i >= 0) {
-			observers.remove(i);
-		}
+		observers.remove(o);
 	}
 
 	public void notifyObservers() {

diff --git a/src/headfirst/designpatterns/observer/weather/WeatherData.java b/src/headfirst/designpatterns/observer/weather/WeatherData.java
@@ -17,10 +17,7 @@ public void registerObserver(Observer o) {
 	}
 
 	public void removeObserver(Observer o) {
-		int i = observers.indexOf(o);
-		if (i >= 0) {
-			observers.remove(i);
-		}
+		observers.remove(o);
 	}
 
 	public void notifyObservers() {

diff --git a/src/headfirst/designpatterns/observer/weather/WeatherStation.java b/src/headfirst/designpatterns/observer/weather/WeatherStation.java
@@ -13,5 +13,8 @@ public static void main(String[] args) {
 		weatherData.setMeasurements(80, 65, 30.4f);
 		weatherData.setMeasurements(82, 70, 29.2f);
 		weatherData.setMeasurements(78, 90, 29.2f);
+
+		weatherData.removeObserver(forecastDisplay);
+		weatherData.setMeasurements(62, 90, 28.1f);
 	}
 }
diff --git a/src/headfirst/designpatterns/proxy/virtualproxy/ImageProxy.java b/src/headfirst/designpatterns/proxy/virtualproxy/ImageProxy.java
@@ -39,7 +39,7 @@ public void paintIcon(final Component c, Graphics  g, int x,  int y) {
 			g.drawString("Loading album cover, please wait...", x+300, y+190);
 			if (!retrieving) {
 				retrieving = true;
-				/*
+
 				retrievalThread = new Thread(new Runnable() {
 					public void run() {
 						try {
@@ -50,7 +50,7 @@ public void run() {
 						}
 					}
 				});
-				*/
+
 				retrievalThread = new Thread(() -> {
 						try {
 							setImageIcon(new ImageIcon(imageURL, "Album Cover"));
@@ -60,7 +60,7 @@ public void run() {
 						}
 				});
 				retrievalThread.start();
-
+				
 			}
 		}
 	}