Updated Javadoc issues (Java 8 changes)

Author: brianwernick

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'com.novoda:bintray-release:0.2.7'
+        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip

library/build.gradle

@@ -25,10 +25,6 @@ android {
     compileSdkVersion 23
     buildToolsVersion '23.0.1'
 
-    lintOptions {
-        abortOnError false
-    }
-
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 23
@@ -42,6 +38,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/LICENSE.txt'

library/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.devbrackets.android.recyclerext">
+
     <uses-sdk/>
     <application/>
 </manifest>

library/src/main/java/com/devbrackets/android/recyclerext/adapter/RecyclerCursorAdapter.java

@@ -32,8 +32,7 @@
 /**
  * A base cursor adapter for the RecyclerView
  */
-public abstract class RecyclerCursorAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> implements Filterable,
-        CursorFilter.CursorFilterClient {
+public abstract class RecyclerCursorAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> implements Filterable, CursorFilter.CursorFilterClient {
     protected static final String DEFAULT_ID_COLUMN_NAME = "_id";
 
     protected Cursor cursor;
@@ -206,24 +205,22 @@ public CharSequence convertToString(Cursor cursor) {
     /**
      * Runs a query with the specified constraint. This query is requested
      * by the filter attached to this adapter.
-     *
+     * <p>
      * The query is provided by a
      * {@link android.widget.FilterQueryProvider}.
      * If no provider is specified, the current cursor is not filtered and returned.
-     *
+     * <p>
      * After this method returns the resulting cursor is passed to {@link #changeCursor(Cursor)}
      * and the previous cursor is closed.
-     *
+     * <p>
      * This method is always executed on a background thread, not on the
      * application's main thread (or UI thread.)
-     *
+     * <p>
      * Contract: when constraint is null or empty, the original results,
      * prior to any filtering, must be returned.
      *
      * @param constraint the constraint with which the query must be filtered
-     *
      * @return a Cursor representing the results of the new query
-     *
      * @see #getFilter()
      * @see #getFilterQueryProvider()
      * @see #setFilterQueryProvider(android.widget.FilterQueryProvider)
@@ -250,7 +247,6 @@ public Filter getFilter() {
      * provider is null, no filtering occurs.
      *
      * @return the current filter query provider or null if it does not exist
-     *
      * @see #setFilterQueryProvider(android.widget.FilterQueryProvider)
      * @see #runQueryOnBackgroundThread(CharSequence)
      */
@@ -267,7 +263,6 @@ public FilterQueryProvider getFilterQueryProvider() {
      * this adapter.
      *
      * @param provider the filter query provider or null to remove it
-     *
      * @see #getFilterQueryProvider()
      * @see #runQueryOnBackgroundThread(CharSequence)
      */

library/src/main/java/com/devbrackets/android/recyclerext/adapter/RecyclerHeaderAdapter.java

@@ -58,9 +58,9 @@ public void onBindViewHolder(ViewHolder holder, int position) {
         int childPosition = determineChildPosition(position);
 
         if (viewType == VIEW_TYPE_CHILD) {
-            onBindChildViewHolder((C)holder, childPosition);
+            onBindChildViewHolder((C) holder, childPosition);
         } else if (viewType == VIEW_TYPE_HEADER) {
-            onBindHeaderViewHolder((H)holder, childPosition);
+            onBindHeaderViewHolder((H) holder, childPosition);
             holder.itemView.setTag(R.id.sticky_view_header_id, getHeaderId(childPosition));
         }
 
@@ -69,7 +69,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
 
     @Override
     public int getItemViewType(int position) {
-        for (HeaderItem item: headerItems) {
+        for (HeaderItem item : headerItems) {
             if (item.getViewPosition() == position) {
                 return VIEW_TYPE_HEADER;
             } else if (item.getViewPosition() > position) {
@@ -94,7 +94,7 @@ public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
 
     /**
      * Returns the total number of items in the data set hold by the adapter.
-     * <br />
+     * <p>
      * <b>NOTE:</b> {@link #getChildCount()} should be overridden instead of this method
      *
      * @return The total number of items in this adapter.
@@ -135,7 +135,7 @@ public long getHeaderId(int childPosition) {
      * Called to display the header information with the <code>firstChildPosition</code> being the
      * position of the first child after this header.
      *
-     * @param holder The ViewHolder which should be updated
+     * @param holder             The ViewHolder which should be updated
      * @param firstChildPosition The position of the child immediately after this header
      */
     public abstract void onBindHeaderViewHolder(H holder, int firstChildPosition);
@@ -144,7 +144,7 @@ public long getHeaderId(int childPosition) {
      * Called to display the child information with the <code>childPosition</code> being the
      * position of the child, excluding headers.
      *
-     * @param holder The ViewHolder which should be updated
+     * @param holder        The ViewHolder which should be updated
      * @param childPosition The position of the child
      */
     public abstract void onBindChildViewHolder(C holder, int childPosition);
@@ -164,7 +164,7 @@ public long getHeaderId(int childPosition) {
      */
     public int determineChildPosition(int viewPosition) {
         int headerCount = 0;
-        for (HeaderItem item: headerItems) {
+        for (HeaderItem item : headerItems) {
             if (item.getViewPosition() < viewPosition) {
                 headerCount++;
             } else {

library/src/main/java/com/devbrackets/android/recyclerext/adapter/RecyclerHeaderCursorAdapter.java

@@ -76,7 +76,7 @@ public void onBindViewHolder(ViewHolder holder, Cursor cursor, int position) {
 
         Cursor c = getCursor(childPosition);
         if (viewType == VIEW_TYPE_CHILD) {
-            onBindChildViewHolder((C)holder, c, childPosition);
+            onBindChildViewHolder((C) holder, c, childPosition);
         } else if (viewType == VIEW_TYPE_HEADER) {
             onBindHeaderViewHolder((H) holder, c, childPosition);
             holder.itemView.setTag(R.id.sticky_view_header_id, getHeaderId(childPosition));
@@ -87,7 +87,7 @@ public void onBindViewHolder(ViewHolder holder, Cursor cursor, int position) {
 
     @Override
     public int getItemViewType(int position) {
-        for (HeaderItem item: headerItems) {
+        for (HeaderItem item : headerItems) {
             if (item.getViewPosition() == position) {
                 return VIEW_TYPE_HEADER;
             } else if (item.getViewPosition() > position) {
@@ -112,7 +112,7 @@ public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
 
     /**
      * Returns the total number of items in the data set hold by the adapter.
-     * <br />
+     * <p>
      * <b>NOTE:</b> {@link #getChildCount()} should be overridden instead of this method
      *
      * @return The total number of items in this adapter.
@@ -154,6 +154,7 @@ public long getHeaderId(int childPosition) {
      * position of the first child after this header.
      *
      * @param holder The ViewHolder which should be updated
+     * @param cursor The cursor representing the first child for the header
      * @param firstChildPosition The position of the child immediately after this header
      */
     public abstract void onBindHeaderViewHolder(H holder, Cursor cursor, int firstChildPosition);
@@ -163,6 +164,7 @@ public long getHeaderId(int childPosition) {
      * position of the child, excluding headers.
      *
      * @param holder The ViewHolder which should be updated
+     * @param cursor The cursor representing child to bind
      * @param childPosition The position of the child
      */
     public abstract void onBindChildViewHolder(C holder, Cursor cursor, int childPosition);
@@ -188,7 +190,7 @@ public int getChildCount() {
      */
     public int determineChildPosition(int viewPosition) {
         int headerCount = 0;
-        for (HeaderItem item: headerItems) {
+        for (HeaderItem item : headerItems) {
             if (item.getViewPosition() < viewPosition) {
                 headerCount++;
             } else {

library/src/main/java/com/devbrackets/android/recyclerext/adapter/RecyclerListAdapter.java

@@ -12,7 +12,7 @@
  * A basic adapter with support for lists to simplify integrations.
  *
  * @param <VH> The ViewHolder to use
- * @param <T> The object type for the list
+ * @param <T>  The object type for the list
  */
 public abstract class RecyclerListAdapter<VH extends RecyclerView.ViewHolder, T> extends RecyclerView.Adapter<VH> {
 
@@ -105,7 +105,7 @@ public void add(T item) {
      * Adds the specified item to the list with the specified position
      *
      * @param position The position to insert the item at
-     * @param item The item to add to the list
+     * @param item     The item to add to the list
      */
     public void add(int position, T item) {
         synchronized (lock) {

library/src/main/java/com/devbrackets/android/recyclerext/adapter/ReorderableRecyclerCursorAdapter.java

@@ -68,7 +68,7 @@ public void changeCursor(Cursor newCursor) {
      * no ReorderItem will be added to the cache
      *
      * @param originalPosition The original position of the item
-     * @param newPosition The new position for the item
+     * @param newPosition      The new position for the item
      */
     public void reorderItem(int originalPosition, int newPosition) {
         //Make sure the positions aren't the same
@@ -86,11 +86,11 @@ public void reorderItem(int originalPosition, int newPosition) {
         //Iterates through the items that will be effected and changes their positions
         if (originalPosition > newPosition) {
             for (int i = originalPosition; i > newPosition; i--) {
-                cursorPositionMap.put(i, cursorPositionMap.get(i -1, i -1));
+                cursorPositionMap.put(i, cursorPositionMap.get(i - 1, i - 1));
             }
         } else {
             for (int i = originalPosition; i < newPosition; i++) {
-                cursorPositionMap.put(i, cursorPositionMap.get(i +1, i +1));
+                cursorPositionMap.put(i, cursorPositionMap.get(i + 1, i + 1));
             }
         }
 
@@ -159,7 +159,7 @@ private void cleanMap() {
         }
 
         //Actually removes the items
-        for (int i: removeList) {
+        for (int i : removeList) {
             cursorPositionMap.delete(i);
         }
     }

library/src/main/java/com/devbrackets/android/recyclerext/decoration/ReorderDecoration.java

@@ -58,7 +58,7 @@ public interface ReorderListener {
          * Called when the user drag event ends, informing the listener of the changed position
          *
          * @param originalPosition The position the dragged view started at
-         * @param newPosition The position the dragged view should be saved as
+         * @param newPosition      The position the dragged view should be saved as
          */
         void onItemReordered(int originalPosition, int newPosition);
 
@@ -67,7 +67,7 @@ public interface ReorderListener {
          * actually updating the backing data structure (e.g. calling swap on a {@link com.devbrackets.android.recyclerext.adapter.RecyclerCursorAdapter})
          *
          * @param originalPosition The position the dragged view started at
-         * @param newPosition The position the dragged view should be saved as
+         * @param newPosition      The position the dragged view should be saved as
          */
         void onItemPostReordered(int originalPosition, int newPosition);
     }
@@ -138,8 +138,8 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, Recycle
 
     /**
      * This will determine two things.
-     *  1. If we need to handle the touch event
-     *  2. If reordering needs to start due to dragHandle being clicked
+     * 1. If we need to handle the touch event
+     * 2. If reordering needs to start due to dragHandle being clicked
      */
     @Override
     public boolean onInterceptTouchEvent(RecyclerView recyclerView, MotionEvent event) {
@@ -335,7 +335,7 @@ public LayoutOrientation getOrientation() {
      * Manually starts the reorder process for the specified view.  This should not be used if the {@link #setDragHandleId(int)} is
      * set and should control the reordering.
      *
-     * @param view The View to start reordering
+     * @param view             The View to start reordering
      * @param startMotionEvent The MotionEvent that starts the reorder
      */
     public void startReorder(View view, @Nullable MotionEvent startMotionEvent) {
@@ -453,7 +453,7 @@ public int calculateNewPosition() {
      * top when Vertical and left when Horizontal.
      *
      * @param childPosition The position of the view in the RecyclerView
-     * @param draggedUp True if the view has been moved up or to the left
+     * @param draggedUp     True if the view has been moved up or to the left
      */
     private void updateNewViewStart(int childPosition, boolean draggedUp) {
         View view = recyclerView.getLayoutManager().getChildAt(childPosition);
@@ -481,10 +481,10 @@ private void updateFloatingItemCenter() {
      * This happens when the dragging view starts above the <code>view</code> and has been dragged
      * below it, or vice versa.
      *
-     * @param view The view to compare with the dragging items current and original positions
+     * @param view         The view to compare with the dragging items current and original positions
      * @param itemPosition The position for the <code>view</code>
-     * @param middle The center of the floating item
-     * @param outRect The {@link Rect} to update the position in
+     * @param middle       The center of the floating item
+     * @param outRect      The {@link Rect} to update the position in
      */
     private void setVerticalOffsets(View view, int itemPosition, PointF middle, Rect outRect) {
         if (orientation == LayoutOrientation.HORIZONTAL) {
@@ -515,10 +515,10 @@ private void setVerticalOffsets(View view, int itemPosition, PointF middle, Rect
      * This happens when the dragging view starts before the <code>view</code> and has been dragged
      * after it, or vice versa.
      *
-     * @param view The view to compare with the dragging items current and original positions
+     * @param view         The view to compare with the dragging items current and original positions
      * @param itemPosition The position for the <code>view</code>
-     * @param middle The center of the floating item
-     * @param outRect The {@link Rect} to update the position in
+     * @param middle       The center of the floating item
+     * @param outRect      The {@link Rect} to update the position in
      */
     private void setHorizontalOffsets(View view, int itemPosition, PointF middle, Rect outRect) {
         if (orientation == LayoutOrientation.VERTICAL) {
@@ -597,20 +597,20 @@ private void performHorizontalEdgeScroll(PointF fingerPosition) {
      * view being dragged.
      *
      * @param fingerPosition The current position of the dragging finger
-     * @param viewMiddle The center of the view being dragged
+     * @param viewMiddle     The center of the view being dragged
      */
     private void updateVerticalBounds(PointF fingerPosition, PointF viewMiddle) {
         if (orientation == LayoutOrientation.HORIZONTAL) {
             return;
         }
 
-        floatingItemBounds.top = (int)fingerPosition.y;
+        floatingItemBounds.top = (int) fingerPosition.y;
         if (fingerOffset != null) {
             floatingItemBounds.top += fingerOffset.y;
         }
 
         if (floatingItemBounds.top < -viewMiddle.y) {
-            floatingItemBounds.top = -(int)viewMiddle.y;
+            floatingItemBounds.top = -(int) viewMiddle.y;
         }
 
         floatingItemBounds.bottom = floatingItemBounds.top + floatingItemStartingBounds.height();
@@ -621,20 +621,20 @@ private void updateVerticalBounds(PointF fingerPosition, PointF viewMiddle) {
      * view being dragged.
      *
      * @param fingerPosition The current position of the dragging finger
-     * @param viewMiddle The center of the view being dragged
+     * @param viewMiddle     The center of the view being dragged
      */
     private void updateHorizontalBounds(PointF fingerPosition, PointF viewMiddle) {
         if (orientation == LayoutOrientation.VERTICAL) {
             return;
         }
 
-        floatingItemBounds.left = (int)fingerPosition.x;
+        floatingItemBounds.left = (int) fingerPosition.x;
         if (fingerOffset != null) {
             floatingItemBounds.left += fingerOffset.x;
         }
 
         if (floatingItemBounds.left < -viewMiddle.x) {
-            floatingItemBounds.left = -(int)viewMiddle.x;
+            floatingItemBounds.left = -(int) viewMiddle.x;
         }
 
         floatingItemBounds.right = floatingItemBounds.left + floatingItemStartingBounds.width();