Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2017-05-30T15:12:36+02:00 (7 years ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloadTask.java (modified) (2 diffs)
• PluginHandler.java (modified) (2 diffs)

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

@@ -107 +107 @@
                     progressMonitor.getWindowParent(),
                     tr("Skip download"),
-                    new String[] {
-                        tr("Download Plugin"),
-                        tr("Skip Download") }
+                    tr("Download Plugin"), tr("Skip Download")
             );
             dialog.setContent(tr("JOSM version {0} required for plugin {1}.", pi.mainversion, pi.name));
-            dialog.setButtonIcons(new String[] {"download", "cancel"});
-            dialog.showDialog();
-            int answer = dialog.getValue();
-            if (answer != 1)
+            dialog.setButtonIcons("download", "cancel");
+            if (dialog.showDialog().getValue() != 1)
                 throw new PluginDownloadException(tr("Download skipped"));
         }
@@ -126 +122 @@
             URL url = new URL(pi.downloadlink);
             synchronized (this) {
-                downloadConnection = HttpClient.create(url)
-                        .setAccept(PLUGIN_MIME_TYPES);
+                downloadConnection = HttpClient.create(url).setAccept(PLUGIN_MIME_TYPES);
                 downloadConnection.connect();
             }

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

@@ -86 +86 @@
         String inCore = tr("integrated into main program");
 
-        DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] {
+        DEPRECATED_PLUGINS = Arrays.asList(
             new DeprecatedPlugin("mappaint", inCore),
             new DeprecatedPlugin("unglueplugin", inCore),
@@ -136 +136 @@
             new DeprecatedPlugin("proj4j", inCore),
             new DeprecatedPlugin("OpenStreetView", tr("replaced by new {0} plugin", "OpenStreetCam")),
-            new DeprecatedPlugin("imageryadjust", inCore),
-        });
+            new DeprecatedPlugin("imageryadjust", inCore)
+        );
     }