Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 7087)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 7088)
@@ -25,5 +25,5 @@
 public class PropertiesMergeModelTest {
 
-    static public class ObserverTest implements Observer {
+    public static abstract class TestObserver implements Observer {
         public int numInvocations;
 
@@ -33,6 +33,5 @@
         }
 
-        public void test() {
-        }
+        public abstract void test();
 
         public void assertNumInvocations(int count) {
@@ -112,7 +111,7 @@
         // decide KEEP_MINE  and ensure notification via Observable
         //
-        ObserverTest observerTest;
+        TestObserver observerTest;
         model.addObserver(
-                observerTest = new ObserverTest() {
+                observerTest = new TestObserver() {
                     @Override
                     public void test() {
@@ -129,5 +128,5 @@
         model.deleteObserver(observerTest);
         model.addObserver(
-                observerTest = new ObserverTest() {
+                observerTest = new TestObserver() {
                     @Override
                     public void test() {