Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/actions/upload

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/actions/upload

Files:

• RelationUploadOrderHook.java (modified) (1 diff)
• ValidateUploadHook.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

@@ -80 +80 @@
                 Main.parent,
                 tr("Cycling dependencies"),
-                new String[] {tr("OK")}
+                tr("OK")
         );
         dialog.setContent(pnl, false /* don't embed in scroll pane */);
-        dialog.setButtonIcons(new String[] {"ok"});
+        dialog.setButtonIcons("ok");
         dialog.setRememberWindowGeometry(
                 getClass().getName() + ".geometry",

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -141 +141 @@
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
                 tr("Suspicious data found. Upload anyway?"),
-                new String[] {tr("Continue upload"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"ok.png", "cancel.png"});
-        ed.setContent(p);
-        ed.showDialog();
+                tr("Continue upload"), tr("Cancel"))
+            .setButtonIcons("ok", "cancel")
+            .setContent(p);
 
-        if (ed.getValue() != 1) {
+        if (ed.showDialog().getValue() != 1) {
             OsmValidator.initializeTests();
             OsmValidator.initializeErrorLayer();