Ticket #23220: use-jakarta-annotation.patch

File use-jakarta-annotation.patch, 4.0 KB (added by sebastic, 3 years ago)

Use jakarta.annotation instead of javax.annotation.

  • src/org/openstreetmap/josm/data/notes/Note.java 

    Description: Use jakarta.annotation instead of javax.annotation.
Author: Bas Couwenberg <sebastic@debian.org>
Bug: https://josm.openstreetmap.de/ticket/23220
    a b import java.util.Objects;  
    1111
    1212import org.openstreetmap.josm.data.coor.LatLon;
    1313
    14 import javax.annotation.Nullable;
     14import jakarta.annotation.Nullable;
    1515
    1616/**
    1717 * A map note. It always has at least one comment since a comment is required to create a note on osm.org.

  • src/org/openstreetmap/josm/data/osm/pbf/Blob.java

    a b import java.io.IOException;  
    66import java.io.InputStream;
    77import java.util.zip.InflaterInputStream;
    88
    9 import javax.annotation.Nonnull;
    10 import javax.annotation.Nullable;
     9import jakarta.annotation.Nonnull;
     10import jakarta.annotation.Nullable;
    1111
    1212import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
    1313

  • src/org/openstreetmap/josm/data/osm/pbf/BlobHeader.java

    a b  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm.pbf;
    33
    4 import javax.annotation.Nonnull;
    5 import javax.annotation.Nullable;
     4import jakarta.annotation.Nonnull;
     5import jakarta.annotation.Nullable;
    66
    77/**
    88 * A "BlobHeader" which contains metadata for a {@link Blob}.

  • src/org/openstreetmap/josm/data/osm/pbf/HeaderBlock.java

    a b  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm.pbf;
    33
    4 import javax.annotation.Nonnull;
    5 import javax.annotation.Nullable;
     4import jakarta.annotation.Nonnull;
     5import jakarta.annotation.Nullable;
    66
    77import org.openstreetmap.josm.data.osm.BBox;
    88

  • src/org/openstreetmap/josm/data/osm/pbf/Info.java

    a b  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm.pbf;
    33
    4 import javax.annotation.Nullable;
     4import jakarta.annotation.Nullable;
    55
    66/**
    77 * Optional metadata for primitives

  • src/org/openstreetmap/josm/gui/layer/geoimage/viewers/projections/Equirectangular.java

    a b import java.awt.image.BufferedImage;  
    1212import java.util.Collections;
    1313import java.util.Set;
    1414
    15 import javax.annotation.Nonnull;
    16 import javax.annotation.Nullable;
     15import jakarta.annotation.Nonnull;
     16import jakarta.annotation.Nullable;
    1717
    1818import org.openstreetmap.josm.data.imagery.street_level.Projections;
    1919import org.openstreetmap.josm.gui.layer.geoimage.ImageDisplay;

  • src/org/openstreetmap/josm/gui/util/imagery/CameraPlane.java

    a b import java.awt.image.DataBufferByte;  
    1010import java.awt.image.DataBufferDouble;
    1111import java.awt.image.DataBufferInt;
    1212import java.util.stream.IntStream;
    13 import javax.annotation.Nullable;
     13import jakarta.annotation.Nullable;
    1414
    1515/**
    1616 * The plane that the camera appears on and rotates around.

  • src/org/openstreetmap/josm/io/OsmPbfReader.java

    a b import java.util.Locale;  
    1515import java.util.Map;
    1616import java.util.Set;
    1717
    18 import javax.annotation.Nonnull;
    19 import javax.annotation.Nullable;
     18import jakarta.annotation.Nonnull;
     19import jakarta.annotation.Nullable;
    2020
    2121import org.apache.commons.compress.utils.CountingInputStream;
    2222import org.openstreetmap.josm.data.Bounds;

  • src/org/openstreetmap/josm/io/auth/CredentialsAgent.java

    a b import java.awt.Component;  
    55import java.net.Authenticator.RequestorType;
    66import java.net.PasswordAuthentication;
    77
    8 import javax.annotation.Nullable;
     8import jakarta.annotation.Nullable;
    99
    1010import org.openstreetmap.josm.data.oauth.IOAuthToken;
    1111import org.openstreetmap.josm.data.oauth.OAuthToken;