Rename more object to item for Kotlin

StanKocken · Jan 20, 2018 · 61af850 · 61af850
1 parent dd320f2
commit 61af850
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 32 deletions.
diff --git a/...cientadapter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientAdapter.java b/...cientadapter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientAdapter.java
@@ -4,6 +4,8 @@
 import com.skocken.efficientadapter.lib.viewholder.EfficientViewHolder;
 
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -55,11 +57,11 @@ public interface EfficientAdapter<T> extends AdapterUpdater.Updater<T> {
      * Searches this {@code Adapter} for the specified object and returns the index of the
      * first occurrence.
      *
-     * @param object the object to search for.
+     * @param item the object to search for.
      * @return the index of the first occurrence of the object or -1 if the
      * object was not found.
      */
-    int indexOf(T object);
+    int indexOf(T item);
 
     /**
      * Adds the objects in the specified collection to the end of this {@code Adapter}. The
@@ -94,10 +96,10 @@ public interface EfficientAdapter<T> extends AdapterUpdater.Updater<T> {
      * {@code Adapter}, the object is added at the end.
      *
      * @param index  the index at which to insert the object.
-     * @param object the object to add.
+     * @param item the object to add.
      * @throws IndexOutOfBoundsException when {@code location < 0 || location > size()}
      */
-    void add(int index, T object);
+    void add(int index, T item);
 
     /**
      * Removes the object at the specified location from this {@code Adapter}.
@@ -283,10 +285,10 @@ interface OnItemClickListener<T> {
          * @param adapter  The EfficientAdapter where the click happened.
          * @param view     The view within the EfficientAdapter that was clicked (this
          *                 will be a view provided by the adapter)
-         * @param object   The object associate with this {@link EfficientViewHolder}
+         * @param item   The object associate with this {@link EfficientViewHolder}
          * @param position The position of the view in the adapter.
          */
-        void onItemClick(EfficientAdapter<T> adapter, View view, T object, int position);
+        void onItemClick(@NonNull EfficientAdapter<T> adapter, @NonNull View view, @Nullable T item, int position);
     }
 
     /**
@@ -302,9 +304,9 @@ interface OnItemLongClickListener<T> {
          * @param adapter  The EfficientAdapter where the click happened.
          * @param view     The view within the EfficientAdapter that was clicked (this
          *                 will be a view provided by the adapter)
-         * @param object   The object associate with this {@link EfficientViewHolder}
+         * @param item   The object associate with this {@link EfficientViewHolder}
          * @param position The position of the view in the adapter.
          */
-        void onLongItemClick(EfficientAdapter<T> adapter, View view, T object, int position);
+        void onLongItemClick(@NonNull EfficientAdapter<T> adapter, @NonNull View view, @Nullable T item, int position);
     }
 }
diff --git a/...adapter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientPagerAdapter.java b/...adapter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientPagerAdapter.java
@@ -85,8 +85,8 @@ public boolean hasItem(T object) {
     }
 
     @Override
