From 4d638b0b025efa4f27a77ac2edf34146d3fe9214 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 30 Nov 2018 15:23:17 +0100 Subject: [PATCH] Use androidx.annotation rather than JSR305 annotations. --- oeffi/build.gradle | 1 - oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java | 2 +- .../de/schildbach/oeffi/directions/DirectionsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/directions/LocationView.java | 3 +-- .../de/schildbach/oeffi/directions/TripsGalleryAdapter.java | 3 +-- .../de/schildbach/oeffi/directions/TripsOverviewActivity.java | 2 +- .../directions/list/QueryHistoryContextMenuItemListener.java | 4 ++-- oeffi/src/de/schildbach/oeffi/network/NetworkResources.java | 3 +-- .../de/schildbach/oeffi/network/list/NetworkViewHolder.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java | 3 +-- oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java | 3 +-- .../schildbach/oeffi/stations/FavoriteStationsActivity.java | 3 +-- .../de/schildbach/oeffi/stations/NetworkContentProvider.java | 3 +-- oeffi/src/de/schildbach/oeffi/stations/Station.java | 4 ++-- .../de/schildbach/oeffi/stations/StationDetailsActivity.java | 3 +-- oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 3 +-- .../oeffi/stations/list/FavoriteStationsAdapter.java | 3 +-- .../oeffi/stations/list/StationContextMenuItemListener.java | 4 ++-- .../de/schildbach/oeffi/stations/list/StationViewHolder.java | 3 +-- .../src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java | 3 +-- oeffi/src/de/schildbach/oeffi/util/Downloader.java | 3 +-- 24 files changed, 26 insertions(+), 44 deletions(-) diff --git a/oeffi/build.gradle b/oeffi/build.gradle index bf05690..a65a336 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -20,7 +20,6 @@ dependencies { compile 'org.osmdroid:osmdroid-android:6.0.2' compile 'org.slf4j:slf4j-api:1.7.25' compile 'com.github.tony19:logback-android:1.3.0-2' - compile 'com.google.code.findbugs:jsr305:3.0.0' testCompile 'junit:junit:4.12' } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index f7be833..67910cd 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import androidx.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index 3b94887..5fcc55d 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -30,7 +30,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; import javax.net.ssl.SSLException; import org.osmdroid.api.IGeoPoint; @@ -131,6 +130,7 @@ import android.widget.Filterable; import android.widget.PopupMenu; import android.widget.TextView; import android.widget.TimePicker; +import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java index 6f6f030..a84c649 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java +++ b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java @@ -19,8 +19,6 @@ package de.schildbach.oeffi.directions; import java.util.Locale; -import javax.annotation.Nullable; - import com.google.common.base.Strings; import de.schildbach.oeffi.Constants; @@ -59,6 +57,7 @@ import android.widget.FrameLayout; import android.widget.ListAdapter; import android.widget.PopupMenu; import android.widget.TextView.OnEditorActionListener; +import androidx.annotation.Nullable; public class LocationView extends FrameLayout implements LocationHelper.Callback { public static interface Listener { diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java index 27b1e53..be37627 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; - import com.google.common.base.Preconditions; import de.schildbach.oeffi.R; @@ -58,6 +56,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Adapter; import android.widget.BaseAdapter; +import androidx.annotation.Nullable; public final class TripsGalleryAdapter extends BaseAdapter { private List trips = Collections.emptyList(); diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index 9533165..12f2b54 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -33,7 +33,6 @@ import java.util.NavigableSet; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; import javax.net.ssl.SSLException; import org.slf4j.Logger; @@ -77,6 +76,7 @@ import android.view.View.OnClickListener; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.TextView; +import androidx.annotation.Nullable; public class TripsOverviewActivity extends OeffiActivity { private static final String INTENT_EXTRA_NETWORK = TripsOverviewActivity.class.getName() + ".network"; diff --git a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java index da23d7b..fb6b184 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java @@ -17,10 +17,10 @@ package de.schildbach.oeffi.directions.list; -import javax.annotation.Nullable; - import de.schildbach.pte.dto.Location; +import androidx.annotation.Nullable; + public interface QueryHistoryContextMenuItemListener { boolean onQueryHistoryContextMenuItemClick(int adapterPosition, Location from, Location to, @Nullable byte[] serializedSavedTrip, int menuItemId, @Nullable Location menuItemLocation); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java index 9f65bb1..0d0c376 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java @@ -21,11 +21,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Locale; -import javax.annotation.Nullable; - import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; +import androidx.annotation.Nullable; public class NetworkResources { public final @Nullable Drawable icon; diff --git a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java index 7093aaa..5e0e65d 100644 --- a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java @@ -17,8 +17,6 @@ package de.schildbach.oeffi.network.list; -import javax.annotation.Nullable; - import de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; @@ -30,6 +28,7 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; public class NetworkViewHolder extends RecyclerView.ViewHolder { diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index 33eabb2..2edbf0e 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -28,8 +28,6 @@ import java.util.Locale; import java.util.Set; import java.util.TreeSet; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,6 +82,7 @@ import android.view.animation.AnimationUtils; import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; +import androidx.annotation.Nullable; import okhttp3.HttpUrl; public class PlanActivity extends Activity { diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java index 03d3034..a889790 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java @@ -37,8 +37,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,6 +61,7 @@ import android.database.CursorWrapper; import android.database.MatrixCursor; import android.net.Uri; import android.provider.BaseColumns; +import androidx.annotation.Nullable; import okhttp3.HttpUrl; public class PlanContentProvider extends ContentProvider { diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index 489a068..e7f6847 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -20,8 +20,6 @@ package de.schildbach.oeffi.plans; import java.io.File; import java.net.HttpURLConnection; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,6 +59,7 @@ import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.core.content.pm.ShortcutInfoCompat; diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java index 2b99bd9..d2e04bd 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java @@ -19,8 +19,6 @@ package de.schildbach.oeffi.plans.list; import java.util.Date; -import javax.annotation.Nullable; - import de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; @@ -37,6 +35,7 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import okhttp3.Call; diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java index 58448ac..d0ea00e 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java @@ -24,8 +24,6 @@ import java.io.IOException; import java.util.Date; import java.util.List; -import javax.annotation.Nullable; - import de.schildbach.oeffi.Application; import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -40,6 +38,7 @@ import android.os.Handler; import android.provider.BaseColumns; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import okhttp3.Cache; import okhttp3.Call; diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java index 27005a3..f6c668d 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java @@ -21,8 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.annotation.Nullable; - import de.schildbach.oeffi.MyActionBar; import de.schildbach.oeffi.OeffiActivity; import de.schildbach.oeffi.R; @@ -42,6 +40,7 @@ import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.ViewAnimator; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/oeffi/src/de/schildbach/oeffi/stations/NetworkContentProvider.java b/oeffi/src/de/schildbach/oeffi/stations/NetworkContentProvider.java index a6ec7cf..897e93c 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/NetworkContentProvider.java +++ b/oeffi/src/de/schildbach/oeffi/stations/NetworkContentProvider.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Locale; import java.util.regex.Pattern; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,6 +45,7 @@ import android.database.Cursor; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; +import androidx.annotation.Nullable; import okhttp3.HttpUrl; public final class NetworkContentProvider extends ContentProvider { diff --git a/oeffi/src/de/schildbach/oeffi/stations/Station.java b/oeffi/src/de/schildbach/oeffi/stations/Station.java index b4cfb91..7ea7b61 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/Station.java +++ b/oeffi/src/de/schildbach/oeffi/stations/Station.java @@ -23,8 +23,6 @@ import java.util.Date; import java.util.EnumSet; import java.util.List; -import javax.annotation.Nullable; - import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.LineDestination; @@ -32,6 +30,8 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; +import androidx.annotation.Nullable; + public class Station { public final NetworkId network; public Location location; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 90f7852..e1bbf23 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -31,8 +31,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; - import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,6 +85,7 @@ import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.ViewAnimator; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 4787aa5..be1bf70 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -36,8 +36,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nullable; - import org.osmdroid.util.BoundingBox; import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; @@ -123,6 +121,7 @@ import android.widget.Button; import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; +import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.ItemTouchHelper; diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java index 4007a40..6c1f74f 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java @@ -17,8 +17,6 @@ package de.schildbach.oeffi.stations.list; -import javax.annotation.Nullable; - import de.schildbach.oeffi.R; import de.schildbach.oeffi.stations.FavoriteStationsProvider; import de.schildbach.pte.NetworkId; @@ -31,6 +29,7 @@ import android.net.Uri; import android.provider.BaseColumns; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; public class FavoriteStationsAdapter extends RecyclerView.Adapter { diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java index 6167964..aa93d1a 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java @@ -19,12 +19,12 @@ package de.schildbach.oeffi.stations.list; import java.util.List; -import javax.annotation.Nullable; - import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; +import androidx.annotation.Nullable; + public interface StationContextMenuItemListener { boolean onStationContextMenuItemClick(int adapterPosition, NetworkId network, Location station, @Nullable List departures, int menuItemId); diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java index bd92cd0..f2d3e8a 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.annotation.Nullable; - import com.google.common.base.Joiner; import de.schildbach.oeffi.Constants; @@ -61,6 +59,7 @@ import android.widget.ImageButton; import android.widget.PopupMenu; import android.widget.PopupMenu.OnMenuItemClickListener; import android.widget.TextView; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; public class StationViewHolder extends RecyclerView.ViewHolder { diff --git a/oeffi/src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java b/oeffi/src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java index 31c3f98..e4748db 100644 --- a/oeffi/src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java +++ b/oeffi/src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java @@ -17,8 +17,6 @@ package de.schildbach.oeffi.util; -import javax.annotation.Nullable; - import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -31,6 +29,7 @@ import android.view.View; import android.webkit.WebChromeClient; import android.webkit.WebSettings; import android.webkit.WebView; +import androidx.annotation.Nullable; import okhttp3.HttpUrl; public class ChangelogDialogBuilder extends AlertDialog.Builder { diff --git a/oeffi/src/de/schildbach/oeffi/util/Downloader.java b/oeffi/src/de/schildbach/oeffi/util/Downloader.java index 50be369..ae92d55 100644 --- a/oeffi/src/de/schildbach/oeffi/util/Downloader.java +++ b/oeffi/src/de/schildbach/oeffi/util/Downloader.java @@ -32,8 +32,6 @@ import java.util.Date; import java.util.Random; import java.util.concurrent.Semaphore; -import javax.annotation.Nullable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +42,7 @@ import com.google.common.util.concurrent.Striped; import de.schildbach.oeffi.Application; import de.schildbach.oeffi.util.bzip2.BZip2CompressorInputStream; +import androidx.annotation.Nullable; import okhttp3.Call; import okhttp3.Callback; import okhttp3.Headers;