Changeset 19101 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2024-06-11T23:53:20+02:00 (23 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x

I haven't updated to PMD 7.x in ivy/maven yet since I still have 83 PMD violations
to go through, and I don't know (yet) if any of them were supposed to be ignored
by the xpath expressions in tools/pmd/josm-ruleset.xml.

I may re-enable some of the PMD checks I've temporarily disabled prior to committing
the update for PMD.

Additionally cleanup some SonarLint issues in the modified files.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -59 +59 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.event.CellEditorListener;
@@ -112 +113 @@
  */
 public abstract class SourceEditor extends JPanel {
+    private static final String DELETE = "delete";
+    private static final String DIALOGS = "dialogs";
 
     /** the type of source entry **/
@@ -219 +222 @@
         RemoveActiveSourcesAction removeActiveSourcesAction = new RemoveActiveSourcesAction();
         tblActiveSources.getSelectionModel().addListSelectionListener(removeActiveSourcesAction);
-        tblActiveSources.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
-        tblActiveSources.getActionMap().put("delete", removeActiveSourcesAction);
+        tblActiveSources.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), DELETE);
+        tblActiveSources.getActionMap().put(DELETE, removeActiveSourcesAction);
 
         MoveUpDownAction moveUp = null;
@@ -297 +300 @@
         gbc.insets = new Insets(0, 0, 0, 6);
 
-        JToolBar sideButtonTB = new JToolBar(JToolBar.VERTICAL);
+        JToolBar sideButtonTB = new JToolBar(SwingConstants.VERTICAL);
         sideButtonTB.setFloatable(false);
         sideButtonTB.setBorderPainted(false);
@@ -363 +366 @@
         RemoveIconPathAction removeIconPathAction = new RemoveIconPathAction();
         tblIconPaths.getSelectionModel().addListSelectionListener(removeIconPathAction);
-        tblIconPaths.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
-        tblIconPaths.getActionMap().put("delete", removeIconPathAction);
+        tblIconPaths.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), DELETE);
+        tblIconPaths.getActionMap().put(DELETE, removeIconPathAction);
 
         gbc.gridx = 0;
@@ -721 +724 @@
             data = IntStream.range(0, data.size())
                     .filter(i -> !idxs.contains(i))
-                    .mapToObj(i -> data.get(i))
+                    .mapToObj(data::get)
                     .collect(Collectors.toList());
             fireTableDataChanged();
@@ -909 +912 @@
             putValue(NAME, tr("New"));
             putValue(SHORT_DESCRIPTION, getStr(I18nString.NEW_SOURCE_ENTRY_TOOLTIP));
-            new ImageProvider("dialogs", "add").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, "add").getResource().attachImageIcon(this);
         }
 
@@ -939 +942 @@
             putValue(NAME, tr("Remove"));
             putValue(SHORT_DESCRIPTION, getStr(I18nString.REMOVE_SOURCE_TOOLTIP));
-            new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, DELETE).getResource().attachImageIcon(this);
             updateEnabledState();
         }
@@ -962 +965 @@
             putValue(NAME, tr("Edit"));
             putValue(SHORT_DESCRIPTION, getStr(I18nString.EDIT_SOURCE_TOOLTIP));
-            new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, "edit").getResource().attachImageIcon(this);
             updateEnabledState();
         }
@@ -1008 +1011 @@
         MoveUpDownAction(boolean isDown) {
             increment = isDown ? 1 : -1;
-            new ImageProvider("dialogs", isDown ? "down" : "up").getResource().attachImageIcon(this, true);
+            new ImageProvider(DIALOGS, isDown ? "down" : "up").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, isDown ? tr("Move the selected entry one row down.") : tr("Move the selected entry one row up."));
             updateEnabledState();
@@ -1110 +1113 @@
             putValue(NAME, tr("Reload"));
             putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url));
-            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, "refresh").getResource().attachImageIcon(this);
             this.url = url;
             this.sourceProviders = sourceProviders;
@@ -1252 +1255 @@
             putValue(NAME, tr("New"));
             putValue(SHORT_DESCRIPTION, tr("Add a new icon path"));
-            new ImageProvider("dialogs", "add").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, "add").getResource().attachImageIcon(this);
         }
 
@@ -1266 +1269 @@
             putValue(NAME, tr("Remove"));
             putValue(SHORT_DESCRIPTION, tr("Remove the selected icon paths"));
-            new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, DELETE).getResource().attachImageIcon(this);
             updateEnabledState();
         }
@@ -1289 +1292 @@
             putValue(NAME, tr("Edit"));
             putValue(SHORT_DESCRIPTION, tr("Edit the selected icon path"));
-            new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this);
+            new ImageProvider(DIALOGS, "edit").getResource().attachImageIcon(this);
             updateEnabledState();
         }
@@ -1608 +1611 @@
         public void setInitialValue(String initialValue) {
             this.value = initialValue;
-            if (initialValue == null) {
-                this.tfFileName.setText("");
-            } else {
-                this.tfFileName.setText(initialValue);
-            }
+            this.tfFileName.setText(Objects.requireNonNullElse(initialValue, ""));
         }