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

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

Files:

• ChangesetDialog.java (modified) (2 diffs)
• CommandStackDialog.java (modified) (1 diff)
• ConflictDialog.java (modified) (1 diff)
• ConflictResolutionDialog.java (modified) (1 diff)
• FilterDialog.java (modified) (1 diff)
• InspectPrimitiveDialog.java (modified) (2 diffs)
• LatLonDialog.java (modified) (1 diff)
• LayerListPopup.java (modified) (1 diff)
• LogShowDialog.java (modified) (1 diff)
• MapPaintDialog.java (modified) (1 diff)
• MenuItemSearchDialog.java (modified) (1 diff)
• NotesDialog.java (modified) (2 diffs)
• RelationListDialog.java (modified) (2 diffs)
• SelectionListDialog.java (modified) (1 diff)
• UserListDialog.java (modified) (1 diff)
• properties/PropertiesDialog.java (modified) (1 diff)
• properties/TagEditHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -211 +211 @@
         lstInActiveDataLayer.addMouseListener(popupMenuLauncher);
 
-        createLayout(pnl, false, Arrays.asList(new SideButton[] {
+        createLayout(pnl, false, Arrays.asList(
             new SideButton(selectObjectsAction, false),
             new SideButton(readChangesetAction, false),
@@ -217 +217 @@
             new SideButton(showChangesetInfoAction, false),
             new SideButton(new LaunchChangesetManagerAction(), false)
-        }));
+        ));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -127 +127 @@
         wireUpdateEnabledStateUpdater(redoAction, redoTree);
 
-        scrollPane = (JScrollPane) createLayout(treesPanel, true, Arrays.asList(new SideButton[] {
+        scrollPane = (JScrollPane) createLayout(treesPanel, true, Arrays.asList(
             new SideButton(selectAction),
             new SideButton(undoAction),
             new SideButton(redoAction)
-        }));
+        ));
 
         InputMapUtils.addEnterAction(undoTree, selectAndZoomAction);

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -135 +135 @@
         addListSelectionListener(actSelect);
 
-        createLayout(lstConflicts, true, Arrays.asList(new SideButton[] {
-            btnResolve, btnSelect
-        }));
+        createLayout(lstConflicts, true, Arrays.asList(btnResolve, btnSelect));
 
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -45 +45 @@
     public ConflictResolutionDialog(Component parent) {
         // We define our own actions, but need to give a hint about number of buttons
-        super(parent, tr("Resolve conflicts"), new String[] {null, null, null});
+        super(parent, tr("Resolve conflicts"), null, null, null);
         setDefaultButton(1);
         setCancelButton(2);

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -239 +239 @@
         });
 
-        createLayout(userTable, true, Arrays.asList(new SideButton[] {
+        createLayout(userTable, true, Arrays.asList(
                 addButton, editButton, deleteButton, upButton, downButton
-        }));
+        ));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -62 +62 @@
      */
     public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
-        super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")});
+        super(Main.parent, tr("Advanced object info"), tr("Close"));
         this.primitives = new ArrayList<>(primitives);
         this.layer = layer;
@@ -68 +68 @@
                 WindowGeometry.centerInWindow(Main.parent, new Dimension(750, 550)));
 
-        setButtonIcons(new String[]{"ok.png"});
+        setButtonIcons("ok");
         final JTabbedPane tabs = new JTabbedPane();
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -156 +156 @@
 
     public LatLonDialog(Component parent, String title, String help) {
-        super(parent, title, new String[] {tr("Ok"), tr("Cancel")});
-        setButtonIcons(new String[] {"ok", "cancel"});
+        super(parent, title, tr("Ok"), tr("Cancel"));
+        setButtonIcons("ok", "cancel");
         configureContextsensitiveHelp(help, true);
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java

@@ -51 +51 @@
                 ExtendedDialog ed = new ExtendedDialog(
                         Main.parent, tr("Information about layer"),
-                        new String[] {tr("OK")});
-                ed.setButtonIcons(new String[] {"ok"});
+                        tr("OK"));
+                ed.setButtonIcons("ok");
                 ed.setIcon(JOptionPane.INFORMATION_MESSAGE);
                 ed.setContent((Component) object);

