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

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

Files:

• AboutAction.java (modified) (1 diff)
• AbstractMergeAction.java (modified) (1 diff)
• AddImageryLayerAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• HistoryInfoAction.java (modified) (1 diff)
• ImageryAdjustAction.java (modified) (2 diffs)
• MapRectifierWMSmenuAction.java (modified) (1 diff)
• OpenLocationAction.java (modified) (2 diffs)
• SaveAction.java (modified) (1 diff)
• SaveActionBase.java (modified) (1 diff)
• SearchNotesDownloadAction.java (modified) (2 diffs)
• SessionSaveAsAction.java (modified) (2 diffs)
• ShowStatusReportAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)
• search/SearchAction.java (modified) (2 diffs)
• upload/RelationUploadOrderHook.java (modified) (1 diff)
• upload/ValidateUploadHook.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -110 +110 @@
 
         GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
-        int ret = new ExtendedDialog(Main.parent, tr("About JOSM..."), new String[] {tr("OK"), tr("Report bug")})
-            .setButtonIcons(new String[] {"ok", "bug"})
+        int ret = new ExtendedDialog(Main.parent, tr("About JOSM..."), tr("OK"), tr("Report bug"))
+            .setButtonIcons("ok", "bug")
             .setContent(panel, false)
             .showDialog().getValue();

trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

@@ -114 +114 @@
             return targetLayers[0];
         }
