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

Timestamp:

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

Author:

donvip

Message:

checkstyle, update to JOSM 10279

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix

Files:

• AssociatedStreetFixer.java (modified) (4 diffs)
• BoundaryFixer.java (modified) (4 diffs)
• MultipolygonFixer.java (modified) (5 diffs)
• NothingFixer.java (modified) (3 diffs)
• PublicTransportFixer.java (modified) (6 diffs)
• RelationFixer.java (modified) (6 diffs)

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
 
@@ -46 +47 @@
         // check that all street members have same name as relation (???)
         String streetName = rel.get("name");
-        if (streetName == null) streetName = "";
+        if (streetName == null) {
+            streetName = "";
+        }
         for (RelationMember m : rel.getMembers()) {
             if ("street".equals(m.getRole()) && !streetName.equals(m.getWay().get("name"))) {
@@ -101 +104 @@
         // fill relation name
         Map<String, Integer> streetNames = new HashMap<>();
-        for (RelationMember m : rel.getMembers())
+        for (RelationMember m : rel.getMembers()) {
             if ("street".equals(m.getRole()) && m.isWay()) {
                 String name = m.getWay().get("name");
-                if (name == null || name.isEmpty()) continue;
+                if (name == null || name.isEmpty()) {
+                    continue;
+                }
 
                 Integer count = streetNames.get(name);
 
-                streetNames.put(name, count != null? count + 1 : 1);
+                streetNames.put(name, count != null ? count + 1 : 1);
             }
+        }
         String commonName = "";
         Integer commonCount = 0;
@@ -146 +152 @@
                 commandList.add(new ChangeCommand(oldWay, newWay));
             }
-        */
+         */
         // return results
         if (commandList.size() == 0)

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;

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
 
@@ -30 +31 @@
     }
 
-
     @Override
     public boolean isRelationGood(Relation rel) {
-        for (RelationMember m : rel.getMembers())
+        for (RelationMember m : rel.getMembers()) {
             if (m.getType().equals(OsmPrimitiveType.WAY) && !("outer".equals(m.getRole()) || "inner".equals(m.getRole()))) {
                 setWarningMessage(tr("Way without ''inner'' or ''outer'' role found"));
                 return false;
             }
+        }
         clearWarningMessage();
         return true;
@@ -45 +46 @@
     public Command fixRelation(Relation rel) {
         Relation rr = fixMultipolygonRoles(rel);
-        return rr != null? new ChangeCommand(rel, rr) : null;
+        return rr != null ? new ChangeCommand(rel, rr) : null;
     }
 
@@ -51 +52 @@
      * Basically, created multipolygon from scratch, and if successful, replace roles with new ones.
      */
-    protected Relation fixMultipolygonRoles( Relation source ) {
+    protected Relation fixMultipolygonRoles(Relation source) {
         Collection<Way> ways = new ArrayList<>();
-        for( OsmPrimitive p : source.getMemberPrimitives() )
-            if( p instanceof Way )
-                ways.add((Way)p);
+        for (OsmPrimitive p : source.getMemberPrimitives()) {
+            if (p instanceof Way) {
+                ways.add((Way) p);
+            }
+        }
         MultipolygonBuilder mpc = new MultipolygonBuilder();
         String error = mpc.makeFromWays(ways);
-        if( error != null )
+        if (error != null)
             return null;
 
@@ -64 +67 @@
         boolean fixed = false;
         Set<Way> outerWays = new HashSet<>();
-        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
-            for( Way w : poly.ways )
+        for (MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays) {
+            for (Way w : poly.ways) {
                 outerWays.add(w);
+            }
+        }
         Set<Way> innerWays = new HashSet<>();
-        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
-            for( Way w : poly.ways )
+        for (MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays) {
+            for (Way w : poly.ways) {
                 innerWays.add(w);
-        for( int i = 0; i < r.getMembersCount(); i++ ) {
+            }
+        }
+        for (int i = 0; i < r.getMembersCount(); i++) {
             RelationMember m = r.getMember(i);
-            if( m.isWay() ) {
+            if (m.isWay()) {
                 String role = null;
-                if( outerWays.contains((Way)m.getMember()) )
+                if (outerWays.contains(m.getMember())) {
                     role = "outer";
-                else if( innerWays.contains((Way)m.getMember()) )
+                } else if (innerWays.contains(m.getMember())) {
                     role = "inner";
-                if( role != null && !role.equals(m.getRole()) ) {
+                }
+                if (role != null && !role.equals(m.getRole())) {
                     r.setMember(i, new RelationMember(role, m.getMember()));
                     fixed = true;

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
 
@@ -12 +13 @@
         super("");
     }
+
     @Override
     public boolean isFixerApplicable(Relation rel) {
         return true;
     }
+
     @Override
     public boolean isRelationGood(Relation rel) {
@@ -25 +28 @@
         return null;
     }
-
 }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -6 +9 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import static org.openstreetmap.josm.tools.I18n.tr;
+
 import relcontext.actions.PublicTransportHelper;
 
@@ -18 +21 @@
  */
 public class PublicTransportFixer extends RelationFixer {
-        
+
     public PublicTransportFixer() {
         super("route", "public_transport");
@@ -30 +33 @@
     public boolean isRelationGood(Relation rel) {
         for (RelationMember m : rel.getMembers()) {
-            if (m.getType().equals(OsmPrimitiveType.NODE) 
+            if (m.getType().equals(OsmPrimitiveType.NODE)
                     && !(m.getRole().startsWith(PublicTransportHelper.STOP) || m.getRole().startsWith(PublicTransportHelper.PLATFORM))) {
                 setWarningMessage(tr("Node without ''stop'' or ''platform'' role found"));
@@ -62 +65 @@
         return fixed ? new ChangeCommand(rel, r) : null;
     }
-    
+
     private Relation fixStopPlatformRole(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 = PublicTransportHelper.getRoleByMember(m);
@@ -75 +78 @@
             }
         }
-        return fixed ? r : null;            
+        return fixed ? r : null;
     }
 }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package relcontext.relationfix;
 
@@ -20 +21 @@
     /**
      * Construct new RelationFixer by a list of applicable types
-     * @param types
+     * @param types types
      */
     public RelationFixer(String... types) {
         applicableTypes = new ArrayList<>();
-        for(String type: types) {
+        for (String type: types) {
             applicableTypes.add(type);
         }
@@ -33 +34 @@
      * and then check desired relation properties.
      * Note that this only verifies if current RelationFixer can be used to check and fix given relation
-     * Deeper relation checking is at {@link isRelationGood}
+     * Deeper relation checking is at {@link #isRelationGood}
      *
      * @param rel Relation to check
@@ -45 +46 @@
 
         String type = rel.get("type");
-        for(String oktype: applicableTypes)
+        for (String oktype: applicableTypes) {
             if (oktype.equals(type))
                 return true;
+        }
 
         return false;
@@ -73 +75 @@
         this.sortAndFixAction = sortAndFixAction;
     }
+
     protected void setWarningMessage(String text) {
         if (text == null) {
@@ -80 +83 @@
         }
     }
+
     protected void clearWarningMessage() {
         sortAndFixAction.putValue(Action.SHORT_DESCRIPTION, tr("Fix roles of the chosen relation members"));
     }
-
 }