Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java	(revision 10208)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java	(revision 10210)
@@ -6,6 +6,6 @@
 import static org.junit.Assert.assertTrue;
 
-import java.util.Observable;
-import java.util.Observer;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.junit.Before;
@@ -24,9 +24,9 @@
 public class PropertiesMergeModelTest {
 
-    private abstract static class TestObserver implements Observer {
+    private abstract static class TestChangeListener implements ChangeListener {
         public int numInvocations;
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             numInvocations++;
             doTest();
@@ -113,7 +113,7 @@
         // decide KEEP_MINE  and ensure notification via Observable
         //
-        TestObserver observerTest;
-        model.addObserver(
-                observerTest = new TestObserver() {
+        TestChangeListener observerTest;
+        model.addChangeListener(
+                observerTest = new TestChangeListener() {
                     @Override
                     public void doTest() {
@@ -128,7 +128,7 @@
         // decide KEEP_THEIR and  ensure notification via Observable
         //
-        model.deleteObserver(observerTest);
-        model.addObserver(
-                observerTest = new TestObserver() {
+        model.removeChangeListener(observerTest);
+        model.addChangeListener(
+                observerTest = new TestChangeListener() {
                     @Override
                     public void doTest() {
@@ -140,5 +140,5 @@
         assertTrue(model.isCoordMergeDecision(MergeDecisionType.KEEP_THEIR));
         observerTest.assertNumInvocations(1);
-        model.deleteObserver(observerTest);
+        model.removeChangeListener(observerTest);
     }
 }