From e8658508eefb721c855b3109eba4217a3e011e71 Mon Sep 17 00:00:00 2001 From: Gabriel Ittner Date: Sun, 29 Jul 2012 17:46:11 +0200 Subject: [PATCH] remove mPagerAdapter variable and use mViewPager.getAdapter() instead --- library/src/com/viewpagerindicator/TitlePageIndicator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/library/src/com/viewpagerindicator/TitlePageIndicator.java b/library/src/com/viewpagerindicator/TitlePageIndicator.java index d02777f35..f0557260c 100644 --- a/library/src/com/viewpagerindicator/TitlePageIndicator.java +++ b/library/src/com/viewpagerindicator/TitlePageIndicator.java @@ -29,7 +29,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewConfigurationCompat; import android.support.v4.view.ViewPager; import android.util.AttributeSet; @@ -96,7 +95,6 @@ public static IndicatorStyle fromValue(int value) { private ViewPager mViewPager; private ViewPager.OnPageChangeListener mListener; - private PagerAdapter mPagerAdapter; private int mCurrentPage = -1; private float mPageOffset; private int mScrollState; @@ -647,8 +645,7 @@ public void setViewPager(ViewPager view) { if (mViewPager != null) { mViewPager.setOnPageChangeListener(null); } - mPagerAdapter = view.getAdapter(); - if (mPagerAdapter == null) { + if (view.getAdapter() == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = view; @@ -796,7 +793,7 @@ public SavedState[] newArray(int size) { } private CharSequence getTitle(int i) { - CharSequence title = mPagerAdapter.getPageTitle(i); + CharSequence title = mViewPager.getAdapter().getPageTitle(i); if (title == null) { title = EMPTY_TITLE; }