Changeset 12279 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

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/gui/tagging/presets

Files:

• TaggingPreset.java (modified) (1 diff)
• TaggingPresetSearchDialog.java (modified) (1 diff)
• TaggingPresetSearchPrimitiveDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -435 +435 @@
             contentInsets = new Insets(10, 5, 0, 5);
             if (showNewRelation) {
-                setButtonIcons(new String[] {"ok", "dialogs/addrelation", "cancel" });
+                setButtonIcons("ok", "dialogs/addrelation", "cancel");
             } else {
-                setButtonIcons(new String[] {"ok", "cancel" });
+                setButtonIcons("ok", "cancel");
             }
             setContent(content);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchDialog.java

@@ -32 +32 @@
 
     private TaggingPresetSearchDialog() {
-        super(Main.parent, tr("Presets"), new String[] {tr("Select"), tr("Cancel")});
+        super(Main.parent, tr("Presets"), tr("Select"), tr("Cancel"));
         selector = new TaggingPresetSelector(true, true);
         setContent(selector, false);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

@@ -66 +66 @@
 
     TaggingPresetSearchPrimitiveDialog() {
-        super(Main.parent, tr("Presets"), new String[] {tr("Search"), tr("Cancel")});
+        super(Main.parent, tr("Presets"), tr("Search"), tr("Cancel"));
         selector = new TaggingPresetSelector(false, false);
         setContent(selector, false);
@@ -86 +86 @@
             TaggingPreset preset = selector.getSelectedPresetAndUpdateClassification();
             if (preset != null) {
-
                 final Set<OsmPrimitive> matching = new HashSet<>(Main.getLayerManager().getEditDataSet().getPrimitives(preset));
                 Main.getLayerManager().getEditDataSet().setSelected(matching);