Skip to content

Commit f4ef47c

Browse files
PaulWoitaschekEric Kuck
authored andcommitted
Added missing nullity annotations for the pager adapters (#219)
1 parent 769d552 commit f4ef47c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

conductor-support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.os.Parcelable;
5+
import android.support.annotation.NonNull;
56
import android.support.annotation.Nullable;
67
import android.support.v4.view.PagerAdapter;
78
import android.util.SparseArray;
@@ -34,14 +35,15 @@ public abstract class ControllerPagerAdapter extends PagerAdapter {
3435
/**
3536
* Creates a new ControllerPagerAdapter using the passed host.
3637
*/
37-
public ControllerPagerAdapter(Controller host, boolean saveControllerState) {
38+
public ControllerPagerAdapter(@NonNull Controller host, boolean saveControllerState) {
3839
this.host = host;
3940
savesState = saveControllerState;
4041
}
4142

4243
/**
4344
* Return the Controller associated with a specified position.
4445
*/
46+
@NonNull
4547
public abstract Controller getItem(int position);
4648

4749
@Override

conductor-support/src/main/java/com/bluelinelabs/conductor/support/RouterPagerAdapter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Bundle;
44
import android.os.Parcelable;
5+
import android.support.annotation.NonNull;
56
import android.support.annotation.Nullable;
67
import android.support.v4.view.PagerAdapter;
78
import android.util.SparseArray;
@@ -28,7 +29,7 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
2829
/**
2930
* Creates a new RouterPagerAdapter using the passed host.
3031
*/
31-
public RouterPagerAdapter(Controller host) {
32+
public RouterPagerAdapter(@NonNull Controller host) {
3233
this.host = host;
3334
}
3435

@@ -38,7 +39,7 @@ public RouterPagerAdapter(Controller host) {
3839
* @param router The router used for the page
3940
* @param position The page position to be instantiated.
4041
*/
41-
public abstract void configureRouter(Router router, int position);
42+
public abstract void configureRouter(@NonNull Router router, int position);
4243

4344
@Override
4445
public Object instantiateItem(ViewGroup container, int position) {

demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class PagerController extends BaseController {
3030
public PagerController() {
3131
pagerAdapter = new RouterPagerAdapter(this) {
3232
@Override
33-
public void configureRouter(Router router, int position) {
33+
public void configureRouter(@NonNull Router router, int position) {
3434
if (!router.hasRootController()) {
3535
Controller page = new ChildController(String.format(Locale.getDefault(), "Child #%d (Swipe to see more)", position), PAGE_COLORS[position], true);
3636
router.setRoot(RouterTransaction.with(page));

0 commit comments

Comments
 (0)