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

Timestamp:

2016-12-12T17:29:27+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - BC_UNCONFIRMED_CAST

Location:

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

Files:

• Node.java (modified) (4 diffs)
• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (3 diffs)
• Way.java (modified) (3 diffs)

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

@@ -238 +238 @@
     @Override
     public void cloneFrom(OsmPrimitive osm) {
+        if (!(osm instanceof Node))
+            throw new IllegalArgumentException("Not a node: " + osm);
         boolean locked = writeLock();
         try {
@@ -260 +262 @@
     @Override
     public void mergeFrom(OsmPrimitive other) {
+        if (!(other instanceof Node))
+            throw new IllegalArgumentException("Not a node: " + other);
         boolean locked = writeLock();
         try {
@@ -271 +275 @@
     }
 
-    @Override public void load(PrimitiveData data) {
+    @Override
+    public void load(PrimitiveData data) {
+        if (!(data instanceof NodeData))
+            throw new IllegalArgumentException("Not a node data: " + data);
         boolean locked = writeLock();
         try {
@@ -281 +288 @@
     }
 
-    @Override public NodeData save() {
+    @Override
+    public NodeData save() {
         NodeData data = new NodeData();
         saveCommonAttributes(data);

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

@@ -1088 +1088 @@
      *
      * Both this and other must be new, or both must be assigned an OSM ID. If both this and <code>other</code>
-     * have an assigend OSM id, the IDs have to be the same.
+     * have an assigned OSM id, the IDs have to be the same.
      *
      * @param other the other primitive. Must not be null.

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

@@ -240 +240 @@
     @Override
     public void cloneFrom(OsmPrimitive osm) {
+        if (!(osm instanceof Relation))
+            throw new IllegalArgumentException("Not a relation: " + osm);
         boolean locked = writeLock();
         try {
@@ -252 +254 @@
     @Override
     public void load(PrimitiveData data) {
+        if (!(data instanceof RelationData))
+            throw new IllegalArgumentException("Not a relation data: " + data);
         boolean locked = writeLock();
         try {
@@ -271 +275 @@
     }
 
-    @Override public RelationData save() {
+    @Override
+    public RelationData save() {
         RelationData data = new RelationData();
         saveCommonAttributes(data);

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

@@ -277 +277 @@
     @Override
     public void load(PrimitiveData data) {
+        if (!(data instanceof WayData))
+            throw new IllegalArgumentException("Not a way data: " + data);
         boolean locked = writeLock();
         try {
@@ -314 +316 @@
     @Override
     public void cloneFrom(OsmPrimitive osm) {
+        if (!(osm instanceof Way))
+            throw new IllegalArgumentException("Not a way: " + osm);
         boolean locked = writeLock();
         try {
@@ -326 +330 @@
     @Override
     public String toString() {
-        String nodesDesc = isIncomplete() ? "(incomplete)" : "nodes=" + Arrays.toString(nodes);
+        String nodesDesc = isIncomplete() ? "(incomplete)" : ("nodes=" + Arrays.toString(nodes));
         return "{Way id=" + getUniqueId() + " version=" + getVersion()+ ' ' + getFlagsAsString() + ' ' + nodesDesc + '}';
     }