Changeset 30782 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

Timestamp:

2014-10-29T21:56:35+01:00 (11 years ago)

Author:

donvip

Message:

[josm-merge_overlap] fix sonar issues

File:

• applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java (modified) (5 diffs)

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

@@ -53 +53 @@
     @Override
     public void populate(Collection<Relation> relations, Collection<? extends OsmPrimitive> memberPrimitives) {
-        throw new UnsupportedOperationException("Use populate(Collection<Relation>, Collection<? extends OsmPrimitive>, Map<Way, Way>) instead");
+        throw new UnsupportedOperationException(
+                "Use populate(Collection<Relation>, Collection<? extends OsmPrimitive>, Map<Way, Way>) instead");
     }
 
@@ -78 +79 @@
     @Override
     protected Command buildResolveCommand(Relation relation, OsmPrimitive newPrimitive) {
-        throw new UnsupportedOperationException("Use buildResolveCorrespondance(Relation, OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
+        throw new UnsupportedOperationException(
+                "Use buildResolveCorrespondance(Relation, OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
     }
 
-    protected void buildResolveCorrespondance(Relation relation, OsmPrimitive newPrimitive, Map<Relation, Relation> newRelations, Map<Way, Way> oldWays) {
+    protected void buildResolveCorrespondance(
+            Relation relation, OsmPrimitive newPrimitive, Map<Relation, Relation> newRelations, Map<Way, Way> oldWays) {
 
-        List<RelationMember> relationsMembers = relation.getMembers();
-        Relation modifiedRelation = MergeOverlapAction.getNew(relation, newRelations);
+        List<RelationMember> relationsMembers = relation.getMembers();
+        Relation modifiedRelation = MergeOverlapAction.getNew(relation, newRelations);
         modifiedRelation.setMembers(null);
         for (int i=0; i < relationsMembers.size(); i++) {
-                RelationMember rm = relationsMembers.get(i);
+            RelationMember rm = relationsMembers.get(i);
             RelationMemberConflictDecision decision = getDecision(relation, i);
             if (decision == null) {
@@ -94 +97 @@
                 switch(decision.getDecision()) {
                 case KEEP:
-                        if (newPrimitive instanceof Way) {
-                        modifiedRelation.addMember(new RelationMember(decision.getRole(), MergeOverlapAction.getOld((Way)newPrimitive, oldWays)));
-                        }
-                        else {
-                                modifiedRelation.addMember(new RelationMember(decision.getRole(), newPrimitive));
-                        }
+                    if (newPrimitive instanceof Way) {
+                        modifiedRelation.addMember(new RelationMember(decision.getRole(), 
+                                MergeOverlapAction.getOld((Way)newPrimitive, oldWays)));
+                    } else {
+                        modifiedRelation.addMember(new RelationMember(decision.getRole(), newPrimitive));
+                    }
                     break;
                 case REMOVE:
@@ -114 +117 @@
     @Override
     public List<Command> buildResolutionCommands(OsmPrimitive newPrimitive) {
-        throw new UnsupportedOperationException("Use buildRelationCorrespondance(OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
+        throw new UnsupportedOperationException(
+                "Use buildRelationCorrespondance(OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
     }
 
@@ -125 +129 @@
     public void buildRelationCorrespondance(OsmPrimitive newPrimitive, Map<Relation, Relation> newRelations, Map<Way, Way> oldWays) {
         for (Relation relation : relations) {
-                buildResolveCorrespondance(relation, newPrimitive, newRelations, oldWays);
+            buildResolveCorrespondance(relation, newPrimitive, newRelations, oldWays);
         }
     }