Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

Timestamp:

2024-04-22T20:59:26+02:00 (7 months 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/download/PlaceSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -106 +107 @@
 
         lpanel.add(new JLabel(tr("Choose the server for searching:")), GBC.std(0, 0).weight(0, 0).insets(0, 0, 5, 0));
-        lpanel.add(serverComboBox, GBC.std(1, 0).fill(GBC.HORIZONTAL));
+        lpanel.add(serverComboBox, GBC.std(1, 0).fill(GridBagConstraints.HORIZONTAL));
         String s = Config.getPref().get("namefinder.server", SERVERS[0].name);
         for (int i = 0; i < SERVERS.length; ++i) {
@@ -118 +119 @@
         cbSearchExpression.setToolTipText(tr("Enter a place name to search for"));
         cbSearchExpression.getModel().prefs().load(HISTORY_KEY);
-        lpanel.add(cbSearchExpression, GBC.std(1, 1).fill(GBC.HORIZONTAL));
-
-        panel.add(lpanel, GBC.std().fill(GBC.HORIZONTAL).insets(5, 5, 0, 5));
+        lpanel.add(cbSearchExpression, GBC.std(1, 1).fill(GridBagConstraints.HORIZONTAL));
+
+        panel.add(lpanel, GBC.std().fill(GridBagConstraints.HORIZONTAL).insets(5, 5, 0, 5));
         SearchAction searchAction = new SearchAction();
         JButton btnSearch = new JButton(searchAction);
@@ -495 +496 @@
                 return this;
             SearchResult sr = (SearchResult) value;
-            switch(column) {
+            switch (column) {
             case 0:
                 setText(sr.getName());