Changeset 6792 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-01-31T02:44:56+01:00 (11 years ago)

Author:

Don-vip

Message:

Sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• SubclassFilteredCollection.java (modified) (2 diffs)
• Utils.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java

@@ -47 +47 @@
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public T next() {
@@ -53 +54 @@
             current = null;
             // we are save because predicate only accepts objects of type T
-            @SuppressWarnings("unchecked") T res = (T) old;
-            return res;
+            return (T) old;
         }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -294 +294 @@
         return null;
     }
-    
+
     /**
      * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
@@ -307 +307 @@
         return null;
     }
-    
+
     /**
      * Simple file copy function that will overwrite the target file.<br/>
@@ -386 +386 @@
         }
     }
-    
+
     /**
      * Converts the given file to its URL.
@@ -457 +457 @@
         try {
             if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-                String text = (String) t.getTransferData(DataFlavor.stringFlavor);
-                return text;
+                return (String) t.getTransferData(DataFlavor.stringFlavor);
             }
         } catch (UnsupportedFlavorException ex) {
@@ -780 +779 @@
     /**
      * Runs an external command and returns the standard output.
-     * 
+     *
      * The program is expected to execute fast.
-     * 
+     *
      * @param command the command with arguments
      * @return the output
@@ -945 +944 @@
         return result;
     }
-    
+
     /**
      * Adds the given item at the end of a new copy of given array.