Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

Timestamp:

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

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

@@ -5 +5 @@
 import java.awt.ComponentOrientation;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -18 +19 @@
 
 import javax.swing.Icon;
+import javax.swing.JTextField;
+import javax.swing.RepaintManager;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.JTextField;
-import javax.swing.RepaintManager;
 import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
@@ -254 +255 @@
      */
     public static Color getHintTextColor() {
-        var color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
+        Color color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
         if (color == null)
             color = UIManager.getColor("TextField.inactiveForeground");
@@ -305 +306 @@
             g.drawString(getHint(), x, getBaseline(getWidth(), getHeight()));
         } else {
-            final var metrics = g.getFontMetrics(g.getFont());
+            FontMetrics metrics = g.getFontMetrics(g.getFont());
             int dx = metrics.stringWidth(getHint());
             g.drawString(getHint(), x - dx, getBaseline(getWidth(), getHeight()));