Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.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/gui/dialogs/properties/TagEditHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -376 +376 @@
      */
     private static boolean warnOverwriteKey(String action, String togglePref) {
-        ExtendedDialog ed = new ExtendedDialog(
+        return new ExtendedDialog(
                 Main.parent,
                 tr("Overwrite key"),
-                new String[]{tr("Replace"), tr("Cancel")});
-        ed.setButtonIcons(new String[]{"purge", "cancel"});
-        ed.setContent(action+'\n'+ tr("The new key is already used, overwrite values?"));
-        ed.setCancelButton(2);
-        ed.toggleEnable(togglePref);
-        ed.showDialog();
-
-        return ed.getValue() == 1;
+                tr("Replace"), tr("Cancel"))
+            .setButtonIcons("purge", "cancel")
+            .setContent(action+'\n'+ tr("The new key is already used, overwrite values?"))
+            .setCancelButton(2)
+            .toggleEnable(togglePref)
+            .showDialog().getValue() == 1;
     }
 
@@ -416 +414 @@
 
         protected EditTagDialog(String key, Map<String, Integer> map, final boolean initialFocusOnKey) {
-            super(Main.parent, trn("Change value?", "Change values?", map.size()), new String[] {tr("OK"), tr("Cancel")});
-            setButtonIcons(new String[] {"ok", "cancel"});
+            super(Main.parent, trn("Change value?", "Change values?", map.size()), tr("OK"), tr("Cancel"));
+            setButtonIcons("ok", "cancel");
             setCancelButton(2);
             configureContextsensitiveHelp("/Dialog/EditValue", true /* show help button */);
@@ -679 +677 @@
 
         protected AddTagsDialog() {
-            super(Main.parent, tr("Add value?"), new String[] {tr("OK"), tr("Cancel")});
-            setButtonIcons(new String[] {"ok", "cancel"});
+            super(Main.parent, tr("Add value?"), tr("OK"), tr("Cancel"));
+            setButtonIcons("ok", "cancel");
             setCancelButton(2);
             configureContextsensitiveHelp("/Dialog/AddValue", true /* show help button */);