Ticket #24951: sonar-grid-oauth.patch

src/org/openstreetmap/josm/actions/AlignGridRotationAction.java

@@ -26 +26 @@
  */
 public class AlignGridRotationAction extends JosmAction {
 
+    /** returned when the selection does not define a direction */
+    private static final EastNorth[] EMPTY_DIRECTION = new EastNorth[0];
+
     /**
      * Constructs a new {@code AlignGridRotationAction}.
      */
@@ -39 +42 @@
     /**
      * Determines the direction given by the selection: a single way with at least two nodes, or exactly two nodes.
      * @param ds the data set, may be null
-     * @return start and end point, or {@code null} if the selection does not define a direction
+     * @return start and end point, or an empty array if the selection does not define a direction
      */
     static EastNorth[] getSelectedDirection(DataSet ds) {
         if (ds == null) {
-            return null;
+            return EMPTY_DIRECTION;
         }
         Collection<Way> ways = ds.getSelectedWays();
         Collection<Node> nodes = ds.getSelectedNodes();
@@ -61 +64 @@
             b = it.next();
         }
         if (a == null || b == null || !a.isLatLonKnown() || !b.isLatLonKnown()) {
-            return null;
+            return EMPTY_DIRECTION;
         }
         EastNorth[] result = {a.getEastNorth(), b.getEastNorth()};
-        return result[0].equalsEpsilon(result[1], 1e-9) ? null : result;
+        return result[0].equalsEpsilon(result[1], 1e-9) ? EMPTY_DIRECTION : result;
     }
 
     /**
@@ -85 +88 @@
 
     @Override
     protected void updateEnabledState() {
-        setEnabled(getSelectedDirection(getLayerManager().getEditDataSet()) != null);
+        setEnabled(getSelectedDirection(getLayerManager().getEditDataSet()).length == 2);
     }
 
     @Override
@@ -96 +99 @@
     @Override
     public void actionPerformed(ActionEvent e) {
         EastNorth[] direction = getSelectedDirection(getLayerManager().getEditDataSet());
-        if (direction == null) {
+        if (direction.length != 2) {
             return;
         }
         MapGridPaintable.ROTATION.put(rotationOf(direction[0], direction[1]));

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -124 +124 @@
      */
     public final MapView mapView;
     /** The grid drawn over the map view, see {@link MapGridPaintable} */
-    private final MapGridPaintable gridOverlay = new MapGridPaintable();
+    private final transient MapGridPaintable gridOverlay = new MapGridPaintable();
 
     /**
      * This object allows to detect key press and release events

src/org/openstreetmap/josm/gui/layer/MapGridPaintable.java

@@ -12 +12 @@
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
@@ -137 +137 @@
     private static final int MAX_LINES = 500;
 
     /** written by {@link #paint} and read by {@link #preferenceChanged}, which may run on another thread */
