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

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/io

Files:

• DefaultProxySelector.java (modified) (1 diff)
• GpxExporter.java (modified) (1 diff)
• imagery/ImageryReader.java (modified) (3 diffs)
• remotecontrol/AddTagsDialog.java (modified) (1 diff)
• session/SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -146 +146 @@
         proxyExceptions = new HashSet<>(
             Main.pref.getCollection(ProxyPreferencesPanel.PROXY_EXCEPTIONS,
-                    Arrays.asList(new String[]{"localhost", IPV4_LOOPBACK, IPV6_LOOPBACK}))
+                    Arrays.asList("localhost", IPV4_LOOPBACK, IPV6_LOOPBACK))
         );
     }

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -148 +148 @@
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
                 tr("Export options"),
-                new String[] {tr("Export and Save"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"exportgpx", "cancel"});
-        ed.setContent(p);
-        ed.showDialog();
-
-        if (ed.getValue() != 1) {
+                tr("Export and Save"), tr("Cancel"))
+            .setButtonIcons("exportgpx", "cancel")
+            .setContent(p);
+
+        if (ed.showDialog().getValue() != 1) {
             setCanceled(true);
             return;

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -171 +171 @@
                 break;
             case MIRROR:
-                if (Arrays.asList(new String[] {
+                if (Arrays.asList(
                         "type",
                         "url",
                         MIN_ZOOM,
                         MAX_ZOOM,
-                        TILE_SIZE,
-                }).contains(qName)) {
+                        TILE_SIZE
+                ).contains(qName)) {
                     newState = State.MIRROR_ATTRIBUTE;
                     lang = atts.getValue("lang");
@@ -186 +186 @@
                 break;
             case ENTRY:
-                if (Arrays.asList(new String[] {
+                if (Arrays.asList(
                         "name",
                         "id",
@@ -207 +207 @@
                         "date",
                         TILE_SIZE,
-                        "valid-georeference",
-                }).contains(qName)) {
+                        "valid-georeference"
+                ).contains(qName)) {
                     newState = State.ENTRY_ATTRIBUTE;
                     lang = atts.getValue("lang");

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -140 +140 @@
                 false,
                 true);
-        setToolTipTexts(new String[]{tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), ""});
+        setToolTipTexts(tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), "");
 
         this.sender = senderName;

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -567 +567 @@
                             Main.parent,
                             title,
-                            new String[] {tr("Cancel"), tr("Skip layer and continue")}
-                            );
-                    dlg.setButtonIcons(new String[] {"cancel", "dialogs/next"});
-                    dlg.setIcon(icon);
-                    dlg.setContent(message);
-                    dlg.showDialog();
-                    cancel = dlg.getValue() != 2;
+                            tr("Cancel"), tr("Skip layer and continue"))
+                        .setButtonIcons("cancel", "dialogs/next")
+                        .setIcon(icon)
+                        .setContent(message);
+                    cancel = dlg.showDialog().getValue() != 2;
                 });
             } catch (InvocationTargetException | InterruptedException ex) {