-    public int indexOf(T object) {
-        return mBaseAdapter.indexOf(object);
+    public int indexOf(T item) {
+        return mBaseAdapter.indexOf(item);
     }
 
     @Override
@@ -108,8 +108,8 @@ public void add(T object) {
     }
 
     @Override
-    public void add(int position, T object) {
-        mBaseAdapter.add(position, object);
+    public void add(int position, T item) {
+        mBaseAdapter.add(position, item);
         notifyDataSetChanged();
     }
 

diff --git a/...pter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientRecyclerAdapter.java b/...pter/src/main/java/com/skocken/efficientadapter/lib/adapter/EfficientRecyclerAdapter.java
@@ -85,13 +85,13 @@ public OnItemLongClickListener<T> getOnItemLongClickListener() {
     }
 
     @Override
-    public boolean hasItem(T object) {
-        return mBaseAdapter.hasItem(object);
+    public boolean hasItem(T item) {
+        return mBaseAdapter.hasItem(item);
     }
 
     @Override
-    public int indexOf(T object) {
-        return mBaseAdapter.indexOf(object);
+    public int indexOf(T item) {
+        return mBaseAdapter.indexOf(item);
     }
 
     @Override
@@ -119,8 +119,8 @@ public void add(T object) {
     }
 
     @Override
-    public void add(int position, T object) {
-        mBaseAdapter.add(position, object);
+    public void add(int position, T item) {
+        mBaseAdapter.add(position, item);
         if (mNotifyOnChange) {
             notifyItemInserted(position);
         }

diff --git a/efficientadapter/src/main/java/com/skocken/efficientadapter/lib/util/AdapterUpdater.java b/efficientadapter/src/main/java/com/skocken/efficientadapter/lib/util/AdapterUpdater.java
@@ -90,8 +90,8 @@ public interface Updater<T> {
 
         void removeAt(int i);
 
-        int indexOf(T object);
+        int indexOf(T item);
 
-        void add(int i, T object);
+        void add(int i, T item);
     }
 }
diff --git a/efficientadapter/src/test/java/com/skocken/efficientadapter/lib/util/AdapterUpdaterTest.java b/efficientadapter/src/test/java/com/skocken/efficientadapter/lib/util/AdapterUpdaterTest.java
@@ -149,13 +149,13 @@ public void removeAt(int i) {
         }
 
         @Override
-        public int indexOf(String object) {
-            return mObjects.indexOf(object);
+        public int indexOf(String item) {
+            return mObjects.indexOf(item);
         }
 
         @Override
-        public void add(int i, String object) {
-            mObjects.add(i, object);
+        public void add(int i, String item) {
+            mObjects.add(i, item);
         }
     }
 

diff --git a/.../main/java/com/skocken/efficientadapter/example/activities/HeterogeneousListActivity.java b/.../main/java/com/skocken/efficientadapter/example/activities/HeterogeneousListActivity.java
@@ -43,10 +43,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         adapter.setOnItemClickListener(new EfficientAdapter.OnItemClickListener<Item>() {
             @Override
-            public void onItemClick(EfficientAdapter<Item> parent, View view, Item object,
+            public void onItemClick(EfficientAdapter<Item> parent, View view, Item item,
                     int position) {
                 Toast.makeText(view.getContext(),
-                        "Click on: " + object.toString(),
+                        "Click on: " + item.toString(),
                         Toast.LENGTH_SHORT).show();
             }
         });

diff --git a/...ple/src/main/java/com/skocken/efficientadapter/example/activities/SimpleListActivity.java b/...ple/src/main/java/com/skocken/efficientadapter/example/activities/SimpleListActivity.java
@@ -39,10 +39,10 @@ protected void onCreate(Bundle savedInstanceState) {
         adapter.setOnItemClickListener(
                 new EfficientAdapter.OnItemClickListener<Plane>() {
                     @Override
-                    public void onItemClick(EfficientAdapter<Plane> parent, View view, Plane object,
+                    public void onItemClick(EfficientAdapter<Plane> parent, View view, Plane item,
                             int position) {
                         Toast.makeText(view.getContext(),
-                                "Click on: " + object.toString(),
+                                "Click on: " + item.toString(),
                                 Toast.LENGTH_SHORT).show();
                     }
                 });
@@ -51,9 +51,9 @@ public void onItemClick(EfficientAdapter<Plane> parent, View view, Plane object,
                 new EfficientAdapter.OnItemLongClickListener<Plane>() {
                     @Override
                     public void onLongItemClick(EfficientAdapter<Plane> adapter, View view,
-                            Plane object, int position) {
+                                                Plane item, int position) {
                         Toast.makeText(view.getContext(),
-                                "Longclick on: " + object.toString(),
+                                "Longclick on: " + item.toString(),
                                 Toast.LENGTH_SHORT).show();
                     }
                 });

diff --git a/example/src/main/java/com/skocken/efficientadapter/example/activities/ViewPagerActivity.java b/example/src/main/java/com/skocken/efficientadapter/example/activities/ViewPagerActivity.java
@@ -34,9 +34,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 new EfficientAdapter.OnItemLongClickListener<Book>() {
                     @Override
                     public void onLongItemClick(EfficientAdapter<Book> adapter, View view,
-                            Book object, int position) {
+                                                Book item, int position) {
                         Toast.makeText(view.getContext(),
-                                "Longclick on: " + object.toString(),
+                                "Longclick on: " + item.toString(),
                                 Toast.LENGTH_SHORT).show();
                     }
                 });