Changeset 13825 in josm for trunk

Timestamp:

2018-05-24T02:08:33+02:00 (7 years ago)

Author:

Don-vip

Message:

SonarQube - squid:S3878 - Arrays should not be created for varargs parameters

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (1 diff)
• data/cache/JCSCachedTileLoaderJob.java (modified) (2 diffs)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/preferences/imagery/AddImageryPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -192 +192 @@
 
             if (!GraphicsEnvironment.isHeadless()) {
-                if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { {
+                if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel")) { {
                     final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
                     scrollPane.setPreferredSize(new Dimension(400, 400));

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -277 +277 @@
             if (now > expires) {
                 Logging.debug("JCS - Object {0} has expired -> valid to {1}, now is: {2}",
-                        new Object[]{getUrlNoException(), Long.toString(expires), Long.toString(now)});
+                        getUrlNoException(), Long.toString(expires), Long.toString(now));
                 return false;
             }
@@ -376 +376 @@
                     cache.put(getCacheKey(), cacheData, attributes);
                     Logging.debug("JCS - downloaded key: {0}, length: {1}, url: {2}",
-                            new Object[] {getCacheKey(), raw.length, getUrl()});
+                            getCacheKey(), raw.length, getUrl());
                     return true;
                 } else if (cacheAsEmpty()) {

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -123 +123 @@
             } catch (IOException e) {
                 Logging.logWithStackTrace(Logging.LEVEL_WARN, e, "JCS TMS - error loading from cache for tile {0}: {1}",
-                        new Object[] {tile.getKey(), e.getMessage()}
-                        );
+                        tile.getKey(), e.getMessage());
             }
         }
@@ -208 +207 @@
             }
         } catch (IOException e) {
-            Logging.warn("JCS TMS - error loading object for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
+            Logging.warn("JCS TMS - error loading object for tile {0}: {1}", tile.getKey(), e.getMessage());
             tile.setError(e);
             tile.setLoaded(false);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

@@ -77 +77 @@
                 1
                 ));
-        List<String> units = Arrays.asList(new String[]{tr("seconds"), tr("minutes"), tr("hours"), tr("days")});
+        List<String> units = Arrays.asList(tr("seconds"), tr("minutes"), tr("hours"), tr("days"));
         minimumCacheExpiryUnit = new JComboBox<>(units.toArray(new String[]{}));
         currentUnit = TimeUnit.SECONDS;