updates

vogella · vogella · commit 7c465d359460 · 2012-11-27T23:53:55.000+01:00
diff --git a/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/Main.java b/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/Main.java
@@ -7,13 +7,14 @@ public class Main {
 
   public static void main(String[] args) {
     MyModel model = new MyModel();
+    MyObserver observer = new MyObserver(model);
     // We change the last name of the person, observer will get notified
     for (Person person : model.getPersons()) {
-    	person.setLastName(person.getLastName() + "new");
+    	person.setLastName(person.getLastName() + "1");
 	}
-    // We change the first name of the person, observer will get notified
+    // We change the  name of the person, observer will get notified
     for (Person person : model.getPersons()) {
-    	person.setLastName(person.getFirstName() + "new");
+    	person.setFirstName(person.getFirstName() + "1");
 	}
   }
 } 
diff --git a/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/MyModel.java b/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/MyModel.java
@@ -1,8 +1,8 @@
 package com.vogella.java.designpattern.observer;
 
+import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 public class MyModel {
@@ -27,17 +27,16 @@ public String getFirstName() {
 		}
 
 		public void setFirstName(String firstName) {
-			this.firstName = firstName;
-			notifyListeners();
+			notifyListeners(this, "firstName", firstName, this.firstName = firstName);
+			
 		}
 
 		public String getLastName() {
 			return lastName;
 		}
 
 		public void setLastName(String lastName) {
-			this.lastName = lastName;
-			notifyListeners();
+			notifyListeners(this, "lastName", lastName, this.lastName = lastName);
 		}
 	}
 
@@ -51,9 +50,9 @@ public MyModel() {
 		persons.add(new Person("Jim", "Knopf"));
 	}
 
-	private void notifyListeners() {
+	private void notifyListeners(Object object, String property, String oldValue, String newValue) {
 		for (PropertyChangeListener name : listener) {
-			name.propertyChange(null);
+			name.propertyChange(new PropertyChangeEvent(this, "firstName", oldValue, newValue));
 		}
 	}
 
diff --git a/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/MyObserver.java b/com.vogella.java.designpattern.observer/src/com/vogella/java/designpattern/observer/MyObserver.java
@@ -4,12 +4,13 @@
 import java.beans.PropertyChangeListener;
 
 public class MyObserver implements PropertyChangeListener {
-  public MyObserver(MyModel model) {
-    model.addChangeListener(this);
-  }
+	public MyObserver(MyModel model) {
+		model.addChangeListener(this);
+	}
 
-  @Override
-  public void propertyChange(PropertyChangeEvent arg0) {
-    System.out.println("Things are changing...");
-  }
-} 
+	@Override
+	public void propertyChange(PropertyChangeEvent event) {
+		System.out.println("Changed property: " + event.getPropertyName() + " old:"
+				+ event.getOldValue() + " new: " + event.getNewValue());
+	}
+}
diff --git a/de.vogella.junit.first/test/de/vogella/junit/first/MyClassTest.java b/de.vogella.junit.first/test/de/vogella/junit/first/MyClassTest.java
@@ -2,10 +2,23 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class MyClassTest {
 
+
+	@BeforeClass 
+	public static void testSetup(){
+		// Preparation of the unit tests
+	}
+	
+	@AfterClass 
+	public static void testCleanup(){
+		// Teardown for data used by the unit tests
+	}
+	
 	@Test(expected = IllegalArgumentException.class)
 	public void testMultiply() {
 		MyClass tester = new MyClass();

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,14 @@ public class Main {`
`7`	`7`
`8`	`8`	`public static void main(String[] args) {`
`9`	`9`	`MyModel model = new MyModel();`
	`10`	`+ MyObserver observer = new MyObserver(model);`
`10`	`11`	`// We change the last name of the person, observer will get notified`
`11`	`12`	`for (Person person : model.getPersons()) {`
`12`		`- person.setLastName(person.getLastName() + "new");`
	`13`	`+ person.setLastName(person.getLastName() + "1");`
`13`	`14`	`}`
`14`		`- // We change the first name of the person, observer will get notified`
	`15`	`+ // We change the name of the person, observer will get notified`
`15`	`16`	`for (Person person : model.getPersons()) {`
`16`		`- person.setLastName(person.getFirstName() + "new");`
	`17`	`+ person.setFirstName(person.getFirstName() + "1");`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.vogella.java.designpattern.observer;`
`2`	`2`
	`3`	`+import java.beans.PropertyChangeEvent;`
`3`	`4`	`import java.beans.PropertyChangeListener;`
`4`	`5`	`import java.util.ArrayList;`
`5`		`-import java.util.Iterator;`
`6`	`6`	`import java.util.List;`
`7`	`7`
`8`	`8`	`public class MyModel {`
`@@ -27,17 +27,16 @@ public String getFirstName() {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public void setFirstName(String firstName) {`
`30`		`- this.firstName = firstName;`
`31`		`- notifyListeners();`
	`30`	`+ notifyListeners(this, "firstName", firstName, this.firstName = firstName);`
	`31`	`+`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public String getLastName() {`
`35`	`35`	`return lastName;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public void setLastName(String lastName) {`
`39`		`- this.lastName = lastName;`
`40`		`- notifyListeners();`
	`39`	`+ notifyListeners(this, "lastName", lastName, this.lastName = lastName);`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`
`@@ -51,9 +50,9 @@ public MyModel() {`
`51`	`50`	`persons.add(new Person("Jim", "Knopf"));`
`52`	`51`	`}`
`53`	`52`
`54`		`- private void notifyListeners() {`
	`53`	`+ private void notifyListeners(Object object, String property, String oldValue, String newValue) {`
`55`	`54`	`for (PropertyChangeListener name : listener) {`
`56`		`- name.propertyChange(null);`
	`55`	`+ name.propertyChange(new PropertyChangeEvent(this, "firstName", oldValue, newValue));`
`57`	`56`	`}`
`58`	`57`	`}`
`59`	`58`