-        ExtendedDialog ed = new ExtendedDialog(Main.parent, title, new String[] {buttonText, tr("Cancel")});
-        ed.setButtonIcons(new String[] {buttonIcon, "cancel"});
+        ExtendedDialog ed = new ExtendedDialog(Main.parent, title, buttonText, tr("Cancel"));
+        ed.setButtonIcons(buttonIcon, "cancel");
         ed.setContent(pnl);
         ed.showDialog();

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -49 +49 @@
     static class SelectWmsLayersDialog extends ExtendedDialog {
         SelectWmsLayersDialog(WMSLayerTree tree, JComboBox<String> formats) {
-            super(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")});
+            super(Main.parent, tr("Select WMS layers"), tr("Add layers"), tr("Cancel"));
             final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
             scrollPane.setPreferredSize(new Dimension(400, 400));

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -61 +61 @@
 
     protected static boolean confirmChangeDirectionOfWays() {
-        ExtendedDialog ed = new ExtendedDialog(Main.parent,
+        return new ExtendedDialog(Main.parent,
                 tr("Change directions?"),
-                new String[] {tr("Reverse and Combine"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"wayflip", "cancel"});
-        ed.setContent(tr("The ways can not be combined in their current directions.  "
-                + "Do you want to reverse some of them?"));
-        ed.toggleEnable("combineway-reverse");
-        ed.showDialog();
-        return ed.getValue() == 1;
+                tr("Reverse and Combine"), tr("Cancel"))
+            .setButtonIcons("wayflip", "cancel")
+            .setContent(tr("The ways can not be combined in their current directions.  "
+                + "Do you want to reverse some of them?"))
+            .toggleEnable("combineway-reverse")
+            .showDialog()
+            .getValue() == 1;
     }
 

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -58 +58 @@
          */
         public HistoryObjectIDDialog() {
-            super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
-            setButtonIcons(new String[]{"dialogs/history", "cancel"});
+            super(Main.parent, tr("Show history"), tr("Show history"), tr("Cancel"));
+            setButtonIcons("dialogs/history", "cancel");
             init();
         }

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -217 +217 @@
                     new String[] {tr("OK"), tr("Cancel")},
                     false);
-            setButtonIcons(new String[] {"ok", "cancel"});
+            setButtonIcons("ok", "cancel");
             contentInsets = new Insets(10, 15, 5, 15);
             JPanel pnl = new JPanel(new GridBagLayout());
@@ -294 +294 @@
                     Main.parent,
                     tr("Overwrite"),
-                    new String[] {tr("Overwrite"), tr("Cancel")}
+                    tr("Overwrite"), tr("Cancel")
             ) { {
                 contentInsets = new Insets(10, 15, 10, 15);
             } };
             dialog.setContent(tr("Offset bookmark already exists. Overwrite?"));
-            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+            dialog.setButtonIcons("ok", "cancel");
             dialog.setupDialog();
             dialog.setVisible(true);

trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java

@@ -162 +162 @@
         ExtendedDialog diag = new ExtendedDialog(Main.parent,
                 tr("Add Rectified Image"),
-
-                new String[] {tr("Add Rectified Image"), tr("Cancel")});
-        diag.setContent(panel);
-        diag.setButtonIcons(new String[] {"OLmarker", "cancel"});
+                tr("Add Rectified Image"), tr("Cancel"))
+            .setContent(panel)
+            .setButtonIcons("OLmarker", "cancel");
 
         // This repeatedly shows the dialog in case there has been an error.

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -65 +65 @@
         WhichTasksToPerformDialog(JList<DownloadTask> list) {
             super(Main.parent, tr("Which tasks to perform?"), new String[]{tr("Ok"), tr("Cancel")}, true);
-            setButtonIcons(new String[]{"ok", "cancel"});
+            setButtonIcons("ok", "cancel");
             final JPanel pane = new JPanel(new GridLayout(2, 1));
             pane.add(new JLabel(tr("Which tasks to perform?")));
@@ -138 +138 @@
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
                 tr("Download Location"),
-                new String[] {tr("Download URL"), tr("Cancel")}
-        );
-        dialog.setContent(all, false /* don't embedded content in JScrollpane  */);
-        dialog.setButtonIcons(new String[] {"download", "cancel"});
-        dialog.setToolTipTexts(new String[] {
+                tr("Download URL"), tr("Cancel"))
+            .setContent(all, false /* don't embedded content in JScrollpane  */)
+            .setButtonIcons("download", "cancel")
+            .setToolTipTexts(
                 tr("Start downloading data"),
-                tr("Close dialog and cancel downloading")
-        });
-        dialog.configureContextsensitiveHelp("/Action/OpenLocation", true /* show help button */);
-        dialog.showDialog();
-        if (dialog.getValue() == 1) {
+                tr("Close dialog and cancel downloading"))
+            .configureContextsensitiveHelp("/Action/OpenLocation", true /* show help button */);
+        if (dialog.showDialog().getValue() == 1) {
             USE_NEW_LAYER.put(layer.isSelected());
             remindUploadAddressHistory(uploadAddresses);

trunk/src/org/openstreetmap/josm/actions/SaveAction.java

@@ -47 +47 @@
                     Main.parent,
                     tr("Overwrite"),
-                    new String[] {tr("Overwrite"), tr("Cancel")}
-            );
-            dialog.setButtonIcons(new String[] {"save_as", "cancel"});
-            dialog.setContent(tr("File {0} exists. Overwrite?", f.getName()));
-            dialog.showDialog();
-            int ret = dialog.getValue();
-            if (ret != 1) {
+                    tr("Overwrite"), tr("Cancel"))
+                .setButtonIcons("save_as", "cancel")
+                .setContent(tr("File {0} exists. Overwrite?", f.getName()));
+            if (dialog.showDialog().getValue() != 1) {
                 f = null;
             }

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -207 +207 @@
     public static boolean confirmOverwrite(File file) {
         if (file == null || file.exists()) {
-            ExtendedDialog dialog = new ExtendedDialog(
+            return new ExtendedDialog(
                     Main.parent,
                     tr("Overwrite"),
-                    new String[] {tr("Overwrite"), tr("Cancel")}
-            );
-            dialog.setContent(tr("File exists. Overwrite?"));
-            dialog.setButtonIcons(new String[] {"save_as", "cancel"});
-            dialog.showDialog();
-            return dialog.getValue() == 1;
+                    tr("Overwrite"), tr("Cancel"))
+                .setContent(tr("File exists. Overwrite?"))
+                .setButtonIcons("save_as", "cancel")
+                .showDialog()
+                .getValue() == 1;
         }
         return true;

trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java

@@ -53 +53 @@
         contentPanel.add(searchTermBox, gc);
 
-        ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Search for notes"),
-                new String[] {tr("Search for notes"), tr("Cancel")});
-        ed.setContent(contentPanel);
-        ed.setButtonIcons(new String[] {"note_search", "cancel"});
-        ed.showDialog();
-        if (ed.getValue() != 1) {
+        ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Search for notes"), tr("Search for notes"), tr("Cancel"))
+            .setContent(contentPanel)
+            .setButtonIcons("note_search", "cancel");
+        if (ed.showDialog().getValue() != 1) {
             return;
         }
@@ -64 +62 @@
         String searchTerm = Optional.ofNullable(searchTermBox.getText()).orElse("").trim();
         if (searchTerm.isEmpty()) {
-            Notification notification = new Notification(tr("You must enter a search term"));
-            notification.setIcon(JOptionPane.WARNING_MESSAGE);
-            notification.show();
+            new Notification(tr("You must enter a search term"))
+                .setIcon(JOptionPane.WARNING_MESSAGE)
+                .show();
             return;
         }

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -118 +118 @@
             fc = createAndOpenFileChooser(false, false, tr("Save session"), joz, JFileChooser.FILES_ONLY, "lastDirectory");
         } else {
-            fc = createAndOpenFileChooser(false, false, tr("Save session"), Arrays.asList(new FileFilter[]{jos, joz}), jos,
+            fc = createAndOpenFileChooser(false, false, tr("Save session"), Arrays.asList(jos, joz), jos,
                     JFileChooser.FILES_ONLY, "lastDirectory");
         }
@@ -188 +188 @@
          */
         public SessionSaveAsDialog() {
-            super(Main.parent, tr("Save Session"), new String[] {tr("Save As"), tr("Cancel")});
+            super(Main.parent, tr("Save Session"), tr("Save As"), tr("Cancel"));
             initialize();
-            setButtonIcons(new String[] {"save_as", "cancel"});
+            setButtonIcons("save_as", "cancel");
             setDefaultButton(1);
             setRememberWindowGeometry(getClass().getName() + ".geometry",

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -291 +291 @@
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
                 tr("Status Report"),
-                new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
-        ed.setButtonIcons(new String[] {"copy", "bug", "cancel" });
+                tr("Copy to clipboard and close"), tr("Report bug"), tr("Close"));
+        ed.setButtonIcons("copy", "bug", "cancel");
         ed.setContent(ta, false);
         ed.setMinimumSize(new Dimension(380, 200));

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -243 +243 @@
             configureList();
 
-            setButtonIcons(new String[]{"ok", "cancel"});
+            setButtonIcons("ok", "cancel");
             final JPanel pane = new JPanel(new GridBagLayout());
             pane.add(new JLabel(getTitle()), GBC.eol().fill(GBC.HORIZONTAL));

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -206 +206 @@
 
         private PropertiesMembershipDialog(boolean preselectNew, boolean queryTags, boolean queryMemberships) {
-            super(Main.parent, tr("Tags / Memberships"), new String[]{tr("Unglue"), tr("Cancel")});
-            setButtonIcons(new String[]{"unglueways", "cancel"});
+            super(Main.parent, tr("Tags / Memberships"), tr("Unglue"), tr("Cancel"));
+            setButtonIcons("unglueways", "cancel");
 
             final JPanel content = new JPanel(new GridBagLayout());

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -869 +869 @@
             super(Main.parent,
                     tr("Move elements"),
-                    new String[]{tr("Move them"), tr("Undo move")});
-            setButtonIcons(new String[]{"reorder", "cancel"});
+                    tr("Move them"), tr("Undo move"));
+            setButtonIcons("reorder", "cancel");
             setCancelButton(2);
         }

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

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();