Changeset 19635 in josm for trunk

Timestamp:

2026-10-01T22:25:40+02:00 (2 days ago)

Author:

stoecker

Message:

see #24635 - fix some PMD warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (2 diffs)
• actions/mapmode/SplitMode.java (modified) (3 diffs)
• data/gpx/GpxImageCorrelation.java (modified) (2 diffs)
• data/imagery/vectortile/mapbox/MapboxVectorCachedTileLoader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -72 +72 @@
         final JTabbedPane about = new JTabbedPane();
 
-        Version version = Version.getInstance();
-
         JosmTextArea readme = new JosmTextArea();
         readme.setFont(GuiHelper.getMonospacedFont(readme));
@@ -79 +77 @@
         setTextFromResourceFile(readme, "/README");
         readme.setCaretPosition(0);
+
+        Version version = Version.getInstance();
 
         JosmTextArea revision = new JosmTextArea();

trunk/src/org/openstreetmap/josm/actions/mapmode/SplitMode.java

@@ -115 +115 @@
         MapView mv = MainApplication.getMap().mapView;
         int mouseDownButton = e.getButton();
-        Point mousePos = e.getPoint();
 
         // return early
@@ -150 +149 @@
 
             if (applicableWays.size() > 1) {
+                Point mousePos = e.getPoint();
                 createPopup(n, applicableWays).show(mv, mousePos.x, mousePos.y);
             } else {
@@ -159 +159 @@
             }
         } else if (nearestPrimitive instanceof Way && !((Way) nearestPrimitive).isClosed()) {
-            addNodeAndSplit(mv, mousePos, (Way) nearestPrimitive);
+            addNodeAndSplit(mv, e.getPoint(), (Way) nearestPrimitive);
             if (updateUserFeedback(e)) {
                 MainApplication.getMap().mapView.repaint();

trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java

@@ -37 +37 @@
      */
     public static int matchGpxTrack(List<? extends GpxImageEntry> images, GpxData selectedGpx, GpxImageCorrelationSettings settings) {
-        int ret = 0;
-
         if (Logging.isDebugEnabled()) {
             Logging.debug("Correlating {0} images to {1} GPX track segments using {2}",
@@ -82 +80 @@
         long prevWpTime = 0;
         WayPoint prevWp = null;
+
+        int ret = 0;
 
         for (List<List<WayPoint>> segs : loadTracks(selectedGpx.getTracks())) {

trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorCachedTileLoader.java

@@ -62 +62 @@
     }
 
-    @SuppressWarnings("PMD.CloseResource") /* closed in shutdown() */
     @Override
     public void cancelOutstandingTasks() {