commit 98614488ecf0b289b6aff4171bb0e42c0aca33c9
author Ross Wang <rosswang@google.com> Wed Jan 27 16:47:14 2016 -0800
committer Ross Wang <rosswang@google.com> Mon Feb 01 11:57:29 2016 -0800
tree 3d6a5776ef1ab003563453e8d35bf17b558eee15
parent be28609b4d3dd9271a65e9b511baa8fa0f47fc53

Making APIs consistent

Formerly, data binding builders had activity, bakuActivity, and
vActivity properties, while syncgroup builders had overloaded activity
properties. To normalize the API, let's just use overloads for both cases.

Change-Id: Iaf698c93b2911b03ce01d2772e5bc00892bf5086

baku-toolkit/lib/src/main/java/io/v/baku/toolkit/BakuActivityMixin.java

diff --git a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/BakuActivityMixin.java b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/BakuActivityMixin.java
index 31e3082..79975d6 100644
--- a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/BakuActivityMixin.java
+++ b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/BakuActivityMixin.java
@@ -117,11 +117,11 @@
 
     public <U> SyncbaseBinding.Builder<U> binder() {
         return SyncbaseBinding.<U>builder()
-                .bakuActivity(this);
+                .activity(this);
     }
 
     public CollectionBinding.Builder collectionBinder() {
         return CollectionBinding.builder()
-                .bakuActivity(this);
+                .activity(this);
     }
 }

baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/BaseBuilder.java

diff --git a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/BaseBuilder.java b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/BaseBuilder.java
index f1e925e..64ba08a 100644
--- a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/BaseBuilder.java
+++ b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/BaseBuilder.java
@@ -40,13 +40,13 @@
     /**
      * Sets the following properties from the given {@link BakuActivityTrait}:
      * <ul>
-     *     <li>{@code activity}</li>
-     *     <li>{@code rxTable}</li>
-     *     <li>{@code subscriptionParent}</li>
-     *     <li>{@code onError}</li>
+     *     <li>{@link #activity(Activity)}</li>
+     *     <li>{@link #rxTable(RxTable)}</li>
+     *     <li>{@link #subscriptionParent(CompositeSubscription)}</li>
+     *     <li>{@link #onError(Action1)}</li>
      * </ul>
      */
-    public T bakuActivity(final BakuActivityTrait<?> trait) {
+    public T activity(final BakuActivityTrait<?> trait) {
         return activity(trait.getVAndroidContextTrait().getAndroidContext())
                 .rxTable(trait.getSyncbaseTable())
                 .subscriptionParent(trait.getSubscriptions())
@@ -56,11 +56,11 @@
     /**
      * Sets the following properties from the given {@link VAndroidContextTrait}:
      * <ul>
-     *     <li>{@code activity}</li>
-     *     <li>{@code onError}</li>
+     *     <li>{@link #activity(Activity)}</li>
+     *     <li>{@link #onError(Action1)}</li>
      * </ul>
      */
-    public T vActivity(final VAndroidContextTrait<? extends Activity> trait) {
+    public T activity(final VAndroidContextTrait<? extends Activity> trait) {
         return activity(trait.getAndroidContext())
                 .onError(ErrorReporters.getDefaultSyncErrorReporter(trait));
     }