Changeset 8506 in josm

Timestamp:

2015-06-19T23:34:50+02:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/gpx/GpxData.java (modified) (1 diff)
• gui/download/BookmarkList.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• plugins/Plugin.java (modified) (1 diff)
• tools/CheckParameterUtil.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1759 +1759 @@
 
     /**
+     * Sets the given online resource to online state.
+     * @param r the online resource
+     * @return {@code true} if {@code r} was offline
+     * @since 8506
+     */
+    public static boolean setOnline(OnlineResource r) {
+        return OFFLINE_RESOURCES.remove(r);
+    }
+
+    /**
      * Replies the set of online resources currently offline.
      * @return the set of online resources currently offline

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -436 +436 @@
                         }
                     }
-                    // if we get here, all the Tracks are finished; Continue with
-                    // Routes
+                    // if we get here, all the Tracks are finished; Continue with Routes
                     itTracks = null;
                 }

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -38 +38 @@
         /**
          * Constructs a new {@code Bookmark} with the given contents.
-         * @param list Bookmark contents as a list of 5 elements. First item is the name, then come bounds arguments (minlat, minlon, maxlat, maxlon)
+         * @param list Bookmark contents as a list of 5 elements.
+         * First item is the name, then come bounds arguments (minlat, minlon, maxlat, maxlon)
          * @throws NumberFormatException if the bounds arguments are not numbers
          * @throws IllegalArgumentException if list contain less than 5 elements
          */
-        public Bookmark(Collection<String> list) throws NumberFormatException, IllegalArgumentException {
+        public Bookmark(Collection<String> list) {
             List<String> array = new ArrayList<>(list);
             if(array.size() < 5)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -213 +212 @@
         }
 
-        private InputStream createInputStream(File sel) throws IOException, FileNotFoundException {
+        private InputStream createInputStream(File sel) throws IOException {
             if (Utils.hasExtension(sel, "gpx.gz")) {
                 return new GZIPInputStream(new FileInputStream(sel));

trunk/src/org/openstreetmap/josm/plugins/Plugin.java

@@ -103 +103 @@
     /**
      * Copies the resource 'from' to the file in the plugin directory named 'to'.
+     * @throws FileNotFoundException if the file exists but is a directory rather than a regular file,
+     * does not exist but cannot be created, or cannot be opened for any other reason
+     * @throws IOException if any other I/O error occurs
      */
-    public void copy(String from, String to) throws FileNotFoundException, IOException {
+    public void copy(String from, String to) throws IOException {
         String pluginDirName = getPluginDir();
         File pluginDir = new File(pluginDirName);

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

@@ -26 +26 @@
      * @throws IllegalArgumentException if the primitive ID is not valid (negative or zero)
      */
-    public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) throws IllegalArgumentException {
+    public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) {
         ensureParameterNotNull(id, parameterName);
         if (id.getUniqueId() <= 0)
-            throw new IllegalArgumentException(MessageFormat.format("Expected unique id > 0 for primitive ''{1}'', got {0}", id.getUniqueId(), parameterName));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected unique id > 0 for primitive ''{1}'', got {0}", id.getUniqueId(), parameterName));
     }
 
@@ -39 +40 @@
      * @since 5980
      */
-    public static void ensureValidCoordinates(LatLon latlon, String parameterName) throws IllegalArgumentException {
+    public static void ensureValidCoordinates(LatLon latlon, String parameterName) {
         ensureParameterNotNull(latlon, parameterName);
         if (!latlon.isValid())
-            throw new IllegalArgumentException(MessageFormat.format("Expected valid lat/lon for parameter ''{0}'', got {1}", parameterName, latlon));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected valid lat/lon for parameter ''{0}'', got {1}", parameterName, latlon));
     }
 
@@ -52 +54 @@
      * @since 5980
      */
-    public static void ensureValidCoordinates(EastNorth eastnorth, String parameterName) throws IllegalArgumentException {
+    public static void ensureValidCoordinates(EastNorth eastnorth, String parameterName) {
         ensureParameterNotNull(eastnorth, parameterName);
         if (!eastnorth.isValid())
-            throw new IllegalArgumentException(MessageFormat.format("Expected valid east/north for parameter ''{0}'', got {1}", parameterName, eastnorth));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected valid east/north for parameter ''{0}'', got {1}", parameterName, eastnorth));
     }
 
@@ -64 +67 @@
      * @throws IllegalArgumentException if the version is not valid (negative)
      */
-    public static void ensureValidVersion(long version, String parameterName) throws IllegalArgumentException {
+    public static void ensureValidVersion(long version, String parameterName) {
         if (version < 0)
-            throw new IllegalArgumentException(MessageFormat.format("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
     }
 
@@ -75 +79 @@
      * @throws IllegalArgumentException if the parameter is {@code null}
      */
-    public static void ensureParameterNotNull(Object value, String parameterName) throws IllegalArgumentException {
+    public static void ensureParameterNotNull(Object value, String parameterName) {
         if (value == null)
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' must not be null", parameterName));
@@ -86 +90 @@
      * @since 3871
      */
-    public static void ensureParameterNotNull(Object value) throws IllegalArgumentException {
+    public static void ensureParameterNotNull(Object value) {
         if (value == null)
             throw new IllegalArgumentException("Parameter must not be null");
@@ -96 +100 @@
      * @throws IllegalArgumentException if the condition does not hold
      */
-    public static void ensureThat(boolean condition, String message) throws IllegalArgumentException {
+    public static void ensureThat(boolean condition, String message) {
         if (!condition)
             throw new IllegalArgumentException(message);
@@ -104 +108 @@
      * Ensures that <code>id</code> is non-null primitive id of type {@link OsmPrimitiveType#NODE}
      *
-     * @param id  the primitive  id
+     * @param id the primitive  id
      * @param parameterName the name of the parameter to be checked
      * @throws IllegalArgumentException if id is null
      * @throws IllegalArgumentException if id.getType() != NODE
      */
-    public static void ensureValidNodeId(PrimitiveId id, String parameterName) throws IllegalArgumentException {
+    public static void ensureValidNodeId(PrimitiveId id, String parameterName) {
         ensureParameterNotNull(id, parameterName);
         if (!id.getType().equals(OsmPrimitiveType.NODE))
-            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' of type node expected, got ''{1}''", parameterName, id.getType().getAPIName()));
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Parameter ''{0}'' of type node expected, got ''{1}''", parameterName, id.getType().getAPIName()));
     }
 }