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

Timestamp:

2024-04-22T20:59:26+02:00 (3 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TagCellRenderer.java (modified) (1 diff)
• TagEditorModel.java (modified) (3 diffs)
• TagTable.java (modified) (5 diffs)
• ac/AutoCompEvent.java (modified) (1 diff)
• presets/TaggingPresetMenu.java (modified) (1 diff)
• presets/TaggingPresetSelector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java

@@ -98 +98 @@
         }
 
-        switch(vColIndex) {
+        switch (vColIndex) {
             case 0: renderTagName((TagModel) value); break;
             case 1: renderTagValue((TagModel) value); break;

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -60 +60 @@
      * Creates a new tag editor model. Internally allocates two selection models
      * for row selection and column selection.
-     *
+     * <p>
      * To create a {@link javax.swing.JTable} with this model:
      * <pre>
@@ -157 +157 @@
         TagModel tag = get(row);
         if (tag != null) {
-            switch(col) {
+            switch (col) {
             case 0:
                 updateTagName(tag, (String) value);
@@ -219 +219 @@
     /**
      * adds a tag given by a name/value pair to the tag editor model.
-     *
+     * <p>
      * If there is no tag with name <code>name</code> yet, a new {@link TagModel} is created
      * and append to this model.
-     *
+     * <p>
      * If there is a tag with name <code>name</code>, <code>value</code> is merged to the list
      * of values for this tag.

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -9 +9 @@
 import java.awt.Window;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
@@ -134 +135 @@
      * Action to be run when the user invokes a delete action on the table, for
      * instance by pressing DEL.
-     *
+     * <p>
      * Depending on the shape on the current selection the action deletes individual
      * values or entire tags from the model.
-     *
+     * <p>
      * If the current selection consists of cells in the second column only, the keys of
      * the selected tags are set to the empty string.
-     *
+     * <p>
      * If the current selection consists of cell in the third column only, the values of the
      * selected tags are set to the empty string.
-     *
+     * <p>
      *  If the current selection consists of cells in the second and the third column,
      *  the selected tags are removed from the model.
-     *
+     * <p>
      *  This action listens to the table selection. It becomes enabled when the selection
      *  is non-empty, otherwise it is disabled.
-     *
-     *
      */
     class DeleteAction extends AbstractAction implements ListSelectionListener {
@@ -190 +189 @@
             if (!isEnabled())
                 return;
-            switch(getSelectedColumnCount()) {
+            switch (getSelectedColumnCount()) {
             case 1:
                 if (getSelectedColumn() == 0) {
@@ -351 +350 @@
         addAction = new AddAction();
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-        .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag");
+            .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, InputEvent.CTRL_DOWN_MASK), "addTag");
         getActionMap().put("addTag", addAction);
 
@@ -566 +565 @@
      * This is a custom implementation of the CellEditorRemover used in JTable
      * to handle the client property <code>terminateEditOnFocusLost</code>.
-     *
+     * <p>
      * This implementation also checks whether focus is transferred to one of a list
      * of dedicated components, see {@link TagTable#doNotStopCellEditingWhenFocused}.

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompEvent.java

@@ -80 +80 @@
     public String paramString() {
         String typeStr;
-        switch(id) {
+        switch (id) {
             case AUTOCOMP_BEFORE:
                 typeStr = "AUTOCOMP_BEFORE";

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

@@ -38 +38 @@
     public JMenu menu; // set by TaggingPresets
 
-    private static class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
+    private static final class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
         private static final long serialVersionUID = 1L;
         @Override

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

@@ -75 +75 @@
     private final transient PresetClassifications classifications = new PresetClassifications();
 
-    private static class ResultListCellRenderer implements ListCellRenderer<TaggingPreset> {
+    private static final class ResultListCellRenderer implements ListCellRenderer<TaggingPreset> {
         private final DefaultListCellRenderer def = new DefaultListCellRenderer();
         @Override