-    private volatile MapView mapView;
+    private final AtomicReference<MapView> mapView = new AtomicReference<>();
 
     /**
      * Constructs a new {@code MapGridPaintable}.
@@ -148 +148 @@
 
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-        mapView = mv;
+        mapView.set(mv);
         if (!Boolean.TRUE.equals(ENABLED.get()) || mv.getWidth() <= 0 || mv.getHeight() <= 0) {
             return;
         }
@@ -318 +318 @@
             if (!a.isValid() || !b.isValid()) {
                 return 1;
             }
-            double metres = a.greatCircleDistance((ILatLon) b);
+            double metres = a.greatCircleDistance(b);
             return metres > 0 && Double.isFinite(metres) ? step / metres : 1;
         } catch (IllegalArgumentException e) {
             Logging.trace(e);
@@ -357 +357 @@
     public static List<ProjectedGridLine> getProjectedGridLines(ProjectionBounds area, double spacingX, double spacingY,
             double rotationDegrees, double originX, double originY) {
         List<ProjectedGridLine> lines = new ArrayList<>();
-        if (!(spacingX > 0) || !(spacingY > 0)) {
+        if (!isPositive(spacingX) || !isPositive(spacingY)) {
             return lines;
         }
         double angle = Math.toRadians(rotationDegrees);
@@ -420 +420 @@
     public static List<LatLonGridLine> getLatLonGridLines(Bounds area, Bounds world, double spacingLon, double spacingLat,
             double originLon, double originLat, int segments) {
         List<LatLonGridLine> lines = new ArrayList<>();
-        if (!(spacingLon > 0) || !(spacingLat > 0) || segments < 1) {
+        if (!isPositive(spacingLon) || !isPositive(spacingLat) || segments < 1) {
             return lines;
         }
         double minLat = Math.max(area.getMinLat(), world.getMinLat());
@@ -445 +445 @@
         boolean limitedLon = world.getMinLon() > -180 || world.getMaxLon() < 180;
         for (long k = kLonMin; k <= kLonMax; k++) {
             double lon = LatLon.toIntervalLon(originLon + k * spacingLon);
-            if (limitedLon && (lon < world.getMinLon() || lon > world.getMaxLon())) {
-                continue;
-            }
-            List<LatLon> line = new ArrayList<>(segments + 1);
-            for (int i = 0; i <= segments; i++) {
-                line.add(new LatLon(minLat + (maxLat - minLat) * i / segments, lon));
+            if (!limitedLon || (lon >= world.getMinLon() && lon <= world.getMaxLon())) {
+                addMeridian(lines, lon, minLat, maxLat, segments);
             }
-            lines.add(new LatLonGridLine(line, true));
         }
         for (long k = kLatMin; k <= kLatMax; k++) {
             double lat = originLat + k * spacingLat;
@@ -464 +459 @@
         return lines;
     }
 
+    /**
+     * Adds a meridian running from one latitude to another.
+     * @param lines the list to add to
+     * @param lon the longitude of the meridian
+     * @param minLat the latitude to start at
+     * @param maxLat the latitude to end at
+     * @param segments number of segments of the polyline
+     */
+    private static void addMeridian(List<LatLonGridLine> lines, double lon, double minLat, double maxLat, int segments) {
+        List<LatLon> line = new ArrayList<>(segments + 1);
+        for (int i = 0; i <= segments; i++) {
+            line.add(new LatLon(minLat + (maxLat - minLat) * i / segments, lon));
+        }
+        lines.add(new LatLonGridLine(line, true));
+    }
+
     /**
      * Adds a parallel running from one longitude to another. A parallel which crosses the antimeridian is added
      * as two lines, one on each side of it: wrapping the longitudes of a single polyline would instead make it
@@ -480 +491 @@
             addParallel(lines, lat, -180, maxLon - 360, segments);
             return;
         }
-        if (!(maxLon > minLon)) {
+        if (maxLon <= minLon) {
             return;
         }
         List<LatLon> line = new ArrayList<>(segments + 1);
@@ -490 +501 @@
         lines.add(new LatLonGridLine(line, false));
     }
 
+    /**
+     * Determines if a value is strictly positive. Unlike {@code value <= 0}, this rejects NaN.
+     * @param value the value
+     * @return {@code true} if the value is greater than 0
+     */
+    private static boolean isPositive(double value) {
+        return value > 0;
+    }
+
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
         if (e.getKey().startsWith(PREFIX) || e.getKey().equals(COLOR_EAST.getKey()) || e.getKey().equals(COLOR_NORTH.getKey())) {
             invalidate();
-            if (mapView != null) {
-                mapView.repaint();
+            MapView mv = mapView.get();
+            if (mv != null) {
+                mv.repaint();
             }
         }
     }
@@ -503 +524 @@
     @Override
     public void destroy() {
         Config.getPref().removePreferenceChangeListener(this);
-        mapView = null;
+        mapView.set(null);
     }
 }

