Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 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.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (6 diffs)

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

@@ -8 +8 @@
 import java.awt.Container;
 import java.awt.Font;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Point;
@@ -101 +102 @@
 import org.openstreetmap.josm.gui.dialogs.relation.RelationPopupMenus;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
@@ -293 +294 @@
         boolean presetsVisible = Config.getPref().getBoolean("properties.presets.visible", true);
         if (presetsVisible && top) {
-            bothTables.add(presets, GBC.std().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2).anchor(GBC.NORTHWEST));
+            bothTables.add(presets, GBC.std().fill(GridBagConstraints.HORIZONTAL).insets(5, 2, 5, 2).anchor(GridBagConstraints.NORTHWEST));
             double epsilon = Double.MIN_VALUE; // need to set a weight or else anchor value is ignored
-            bothTables.add(pluginHook, GBC.eol().insets(0, 1, 1, 1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
+            bothTables.add(pluginHook, GBC.eol().insets(0, 1, 1, 1).anchor(GridBagConstraints.NORTHEAST).weight(epsilon, epsilon));
         }
         bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
-        bothTables.add(tagTableFilter, GBC.eol().fill(GBC.HORIZONTAL));
-        bothTables.add(tagTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
-        bothTables.add(tagTable, GBC.eol().fill(GBC.BOTH));
-        bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
-        bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
+        bothTables.add(tagTableFilter, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+        bothTables.add(tagTable.getTableHeader(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+        bothTables.add(tagTable, GBC.eol().fill(GridBagConstraints.BOTH));
+        bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+        bothTables.add(membershipTable, GBC.eol().fill(GridBagConstraints.BOTH));
         if (presetsVisible && !top) {
-            bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
+            bothTables.add(presets, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(5, 2, 5, 2));
         }
 
@@ -1504 +1505 @@
      * Clears the row selection when it is filtered away by the row sorter.
      */
-    private class RemoveHiddenSelection implements ListSelectionListener, RowSorterListener {
+    private final class RemoveHiddenSelection implements ListSelectionListener, RowSorterListener {
 
         void removeHiddenSelection() {
@@ -1527 +1528 @@
     }
 
-    private class HoverPreviewPropListener implements ValueChangeListener<Boolean> {
+    private final class HoverPreviewPropListener implements ValueChangeListener<Boolean> {
         @Override
         public void valueChanged(ValueChangeEvent<? extends Boolean> e) {
@@ -1542 +1543 @@
      * Otherwise user would need to change selection to see the preference change take effect.
      */
-    private class HoverPreviewPreferSelectionPropListener implements ValueChangeListener<Boolean> {
+    private final class HoverPreviewPreferSelectionPropListener implements ValueChangeListener<Boolean> {
         @Override
         public void valueChanged(ValueChangeEvent<? extends Boolean> e) {