Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

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

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -340 +340 @@
                 Main.parent,
                 initialValues instanceof Filter ? tr("Filter") : tr("Search"),
-                        new String[] {
-                    initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
-                            tr("Cancel")}
+                initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
+                tr("Cancel")
         ) {
             @Override
@@ -368 +367 @@
             }
         };
-        dialog.setButtonIcons(new String[] {"dialogs/search", "cancel"});
+        dialog.setButtonIcons("dialogs/search", "cancel");
         dialog.configureContextsensitiveHelp("/Action/Search", true /* show help button */);
         dialog.setContent(p);
-        dialog.showDialog();
-        int result = dialog.getValue();
-
-        if (result != 1) return null;
+
+        if (dialog.showDialog().getValue() != 1) return null;
 
         // User pressed OK - let's perform the search