From 9ebce6034fece34bf70cf8c8e190503ae1de041e Mon Sep 17 00:00:00 2001 From: Christophe Beyls Date: Sat, 27 Aug 2016 21:29:05 +0200 Subject: [PATCH] Turn some private fields to package-local fields to avoid unnecessary indirections through synthetic methods generated for inner classes. --- .../v4/preference/PreferenceFragment.java | 8 +++---- .../fosdem/activities/MainActivity.java | 20 ++++++++--------- .../fosdem/alarms/FosdemAlarmManager.java | 2 +- .../fragments/EventDetailsFragment.java | 14 ++++++------ .../fosdem/fragments/PersonsListFragment.java | 2 +- .../fragments/TrackScheduleListFragment.java | 2 +- .../fosdem/fragments/TracksFragment.java | 2 +- .../fosdem/fragments/TracksListFragment.java | 2 +- .../fosdem/loaders/BookmarkStatusLoader.java | 4 ++-- .../java/be/digitalia/fosdem/model/Day.java | 2 +- .../java/be/digitalia/fosdem/model/Event.java | 2 +- .../java/be/digitalia/fosdem/model/Link.java | 2 +- .../be/digitalia/fosdem/model/Person.java | 2 +- .../java/be/digitalia/fosdem/model/Track.java | 2 +- .../fosdem/utils/NfcSenderUtils.java | 2 +- .../fosdem/widgets/AdapterLinearLayout.java | 22 ++++++------------- .../BookmarksMultiChoiceModeListener.java | 2 +- .../widgets/ScrimInsetsFrameLayout.java | 4 ++-- .../fosdem/widgets/SlidingTabLayout.java | 16 +++++++------- .../UnderlinePageIndicator.java | 12 +++++----- 20 files changed, 58 insertions(+), 66 deletions(-) diff --git a/app/src/main/java/android/support/v4/preference/PreferenceFragment.java b/app/src/main/java/android/support/v4/preference/PreferenceFragment.java index edf3fa3..93febbc 100644 --- a/app/src/main/java/android/support/v4/preference/PreferenceFragment.java +++ b/app/src/main/java/android/support/v4/preference/PreferenceFragment.java @@ -29,8 +29,8 @@ import android.widget.ListView; public abstract class PreferenceFragment extends Fragment { private static final int FIRST_REQUEST_CODE = 100; - private static final int MSG_BIND_PREFERENCES = 1; - private static final int MSG_REQUEST_FOCUS = 2; + static final int MSG_BIND_PREFERENCES = 1; + static final int MSG_REQUEST_FOCUS = 2; private static final String PREFERENCES_TAG = "android:preferences"; private static final float HC_HORIZONTAL_PADDING = 16; @@ -51,7 +51,7 @@ public abstract class PreferenceFragment extends Fragment { private boolean mHavePrefs; private boolean mInitDone; - private ListView mList; + ListView mList; private PreferenceManager mPreferenceManager; @Override @@ -213,7 +213,7 @@ public abstract class PreferenceFragment extends Fragment { } } - private void bindPreferences() { + void bindPreferences() { final PreferenceScreen preferenceScreen = getPreferenceScreen(); if (preferenceScreen != null) { preferenceScreen.bind(getListView()); diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java index d1b6252..ba3d59d 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java @@ -116,10 +116,10 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback } } - private static final int SELECT_MENU_SECTION_WHAT = 1; - private static final int SELECT_MENU_FOOTER_WHAT = 2; + static final int SELECT_MENU_SECTION_WHAT = 1; + static final int SELECT_MENU_FOOTER_WHAT = 2; - private static final long MENU_ACTION_DELAY = 400L; + static final long MENU_ACTION_DELAY = 400L; private static final long DATABASE_VALIDITY_DURATION = DateUtils.DAY_IN_MILLIS; private static final long DOWNLOAD_REMINDER_SNOOZE_DURATION = DateUtils.DAY_IN_MILLIS; @@ -129,15 +129,15 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback private static final String LAST_UPDATE_DATE_FORMAT = "d MMM yyyy kk:mm:ss"; - private Handler handler; + Handler handler; private Toolbar toolbar; - private ProgressBar progressBar; + ProgressBar progressBar; // Main menu - private Section currentSection; - private DrawerLayout drawerLayout; + Section currentSection; + DrawerLayout drawerLayout; private ActionBarDrawerToggle drawerToggle; - private View mainMenu; + View mainMenu; private TextView lastUpdateTextView; private MainMenuAdapter menuAdapter; @@ -286,7 +286,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback } } - private void updateLastUpdateTime() { + void updateLastUpdateTime() { long lastUpdateTime = DatabaseManager.getInstance().getLastUpdateTime(); lastUpdateTextView.setText(getString(R.string.last_update, (lastUpdateTime == -1L) @@ -493,7 +493,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback } } - private final View.OnClickListener sectionClickListener = new View.OnClickListener() { + final View.OnClickListener sectionClickListener = new View.OnClickListener() { @Override public void onClick(View view) { int sectionIndex = ((ViewGroup) view.getParent()).indexOfChild(view); diff --git a/app/src/main/java/be/digitalia/fosdem/alarms/FosdemAlarmManager.java b/app/src/main/java/be/digitalia/fosdem/alarms/FosdemAlarmManager.java index 151a296..ab60595 100644 --- a/app/src/main/java/be/digitalia/fosdem/alarms/FosdemAlarmManager.java +++ b/app/src/main/java/be/digitalia/fosdem/alarms/FosdemAlarmManager.java @@ -101,7 +101,7 @@ public class FosdemAlarmManager implements OnSharedPreferenceChangeListener { lbm.unregisterReceiver(bookmarksReceiver); } - private void startUpdateAlarms() { + void startUpdateAlarms() { Intent serviceIntent = new Intent(context, AlarmIntentService.class); serviceIntent.setAction(AlarmIntentService.ACTION_UPDATE_ALARMS); context.startService(serviceIntent); diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java index 4e25400..c18fd8a 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.java @@ -59,12 +59,12 @@ public class EventDetailsFragment extends Fragment { ImageView getActionButton(); } - private static class EventDetails { + static class EventDetails { List persons; List links; } - private static class ViewHolder { + static class ViewHolder { LayoutInflater inflater; TextView personsTextView; ViewGroup linksContainer; @@ -75,10 +75,10 @@ public class EventDetailsFragment extends Fragment { private static final String ARG_EVENT = "event"; - private Event event; - private int personsCount = 1; - private Boolean isBookmarked; - private ViewHolder holder; + Event event; + int personsCount = 1; + Boolean isBookmarked; + ViewHolder holder; private MenuItem bookmarkMenuItem; private ImageView actionButton; @@ -239,7 +239,7 @@ public class EventDetailsFragment extends Fragment { .createChooserIntent(); } - private void updateOptionsMenu() { + void updateOptionsMenu() { if (actionButton != null) { // Action Button is used as bookmark button diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/PersonsListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/PersonsListFragment.java index 27c10f9..d5df592 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/PersonsListFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/PersonsListFragment.java @@ -140,7 +140,7 @@ public class PersonsListFragment extends SmoothListFragment implements LoaderCal return indexer.getSections(); } - private static class ViewHolder { + static class ViewHolder { public TextView textView; public Person person; } diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java index a7cd34b..8fcdbb3 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/TrackScheduleListFragment.java @@ -309,7 +309,7 @@ public class TrackScheduleListFragment extends SmoothListFragment implements Han holder.room.setText(event.getRoomName()); } - private static class ViewHolder { + static class ViewHolder { TextView time; TextView title; TextView persons; diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java index e2a4e50..124fd42 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.java @@ -29,7 +29,7 @@ import be.digitalia.fosdem.model.Day; public class TracksFragment extends Fragment implements LoaderCallbacks> { - private static class ViewHolder { + static class ViewHolder { View contentView; View emptyView; ViewPager pager; diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/TracksListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/TracksListFragment.java index fb1126e..58be8b7 100644 --- a/app/src/main/java/be/digitalia/fosdem/fragments/TracksListFragment.java +++ b/app/src/main/java/be/digitalia/fosdem/fragments/TracksListFragment.java @@ -130,7 +130,7 @@ public class TracksListFragment extends SmoothListFragment implements LoaderCall holder.type.setText(holder.track.getType().getNameResId()); } - private static class ViewHolder { + static class ViewHolder { TextView name; TextView type; Track track; diff --git a/app/src/main/java/be/digitalia/fosdem/loaders/BookmarkStatusLoader.java b/app/src/main/java/be/digitalia/fosdem/loaders/BookmarkStatusLoader.java index 1972505..6535eb5 100644 --- a/app/src/main/java/be/digitalia/fosdem/loaders/BookmarkStatusLoader.java +++ b/app/src/main/java/be/digitalia/fosdem/loaders/BookmarkStatusLoader.java @@ -18,7 +18,7 @@ import android.support.v4.content.LocalBroadcastManager; */ public class BookmarkStatusLoader extends AsyncTaskLoader { - private final Event event; + final Event event; private Boolean isBookmarked; private final BroadcastReceiver addBookmarkReceiver = new BroadcastReceiver() { @@ -51,7 +51,7 @@ public class BookmarkStatusLoader extends AsyncTaskLoader { lbm.registerReceiver(removeBookmarksReceiver, new IntentFilter(DatabaseManager.ACTION_REMOVE_BOOKMARKS)); } - private void updateBookmark(Boolean result) { + void updateBookmark(Boolean result) { if (isStarted()) { cancelLoad(); } diff --git a/app/src/main/java/be/digitalia/fosdem/model/Day.java b/app/src/main/java/be/digitalia/fosdem/model/Day.java index 3055a08..accfaf5 100644 --- a/app/src/main/java/be/digitalia/fosdem/model/Day.java +++ b/app/src/main/java/be/digitalia/fosdem/model/Day.java @@ -84,7 +84,7 @@ public class Day implements Parcelable { } }; - private Day(Parcel in) { + Day(Parcel in) { index = in.readInt(); long time = in.readLong(); if (time != 0L) { diff --git a/app/src/main/java/be/digitalia/fosdem/model/Event.java b/app/src/main/java/be/digitalia/fosdem/model/Event.java index 4eab4cd..f79b183 100644 --- a/app/src/main/java/be/digitalia/fosdem/model/Event.java +++ b/app/src/main/java/be/digitalia/fosdem/model/Event.java @@ -219,7 +219,7 @@ public class Event implements Parcelable { } }; - private Event(Parcel in) { + Event(Parcel in) { id = in.readLong(); day = Day.CREATOR.createFromParcel(in); long time = in.readLong(); diff --git a/app/src/main/java/be/digitalia/fosdem/model/Link.java b/app/src/main/java/be/digitalia/fosdem/model/Link.java index 44a0469..fb57f9e 100644 --- a/app/src/main/java/be/digitalia/fosdem/model/Link.java +++ b/app/src/main/java/be/digitalia/fosdem/model/Link.java @@ -68,7 +68,7 @@ public class Link implements Parcelable { } }; - private Link(Parcel in) { + Link(Parcel in) { url = in.readString(); description = in.readString(); } diff --git a/app/src/main/java/be/digitalia/fosdem/model/Person.java b/app/src/main/java/be/digitalia/fosdem/model/Person.java index f1fe9d3..d085666 100644 --- a/app/src/main/java/be/digitalia/fosdem/model/Person.java +++ b/app/src/main/java/be/digitalia/fosdem/model/Person.java @@ -77,7 +77,7 @@ public class Person implements Parcelable { } }; - private Person(Parcel in) { + Person(Parcel in) { id = in.readLong(); name = in.readString(); } diff --git a/app/src/main/java/be/digitalia/fosdem/model/Track.java b/app/src/main/java/be/digitalia/fosdem/model/Track.java index dd2eed0..a0e28b7 100644 --- a/app/src/main/java/be/digitalia/fosdem/model/Track.java +++ b/app/src/main/java/be/digitalia/fosdem/model/Track.java @@ -100,7 +100,7 @@ public class Track implements Parcelable { } }; - private Track(Parcel in) { + Track(Parcel in) { name = in.readString(); type = Type.values()[in.readInt()]; } diff --git a/app/src/main/java/be/digitalia/fosdem/utils/NfcSenderUtils.java b/app/src/main/java/be/digitalia/fosdem/utils/NfcSenderUtils.java index a5cdf10..afd7ec8 100644 --- a/app/src/main/java/be/digitalia/fosdem/utils/NfcSenderUtils.java +++ b/app/src/main/java/be/digitalia/fosdem/utils/NfcSenderUtils.java @@ -44,7 +44,7 @@ class NfcSenderUtils { return true; } - private static NdefRecord createMimeRecord(String mimeType, byte[] payload) { + static NdefRecord createMimeRecord(String mimeType, byte[] payload) { byte[] mimeBytes = mimeType.getBytes(Charset.forName("US-ASCII")); return new NdefRecord(NdefRecord.TNF_MIME_MEDIA, mimeBytes, new byte[0], payload); } diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java b/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java index 8e64836..7ae0c7e 100644 --- a/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java +++ b/app/src/main/java/be/digitalia/fosdem/widgets/AdapterLinearLayout.java @@ -21,15 +21,7 @@ public class AdapterLinearLayout extends LinearLayout { */ public static abstract class Adapter { - private final DataSetObservable mDataSetObservable = new DataSetObservable(); - - private void registerDataSetObserver(DataSetObserver observer) { - mDataSetObservable.registerObserver(observer); - } - - private void unregisterDataSetObserver(DataSetObserver observer) { - mDataSetObservable.unregisterObserver(observer); - } + final DataSetObservable mDataSetObservable = new DataSetObservable(); public void notifyDataSetChanged() { mDataSetObservable.notifyChanged(); @@ -42,7 +34,7 @@ public class AdapterLinearLayout extends LinearLayout { public abstract View getView(int position, View convertView, ViewGroup parent); } - private class AdapterLinearLayoutDataSetObserver extends DataSetObserver { + class AdapterLinearLayoutDataSetObserver extends DataSetObserver { @Override public void onChanged() { populateFromAdapter(); @@ -67,13 +59,13 @@ public class AdapterLinearLayout extends LinearLayout { return; } if (mAdapter != null && mDataSetObserver != null) { - mAdapter.unregisterDataSetObserver(mDataSetObserver); + mAdapter.mDataSetObservable.unregisterObserver(mDataSetObserver); } removeAllViews(); mAdapter = adapter; if (adapter != null && mDataSetObserver != null) { populateFromAdapter(); - adapter.registerDataSetObserver(mDataSetObserver); + adapter.mDataSetObservable.registerObserver(mDataSetObserver); } } @@ -83,7 +75,7 @@ public class AdapterLinearLayout extends LinearLayout { mDataSetObserver = new AdapterLinearLayoutDataSetObserver(); if (mAdapter != null) { populateFromAdapter(); - mAdapter.registerDataSetObserver(mDataSetObserver); + mAdapter.mDataSetObservable.registerObserver(mDataSetObserver); } } @@ -91,12 +83,12 @@ public class AdapterLinearLayout extends LinearLayout { protected void onDetachedFromWindow() { super.onDetachedFromWindow(); if (mAdapter != null) { - mAdapter.unregisterDataSetObserver(mDataSetObserver); + mAdapter.mDataSetObservable.unregisterObserver(mDataSetObserver); } mDataSetObserver = null; } - private void populateFromAdapter() { + void populateFromAdapter() { final Adapter adapter = mAdapter; final int currentCount = getChildCount(); final int newCount = adapter.getCount(); diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/BookmarksMultiChoiceModeListener.java b/app/src/main/java/be/digitalia/fosdem/widgets/BookmarksMultiChoiceModeListener.java index 1fd3150..855a53c 100644 --- a/app/src/main/java/be/digitalia/fosdem/widgets/BookmarksMultiChoiceModeListener.java +++ b/app/src/main/java/be/digitalia/fosdem/widgets/BookmarksMultiChoiceModeListener.java @@ -75,7 +75,7 @@ public class BookmarksMultiChoiceModeListener implements MultiChoiceModeListener public void onDestroyActionMode(ActionMode mode) { } - private static class RemoveBookmarksAsyncTask extends AsyncTask { + static class RemoveBookmarksAsyncTask extends AsyncTask { @Override protected Void doInBackground(long[]... params) { diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/ScrimInsetsFrameLayout.java b/app/src/main/java/be/digitalia/fosdem/widgets/ScrimInsetsFrameLayout.java index 230e45b..2347aaf 100644 --- a/app/src/main/java/be/digitalia/fosdem/widgets/ScrimInsetsFrameLayout.java +++ b/app/src/main/java/be/digitalia/fosdem/widgets/ScrimInsetsFrameLayout.java @@ -31,8 +31,8 @@ import android.widget.FrameLayout; import be.digitalia.fosdem.R; public class ScrimInsetsFrameLayout extends FrameLayout { - private Drawable mInsetForeground; - private Rect mInsets; + Drawable mInsetForeground; + Rect mInsets; private Rect mTempRect = new Rect(); public ScrimInsetsFrameLayout(Context context) { diff --git a/app/src/main/java/be/digitalia/fosdem/widgets/SlidingTabLayout.java b/app/src/main/java/be/digitalia/fosdem/widgets/SlidingTabLayout.java index 9493c5e..7aa865a 100644 --- a/app/src/main/java/be/digitalia/fosdem/widgets/SlidingTabLayout.java +++ b/app/src/main/java/be/digitalia/fosdem/widgets/SlidingTabLayout.java @@ -61,14 +61,14 @@ public class SlidingTabLayout extends HorizontalScrollView { private ColorStateList mTextColor; - private ViewPager mViewPager; + ViewPager mViewPager; private PagerAdapter mAdapter; private final InternalViewPagerListener mPageChangeListener = new InternalViewPagerListener(); private final PagerAdapterObserver mPagerAdapterObserver = new PagerAdapterObserver(); - private TabListener mTabListener; + TabListener mTabListener; - private final SlidingTabStrip mTabStrip; + final SlidingTabStrip mTabStrip; public SlidingTabLayout(Context context) { this(context, null); @@ -179,7 +179,7 @@ public class SlidingTabLayout extends HorizontalScrollView { notifyDataSetChanged(); } - private void notifyDataSetChanged() { + void notifyDataSetChanged() { mTabStrip.removeAllViews(); if (mViewPager != null) { populateTabStrip(); @@ -242,7 +242,7 @@ public class SlidingTabLayout extends HorizontalScrollView { } } - private void scrollToTab(int tabIndex, float positionOffset) { + void scrollToTab(int tabIndex, float positionOffset) { final int tabStripChildCount = mTabStrip.getChildCount(); if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) { return; @@ -257,7 +257,7 @@ public class SlidingTabLayout extends HorizontalScrollView { } } - private class InternalViewPagerListener implements ViewPager.OnPageChangeListener { + class InternalViewPagerListener implements ViewPager.OnPageChangeListener { private int mScrollState; @Override @@ -295,7 +295,7 @@ public class SlidingTabLayout extends HorizontalScrollView { } } - private class PagerAdapterObserver extends DataSetObserver { + class PagerAdapterObserver extends DataSetObserver { @Override public void onChanged() { notifyDataSetChanged(); @@ -307,7 +307,7 @@ public class SlidingTabLayout extends HorizontalScrollView { } } - private class TabClickListener implements View.OnClickListener { + class TabClickListener implements View.OnClickListener { @Override public void onClick(View v) { final int childCount = mTabStrip.getChildCount(); diff --git a/app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java b/app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java index 3b1b8ec..917c5ef 100644 --- a/app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java +++ b/app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java @@ -39,14 +39,14 @@ import be.digitalia.fosdem.R; */ public class UnderlinePageIndicator extends View implements PageIndicator { private static final int INVALID_POINTER = -1; - private static final int FADE_FRAME_MS = 30; + static final int FADE_FRAME_MS = 30; - private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private boolean mFades; + boolean mFades; private int mFadeDelay; private int mFadeLength; - private int mFadeBy; + int mFadeBy; private ViewPager mViewPager; private int mScrollState; @@ -58,7 +58,7 @@ public class UnderlinePageIndicator extends View implements PageIndicator { private int mActivePointerId = INVALID_POINTER; private boolean mIsDragging; - private final Runnable mFadeRunnable = new Runnable() { + final Runnable mFadeRunnable = new Runnable() { @Override public void run() { if (!mFades) return; @@ -354,7 +354,7 @@ public class UnderlinePageIndicator extends View implements PageIndicator { super(superState); } - private SavedState(Parcel in) { + SavedState(Parcel in) { super(in); currentPage = in.readInt(); }