From f4ef47c2d271ef4e18387cf1bd3fdb35663c7f5e Mon Sep 17 00:00:00 2001
From: Paul Woitaschek <woitaschek@posteo.de>
Date: Thu, 2 Feb 2017 15:21:38 +0100
Subject: [PATCH] Added missing nullity annotations for the pager adapters
 (#219)

---
 .../conductor/support/ControllerPagerAdapter.java            | 4 +++-
 .../bluelinelabs/conductor/support/RouterPagerAdapter.java   | 5 +++--
 .../conductor/demo/controllers/PagerController.java          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/conductor-support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java b/conductor-support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java
index 53ec15d..98f35f3 100644
--- a/conductor-support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java
+++ b/conductor-support/src/main/java/com/bluelinelabs/conductor/support/ControllerPagerAdapter.java
@@ -2,6 +2,7 @@ package com.bluelinelabs.conductor.support;
 
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.PagerAdapter;
 import android.util.SparseArray;
@@ -34,7 +35,7 @@ public abstract class ControllerPagerAdapter extends PagerAdapter {
     /**
      * Creates a new ControllerPagerAdapter using the passed host.
      */
-    public ControllerPagerAdapter(Controller host, boolean saveControllerState) {
+    public ControllerPagerAdapter(@NonNull Controller host, boolean saveControllerState) {
         this.host = host;
         savesState = saveControllerState;
     }
@@ -42,6 +43,7 @@ public abstract class ControllerPagerAdapter extends PagerAdapter {
     /**
      * Return the Controller associated with a specified position.
      */
+    @NonNull
     public abstract Controller getItem(int position);
 
     @Override
diff --git a/conductor-support/src/main/java/com/bluelinelabs/conductor/support/RouterPagerAdapter.java b/conductor-support/src/main/java/com/bluelinelabs/conductor/support/RouterPagerAdapter.java
index 96e9c74..6020f06 100644
--- a/conductor-support/src/main/java/com/bluelinelabs/conductor/support/RouterPagerAdapter.java
+++ b/conductor-support/src/main/java/com/bluelinelabs/conductor/support/RouterPagerAdapter.java
@@ -2,6 +2,7 @@ package com.bluelinelabs.conductor.support;
 
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.PagerAdapter;
 import android.util.SparseArray;
@@ -28,7 +29,7 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
     /**
      * Creates a new RouterPagerAdapter using the passed host.
      */
-    public RouterPagerAdapter(Controller host) {
+    public RouterPagerAdapter(@NonNull Controller host) {
         this.host = host;
     }
 
@@ -38,7 +39,7 @@ public abstract class RouterPagerAdapter extends PagerAdapter {
      * @param router   The router used for the page
      * @param position The page position to be instantiated.
      */
-    public abstract void configureRouter(Router router, int position);
+    public abstract void configureRouter(@NonNull Router router, int position);
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
diff --git a/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java b/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
index f5def56..2f34de4 100644
--- a/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
+++ b/demo/src/main/java/com/bluelinelabs/conductor/demo/controllers/PagerController.java
@@ -30,7 +30,7 @@ public class PagerController extends BaseController {
     public PagerController() {
         pagerAdapter = new RouterPagerAdapter(this) {
             @Override
-            public void configureRouter(Router router, int position) {
+            public void configureRouter(@NonNull Router router, int position) {
                 if (!router.hasRootController()) {
                     Controller page = new ChildController(String.format(Locale.getDefault(), "Child #%d (Swipe to see more)", position), PAGE_COLORS[position], true);
                     router.setRoot(RouterTransaction.with(page));