Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -60 +60 @@
     @Override
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
-        Relation myRel = (Relation)conflict.getMy();
-        Relation theirRel = (Relation)conflict.getTheir();
-        ((RelationMemberListMergeModel)model).populate(myRel, theirRel, conflict.getMergedMap());
+        Relation myRel = (Relation) conflict.getMy();
+        Relation theirRel = (Relation) conflict.getTheir();
+        ((RelationMemberListMergeModel) model).populate(myRel, theirRel, conflict.getMergedMap());
         myEntriesTable.setLayer(findLayerFor(myRel));
         theirEntriesTable.setLayer(findLayerFor(theirRel));