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

Timestamp:

2024-04-19T16:21:11+02:00 (8 months ago)

Author:

taylor.smock

Message:

Dependency updates

ivy.xml

• org.eclipse.parsson:parsson: 1.1.5 -> 1.1.6
• org.apache.commons:commons-compress: 1.25.0 -> 1.26.1
  • Note: This deprecated some functions
• ch.poole:OpeningHoursParser: 0.28.1 -> 0.28.2
• org.jacoco:org.jacoco.ant: 0.8.11 -> 0.8.12
• com.github.spotbugs:spotbugs-annotations: 4.8.3 -> 4.8.4
• com.github.tomakehurst:wiremock: 2.35.0 -> 3.0.1
• io.github.classgraph:classgraph: 4.8.165 -> 4.8.171
• nl.jqno.equalsverifier:equalsverifier: 3.15.6 -> 3.16.1
• org.awaitility:awaitility: 4.2.0 -> 4.2.1

tools/ivy.xml

• com.puppycrawl.tools:checkstyle: 9.3 -> 10.15.0
• com.github.spotbugs:spotbugs: 4.8.3 -> 4.8.4
• com.google.errorprone: 2.(10.0|24.1) -> 2.26.1
• net.sourceforge.pmd:pmd was not updated to 7.0.0 due to a significant number of false positives.

There were some additional changes to cleanup new warnings and remove some
additional Java 8 files. There are more warnings that need to be cleaned up.

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (modified) (6 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;
@@ -19 +18 @@
 
 import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 import javax.swing.JTextField;
 import javax.swing.RepaintManager;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
@@ -30 +29 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -254 +254 @@
      */
     public static Color getHintTextColor() {
-        Color color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
+        var color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
         if (color == null)
             color = UIManager.getColor("TextField.inactiveForeground");
@@ -290 +290 @@
         int x;
         try {
-            x = modelToView(0).x;
+            x = (int) Math.round(modelToView2D(0).getX());
         } catch (BadLocationException exc) {
+            Logging.trace(exc);
             return; // can't happen
         }
@@ -304 +305 @@
             g.drawString(getHint(), x, getBaseline(getWidth(), getHeight()));
         } else {
-            FontMetrics metrics = g.getFontMetrics(g.getFont());
+            final var metrics = g.getFontMetrics(g.getFont());
             int dx = metrics.stringWidth(getHint());
             g.drawString(getHint(), x - dx, getBaseline(getWidth(), getHeight()));