Changeset 32395 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

Timestamp:

2016-06-24T09:10:57+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle, update to JOSM 10279

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java (modified) (4 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
 
@@ -32 +33 @@
     @Override
     public boolean isRelationGood(Relation rel) {
-        for( RelationMember m : rel.getMembers() ) {
+        for (RelationMember m : rel.getMembers()) {
             if (m.getType().equals(OsmPrimitiveType.RELATION) && !"subarea".equals(m.getRole())) {
                 setWarningMessage(tr("Relation without ''subarea'' role found"));
@@ -67 +68 @@
     }
 
-    private Relation fixBoundaryRoles( Relation source ) {
+    private Relation fixBoundaryRoles(Relation source) {
         Relation r = new Relation(source);
         boolean fixed = false;
-        for( int i = 0; i < r.getMembersCount(); i++ ) {
+        for (int i = 0; i < r.getMembersCount(); i++) {
             RelationMember m = r.getMember(i);
             String role = null;
-            if( m.isRelation() )
+            if (m.isRelation()) {
                 role = "subarea";
-            else if( m.isNode() ) {
-                Node n = (Node)m.getMember();
-                if( !n.isIncomplete() ) {
-                    if( n.hasKey("place") ) {
+            } else if (m.isNode()) {
+                Node n = (Node) m.getMember();
+                if (!n.isIncomplete()) {
+                    if (n.hasKey("place")) {
                         String place = n.get("place");
                         if (place.equals("state") || place.equals("country") ||
@@ -86 +87 @@
                             role = "admin_centre";
                         }
-                    } else
+                    } else {
                         role = "label";
+                    }
                 }
             }
-            if( role != null && !role.equals(m.getRole()) ) {
+            if (role != null && !role.equals(m.getRole())) {
                 r.setMember(i, new RelationMember(role, m.getMember()));
                 fixed = true;