Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 8879)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 8880)
@@ -118,5 +118,6 @@
     @Override
     public String toString() {
-        return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId() + " => " + decision;
+        return originalPrimitive.getPrimitiveId() + " at index " + pos + " with role " + role + " in " + relation.getUniqueId()
+            + " => " + decision;
     }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8879)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java	(revision 8880)
@@ -320,5 +320,5 @@
         @Override
         protected boolean matches(Environment env) {
-            for (Map.Entry<String,String> kv: env.osm.getKeys().entrySet()) {
+            for (Map.Entry<String, String> kv: env.osm.getKeys().entrySet()) {
                 if (keyPattern.matcher(kv.getKey()).find() && pattern.matcher(kv.getValue()).find()) {
                     return true;
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModelTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModelTest.java	(revision 8879)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModelTest.java	(revision 8880)
@@ -1,7 +1,7 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.tags;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -16,5 +16,4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -23,4 +22,7 @@
 public class RelationMemberConflictResolverModelTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
@@ -62,9 +64,9 @@
         model.prepareDefaultRelationDecisions();
         assertTrue(model.isResolvedCompletely());
-        assertThat(model.getDecision(0).getDecision(), is(RelationMemberConflictDecisionType.KEEP));
-        assertThat(model.getDecision(0).getOriginalPrimitive(), is((OsmPrimitive) ways.get(0)));
-        assertThat(model.getDecision(0).getRole(), is("foo"));
-        assertThat(model.getDecision(1).getDecision(), is(RelationMemberConflictDecisionType.REMOVE));
-        assertThat(model.getDecision(1).getOriginalPrimitive(), is((OsmPrimitive) ways.get(1)));
+        assertEquals(RelationMemberConflictDecisionType.KEEP, model.getDecision(0).getDecision());
+        assertEquals(ways.get(0), model.getDecision(0).getOriginalPrimitive());
+        assertEquals("foo", model.getDecision(0).getRole());
+        assertEquals(RelationMemberConflictDecisionType.REMOVE, model.getDecision(1).getDecision());
+        assertEquals(ways.get(1), model.getDecision(1).getOriginalPrimitive());
     }
 
@@ -109,12 +111,12 @@
         model.prepareDefaultRelationDecisions();
         assertTrue(model.isResolvedCompletely());
-        assertThat(model.getDecision(0).getDecision(), is(RelationMemberConflictDecisionType.KEEP));
-        assertThat(model.getDecision(0).getOriginalPrimitive(), is((OsmPrimitive) ways.get(0)));
-        assertThat(model.getDecision(0).getRole(), is("foo"));
-        assertThat(model.getDecision(1).getDecision(), is(RelationMemberConflictDecisionType.KEEP));
-        assertThat(model.getDecision(1).getOriginalPrimitive(), is((OsmPrimitive) ways.get(0)));
-        assertThat(model.getDecision(1).getRole(), is("bar"));
-        assertThat(model.getDecision(2).getDecision(), is(RelationMemberConflictDecisionType.REMOVE));
-        assertThat(model.getDecision(3).getDecision(), is(RelationMemberConflictDecisionType.REMOVE));
+        assertEquals(RelationMemberConflictDecisionType.KEEP, model.getDecision(0).getDecision());
+        assertEquals(ways.get(0), model.getDecision(0).getOriginalPrimitive());
+        assertEquals("foo", model.getDecision(0).getRole());
+        assertEquals(RelationMemberConflictDecisionType.KEEP, model.getDecision(1).getDecision());
+        assertEquals(ways.get(0), model.getDecision(1).getOriginalPrimitive());
+        assertEquals("bar", model.getDecision(1).getRole());
+        assertEquals(RelationMemberConflictDecisionType.REMOVE, model.getDecision(2).getDecision());
+        assertEquals(RelationMemberConflictDecisionType.REMOVE, model.getDecision(3).getDecision());
     }
 }