Changeset 10216 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-05-15T14:48:06+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• RelationMemberData.java (modified) (3 diffs)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• visitor/paint/relations/Multipolygon.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

@@ -4 +4 @@
 import java.io.Serializable;
 import java.util.Objects;
+
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class RelationMemberData implements PrimitiveId, Serializable {
@@ -12 +14 @@
     private final OsmPrimitiveType memberType;
 
+    /**
+     * Constructs a new {@code RelationMemberData}.
+     * @param role member role - can be null
+     * @param type member type - cannot be null
+     * @param id member id - cannot be null
+     * @throws IllegalArgumentException is type or id is null
+     */
     public RelationMemberData(String role, OsmPrimitiveType type, long id) {
+        CheckParameterUtil.ensureParameterNotNull(type, "type");
         this.role = role == null ? "" : role;
         this.memberType = type;
@@ -18 +28 @@
     }
 
+    /**
+     * Constructs a new {@code RelationMemberData}.
+     * @param role member role - can be null
+     * @param primitive member type and id - cannot be null
+     * @throws NullPointerException if primitive is null
+     */
     public RelationMemberData(String role, PrimitiveId primitive) {
         this(role, primitive.getType(), primitive.getUniqueId());
     }
 
+    /**
+     * Get member id.
+     * @return member id
+     */
     public long getMemberId() {
         return memberId;
     }
 
+    /**
+     * Get member role.
+     * @return member role
+     */
     public String getRole() {
         return role;
     }
 
+    /**
+     * Get member type.
+     * @return member type
+     */
     public OsmPrimitiveType getMemberType() {
         return memberType;
     }
 
+    /**
+     * Determines if this member has a role.
+     * @return {@code true} if this member has a role
+     */
     public boolean hasRole() {
         return !"".equals(role);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1091 +1091 @@
                             via = w;
                         }
+                        break;
+                    default: // Do nothing
                     }
                 } else if (m.isNode()) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -264 +264 @@
                         }
                         total++;
+                        break;
+                    default: // Do nothing
                 }
             }