trunk/src/org/openstreetmap/josm/gui/dialogs/LogShowDialog.java

@@ -30 +30 @@
      */
     public LogShowDialog(String title, String msg, String log) {
-        super(Main.parent, title, new String[] {tr("OK")});
-        setButtonIcons(new String[] {"ok.png"});
+        super(Main.parent, title, tr("OK"));
+        setButtonIcons("ok");
         setContent(build(msg, log));
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -535 +535 @@
                 return;
             final StyleSource s = model.getRow(sel);
-            ExtendedDialog info = new ExtendedDialog(Main.parent, tr("Map Style info"), new String[] {tr("Close")});
+            ExtendedDialog info = new ExtendedDialog(Main.parent, tr("Map Style info"), tr("Close"));
             info.setPreferredSize(new Dimension(600, 400));
-            info.setButtonIcons(new String[] {"ok.png"});
+            info.setButtonIcons("ok");
 
             final JTabbedPane tabs = new JTabbedPane();

trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

@@ -27 +27 @@
 
     private MenuItemSearchDialog(MainMenu menu) {
-        super(Main.parent, tr("Search menu items"), new String[]{tr("Select"), tr("Cancel")});
+        super(Main.parent, tr("Search menu items"), tr("Select"), tr("Cancel"));
         this.selector = new Selector(menu);
         this.selector.setDblClickListener(e -> buttonAction(0, null));

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -107 +107 @@
         pane.add(new JScrollPane(displayList), BorderLayout.CENTER);
 
-        createLayout(pane, false, Arrays.asList(new SideButton[]{
+        createLayout(pane, false, Arrays.asList(
                 new SideButton(downloadNotesInViewAction, false),
                 new SideButton(newAction, false),
@@ -115 +115 @@
                 new SideButton(sortAction, false),
                 new SideButton(openInBrowserAction, false),
-                new SideButton(uploadAction, false)}));
+                new SideButton(uploadAction, false)));
         updateButtonStates();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -163 +163 @@
         recentRelationsAction = new RecentRelationsAction(editButton);
 
-        createLayout(pane, false, Arrays.asList(new SideButton[]{
+        createLayout(pane, false, Arrays.asList(
                 new SideButton(newAction, false),
                 editButton,
@@ -169 +169 @@
                 new SideButton(deleteRelationsAction, false),
                 new SideButton(selectRelationAction, false)
-        }));
+        ));
 
         InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED);

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -132 +132 @@
         searchButton.createArrow(e -> SearchPopupMenu.launch(searchButton));
 
-        createLayout(lstPrimitives, true, Arrays.asList(new SideButton[] {
+        createLayout(lstPrimitives, true, Arrays.asList(
             selectButton, searchButton, new SideButton(actShowHistory)
-        }));
+        ));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -97 +97 @@
         userTable.getSelectionModel().addListSelectionListener(showUserInfoAction);
 
-        createLayout(userTable, true, Arrays.asList(new SideButton[] {
+        createLayout(userTable, true, Arrays.asList(
             new SideButton(selectionUsersPrimitivesAction),
             new SideButton(showUserInfoAction)
-        }));
+        ));
     }
 

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

@@ -1014 +1014 @@
             ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Change relation"),
-                    new String[] {tr("Delete from relation"), tr("Cancel")});
-            ed.setButtonIcons(new String[] {"dialogs/delete", "cancel"});
+                    tr("Delete from relation"), tr("Cancel"));
+            ed.setButtonIcons("dialogs/delete", "cancel");
             ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
             ed.toggleEnable(DELETE_FROM_RELATION_PREF);
-            ed.showDialog();
-
-            if (ed.getValue() != 1)
+
+            if (ed.showDialog().getValue() != 1)
                 return;
 

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 */);