src/org/openstreetmap/josm/gui/layer/imagery/ShowTileBordersAction.java

@@ -20 +20 @@
  */
 public class ShowTileBordersAction extends AbstractAction implements LayerAction {
 
-    private final AbstractTileSourceLayer<?> layer;
+    private final transient AbstractTileSourceLayer<?> layer;
 
     /**
      * Constructs a new {@code ShowTileBordersAction}.

src/org/openstreetmap/josm/gui/preferences/display/GridPreference.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -100 +101 @@
 
         panel.add(enabled, GBC.eol().insets(0, 0, 0, 10));
         panel.add(new JLabel(tr("Grid type")), GBC.std().insets(5, 0, 5, 5));
-        panel.add(type, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
+        panel.add(type, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 0, 0, 5));
         panel.add(spacingXLabel, GBC.std().insets(5, 0, 5, 5));
         panel.add(spacingX, GBC.eol().insets(0, 0, 0, 5));
         panel.add(spacingYLabel, GBC.std().insets(5, 0, 5, 5));
@@ -116 +117 @@
         panel.add(new JLabel(tr("Line width (pixels)")), GBC.std().insets(5, 0, 5, 5));
         panel.add(lineWidth, GBC.eol().insets(0, 0, 0, 5));
         panel.add(new JLabel(tr("Blend mode")), GBC.std().insets(5, 0, 5, 5));
-        panel.add(blendMode, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
-        panel.add(GBC.glue(0, 0), GBC.eol().fill(GBC.BOTH));
+        panel.add(blendMode, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 0, 0, 5));
+        panel.add(GBC.glue(0, 0), GBC.eol().fill(GridBagConstraints.BOTH));
 
         createPreferenceTabWithScrollPane(gui, panel);
     }
@@ -142 +143 @@
 
     /** Renders enum values with a translated name */
     private static final class TranslatedRenderer<T> extends DefaultListCellRenderer {
-        private final Function<T, String> name;
+        private final transient Function<T, String> name;
 
         TranslatedRenderer(Function<T, String> name) {
             this.name = name;
@@ -178 +179 @@
     private static void save(JosmTextField field, DoubleProperty property, boolean positive) {
         try {
             double value = FORMAT.parse(field.getText().trim()).doubleValue();
-            if (positive && !(value > 0)) {
+            if (positive && (Double.isNaN(value) || value <= 0)) {
                 Logging.warn("Ignoring invalid grid setting {0}: {1}", property.getKey(), field.getText());
                 return;
             }

test/unit/org/openstreetmap/josm/actions/GridActionsTest.java

@@ -164 +164 @@
             ds.addPrimitive(w);
 
             ds.setSelected();
-            assertNull(AlignGridRotationAction.getSelectedDirection(ds));
+            assertEquals(0, AlignGridRotationAction.getSelectedDirection(ds).length);
             AlignGridRotationAction action = new AlignGridRotationAction();
             assertFalse(action.isEnabled());
             ds.setSelected(a);
-            assertNull(AlignGridRotationAction.getSelectedDirection(ds));
+            assertEquals(0, AlignGridRotationAction.getSelectedDirection(ds).length);
             assertFalse(action.isEnabled());
             ds.setSelected(a, b, c);
-            assertNull(AlignGridRotationAction.getSelectedDirection(ds));
+            assertEquals(0, AlignGridRotationAction.getSelectedDirection(ds).length);
             assertFalse(action.isEnabled());
 
             ds.setSelected(a, b);

test/unit/org/openstreetmap/josm/io/OsmConnectionTest.java

@@ -8 +8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 
 import javax.swing.JOptionPane;
 
@@ -59 +59 @@
     }
 
     private static HttpClient apiRequest() throws MalformedURLException {
-        return HttpClient.create(new URL(API_URL + "/0.6/changeset/create"), "PUT");
+        return HttpClient.create(URI.create(API_URL + "/0.6/changeset/create").toURL(), "PUT");
     }
 
     /**