下班前的一次提交，同步

boolean-dev · boolean-dev · commit 4db0063590ed · 2018-11-05T17:34:22.000+08:00
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ch2-observer/.gitignore b/ch2-observer/.gitignore
@@ -22,4 +22,5 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+.idea/
diff --git a/ch2-observer/src/main/java/com/tao/ch2observer/weather/CurrentDisplay.java b/ch2-observer/src/main/java/com/tao/ch2observer/weather/CurrentDisplay.java
@@ -7,7 +7,7 @@ public void display() {
     }
 
     @Override
-    public void update() {
+    public void update(float temperature, float humidity, float pressure) {
 
     }
 }
diff --git a/ch2-observer/src/main/java/com/tao/ch2observer/weather/ForecastDisplay.java b/ch2-observer/src/main/java/com/tao/ch2observer/weather/ForecastDisplay.java
@@ -7,7 +7,7 @@ public void display() {
     }
 
     @Override
-    public void update() {
+    public void update(float temperature, float humidity, float pressure) {
 
     }
 }
diff --git a/ch2-observer/src/main/java/com/tao/ch2observer/weather/Oberver.java b/ch2-observer/src/main/java/com/tao/ch2observer/weather/Oberver.java
@@ -2,5 +2,5 @@
 
 public interface Oberver {
 
-    void update();
+    void update(float temperature, float humidity, float pressure);
 }
diff --git a/ch2-observer/src/main/java/com/tao/ch2observer/weather/StatisDisplay.java b/ch2-observer/src/main/java/com/tao/ch2observer/weather/StatisDisplay.java
@@ -7,7 +7,7 @@ public void display() {
     }
 
     @Override
-    public void update() {
+    public void update(float temperature, float humidity, float pressure) {
 
     }
 }
diff --git a/ch2-observer/src/main/java/com/tao/ch2observer/weather/WeatherData.java b/ch2-observer/src/main/java/com/tao/ch2observer/weather/WeatherData.java
@@ -2,28 +2,39 @@
 
 import org.omg.CORBA.Object;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class WeatherData implements Subject {
 
     private List<Oberver> oberverList;
     private float temperature;
     private float humidity;
-    private  float pressure;
+    private float pressure;
 
+    public WeatherData() {
+        this.oberverList = new ArrayList<>();
+    }
 
     @Override
     public void addObserver(Oberver oberver) {
+        oberverList.add(oberver);
 
     }
 
     @Override
     public void deleteObserver(Oberver oberver) {
+        int index = oberverList.indexOf(oberver);
+        if (index > 0 ) {
+            oberverList.remove(index);
+        }
 
     }
 
     @Override
     public void notifyObservers() {
-
+        for (Oberver oberver : oberverList) {
+            oberver.update(temperature, humidity, pressure);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public void display() {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`@Override`
`10`		`- public void update() {`
	`10`	`+ public void update(float temperature, float humidity, float pressure) {`
`11`	`11`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`public interface Oberver {`
`4`	`4`
`5`		`- void update();`
	`5`	`+ void update(float temperature, float humidity, float pressure);`
`6`	`6`	`}`