Merge branch 'dev' into pr/n23_maxjspaulding

Conflicts:
	example/project.properties
	library/project.properties
	library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoAdapter.java
	library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java

Author: nhaarman

example/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="18" />
 
     <application
         android:allowBackup="true"

example/res/drawable/img_nature1.jpg

@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.haarman.listviewanimations"
-    android:versionCode="1"
-    android:versionName="1.0.0" >
+    android:versionCode="14"
+    android:versionName="2.1" >
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="18" />
 
 </manifest>

example/res/drawable/img_nature2.jpg

@@ -23,11 +23,11 @@
 import java.util.List;
 
 /**
- * A true ArrayList adapter providing access to all ArrayList methods.
+ * A true {@link ArrayList} adapter providing access to all ArrayList methods.
  */
 public abstract class ArrayAdapter<T> extends BaseAdapter {
 
-	private ArrayList<T> mItems;
+	private List<T> mItems;
 
 	/**
 	 * Creates a new ArrayAdapter with an empty list.
@@ -37,11 +37,11 @@ public ArrayAdapter() {
 	}
 
 	/**
-	 * Creates a new ArrayAdapter with the specified list, or an empty list if
-	 * items == null.
+	 * Creates a new {@link ArrayAdapter} with a <b>copy</b> of the specified
+	 * list, or an empty list if items == null.
 	 */
 	public ArrayAdapter(List<T> items) {
-	    mItems = new ArrayList<T>();
+		mItems = new ArrayList<T>();
 		if (items != null) {
 			mItems.addAll(items);
 		}
@@ -93,7 +93,7 @@ public void addAll(Collection<? extends T> items) {
 	 * they are specified.
 	 */
 	public void addAll(T... items) {
-        Collections.addAll(mItems, items);
+		Collections.addAll(mItems, items);
 		notifyDataSetChanged();
 	}
 

example/res/drawable/img_nature3.jpg

@@ -38,31 +38,14 @@ public BaseAdapterDecorator(BaseAdapter baseAdapter) {
 		mDecoratedBaseAdapter = baseAdapter;
 	}
 
-    @Deprecated
-    /**
-     * @deprecated use setAbsListView(AbsListView) instead.
-     */
-	public void setListView(AbsListView listView) {
+	public void setAbsListView(AbsListView listView) {
 		mListView = listView;
 
 		if (mDecoratedBaseAdapter instanceof BaseAdapterDecorator) {
-			((BaseAdapterDecorator) mDecoratedBaseAdapter).setListView(listView);
+			((BaseAdapterDecorator) mDecoratedBaseAdapter).setAbsListView(listView);
 		}
 	}
 
-    public void setAbsListView(AbsListView listView){
-        mListView = listView;
-
-        if (mDecoratedBaseAdapter instanceof BaseAdapterDecorator) {
-            ((BaseAdapterDecorator) mDecoratedBaseAdapter).setAbsListView(listView);
-        }
-    }
-
-    @Deprecated
-    public AbsListView getListView(){
-        return mListView;
-    }
-
 	public AbsListView getAbsListView() {
 		return mListView;
 	}

example/res/drawable/img_nature4.jpg

@@ -33,33 +33,41 @@
 import com.nineoldandroids.animation.ValueAnimator.AnimatorUpdateListener;
 
 /**
- * A BaseAdapterDecorator class that provides animations to the removal of items
- * in the given BaseAdapter.
+ * A {@link BaseAdapterDecorator} class that provides animations to the removal
+ * of items in the given {@link BaseAdapter}.
  */
 public class AnimateDismissAdapter<T> extends BaseAdapterDecorator {
 
 	private OnDismissCallback mCallback;
 
 	/**
-	 * Create a new AnimateDismissAdapter based on the given ArrayAdapter.
+	 * Create a new AnimateDismissAdapter based on the given {@link BaseAdapter}
+	 * .
 	 * 
 	 * @param callback
-	 *            The callback to trigger when the user has indicated that she
-	 *            would like to dismiss one or more list items.
+	 *            The {@link OnDismissCallback} to trigger when the user has
+	 *            indicated that she would like to dismiss one or more list
+	 *            items.
 	 */
 	public AnimateDismissAdapter(BaseAdapter baseAdapter, OnDismissCallback callback) {
 		super(baseAdapter);
 		mCallback = callback;
 	}
 
-	public void animateDismiss(int index) {
-		animateDismiss(Arrays.asList(index));
+	/**
+	 * Animate dismissal of the item at given position.
+	 */
+	public void animateDismiss(int position) {
+		animateDismiss(Arrays.asList(position));
 	}
 
+	/**
+	 * Animate dismissal of the items at given positions.
+	 */
 	public void animateDismiss(Collection<Integer> positions) {
 		final List<Integer> positionsCopy = new ArrayList<Integer>(positions);
-		if(getAbsListView() == null) {
-			throw new IllegalStateException("Call setListView() on this AnimateDismissAdapter before calling setAdapter()!");
+		if (getAbsListView() == null) {
+			throw new IllegalStateException("Call setAbsListView() on this AnimateDismissAdapter before calling setAdapter()!");
 		}
 
 		List<View> views = getVisibleViewsForPositions(positionsCopy);
@@ -81,20 +89,20 @@ public void animateDismiss(Collection<Integer> positions) {
 			animatorSet.addListener(new AnimatorListener() {
 
 				@Override
-				public void onAnimationStart(Animator arg0) {
+				public void onAnimationStart(Animator animator) {
 				}
 
 				@Override
-				public void onAnimationRepeat(Animator arg0) {
+				public void onAnimationRepeat(Animator animator) {
 				}
 
 				@Override
-				public void onAnimationEnd(Animator arg0) {
+				public void onAnimationEnd(Animator animator) {
 					invokeCallback(positionsCopy);
 				}
 
 				@Override
-				public void onAnimationCancel(Animator arg0) {
+				public void onAnimationCancel(Animator animator) {
 				}
 			});
 			animatorSet.start();
@@ -132,21 +140,21 @@ private Animator createAnimatorForView(final View view) {
 		animator.addListener(new AnimatorListener() {
 
 			@Override
-			public void onAnimationStart(Animator arg0) {
+			public void onAnimationStart(Animator animator) {
 			}
 
 			@Override
-			public void onAnimationRepeat(Animator arg0) {
+			public void onAnimationRepeat(Animator animator) {
 			}
 
 			@Override
-			public void onAnimationEnd(Animator arg0) {
+			public void onAnimationEnd(Animator animator) {
 				lp.height = 0;
 				view.setLayoutParams(lp);
 			}
 
 			@Override
-			public void onAnimationCancel(Animator arg0) {
+			public void onAnimationCancel(Animator animator) {
 			}
 		});