OperatorWeakBinding -> OperatorConditionalBinding

Author: mttkay

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/AndroidObservable.java

@@ -20,7 +20,7 @@
 import rx.Observable;
 import rx.functions.Func1;
 import rx.operators.OperatorObserveFromAndroidComponent;
-import rx.operators.OperatorWeakBinding;
+import rx.operators.OperatorConditionalBinding;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -146,7 +146,7 @@ public static <T> Observable<T> fromFragment(Object fragment, Observable<T> sour
      */
     public static <T> Observable<T> bindActivity(Activity activity, Observable<T> source) {
         Assertions.assertUiThread();
-        return source.observeOn(mainThread()).lift(new OperatorWeakBinding<T, Activity>(activity, ACTIVITY_VALIDATOR));
+        return source.observeOn(mainThread()).lift(new OperatorConditionalBinding<T, Activity>(activity, ACTIVITY_VALIDATOR));
     }
 
     /**
@@ -168,10 +168,10 @@ public static <T> Observable<T> bindFragment(Object fragment, Observable<T> sour
         final Observable<T> o = source.observeOn(mainThread());
         if (USES_SUPPORT_FRAGMENTS && fragment instanceof android.support.v4.app.Fragment) {
             android.support.v4.app.Fragment f = (android.support.v4.app.Fragment) fragment;
-            return o.lift(new OperatorWeakBinding<T, android.support.v4.app.Fragment>(f, FRAGMENTV4_VALIDATOR));
+            return o.lift(new OperatorConditionalBinding<T, android.support.v4.app.Fragment>(f, FRAGMENTV4_VALIDATOR));
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB && fragment instanceof Fragment) {
             Fragment f = (Fragment) fragment;
-            return o.lift(new OperatorWeakBinding<T, Fragment>(f, FRAGMENT_VALIDATOR));
+            return o.lift(new OperatorConditionalBinding<T, Fragment>(f, FRAGMENT_VALIDATOR));
         } else {
             throw new IllegalArgumentException("Target fragment is neither a native nor support library Fragment");
         }

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorWeakBinding.java renamed to rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorConditionalBinding.java

@@ -17,19 +17,19 @@
  * @param <T> the type of the objects emitted to a subscriber
  * @param <R> the type of the target object to bind to
  */
-public final class OperatorWeakBinding<T, R> implements Observable.Operator<T, T> {
+public final class OperatorConditionalBinding<T, R> implements Observable.Operator<T, T> {
 
-    private static final String LOG_TAG = "WeakBinding";
+    private static final String LOG_TAG = "ConditionalBinding";
 
     private R boundRef;
     private final Func1<? super R, Boolean> predicate;
 
-    public OperatorWeakBinding(R bound, Func1<? super R, Boolean> predicate) {
+    public OperatorConditionalBinding(R bound, Func1<? super R, Boolean> predicate) {
         boundRef = bound;
         this.predicate = predicate;
     }
 
-    public OperatorWeakBinding(R bound) {
+    public OperatorConditionalBinding(R bound) {
         boundRef = bound;
         this.predicate = Functions.alwaysTrue();
     }

rxjava-contrib/rxjava-android/src/test/java/rx/operators/OperatorWeakBindingTest.java renamed to rxjava-contrib/rxjava-android/src/test/java/rx/operators/OperatorConditionalBindingTest.java

@@ -16,7 +16,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @RunWith(RobolectricTestRunner.class)
-public class OperatorWeakBindingTest {
+public class OperatorConditionalBindingTest {
 
     private TestSubscriber<String> subscriber = new TestSubscriber<String>();
 
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
     @Test
     public void shouldReleaseBoundReferenceIfPredicateFailsToPass() {
         final AtomicBoolean toggle = new AtomicBoolean(true);
-        OperatorWeakBinding<String, Object> op = new OperatorWeakBinding<String, Object>(
+        OperatorConditionalBinding<String, Object> op = new OperatorConditionalBinding<String, Object>(
                 new Object(), new Func1<Object, Boolean>() {
             @Override
             public Boolean call(Object o) {
@@ -51,7 +51,7 @@ public Boolean call(Object o) {
 
     @Test
     public void shouldUnsubscribeFromSourceSequenceWhenPredicateFailsToPass() {
-        OperatorWeakBinding<String, Object> op = new OperatorWeakBinding<String, Object>(
+        OperatorConditionalBinding<String, Object> op = new OperatorConditionalBinding<String, Object>(
                 new Object(), Functions.alwaysFalse());
 
         Subscriber<? super String> sub = op.call(subscriber);
@@ -67,7 +67,7 @@ public void shouldUnsubscribeFromSourceSequenceWhenPredicateFailsToPass() {
 
     @Test
     public void unsubscribeWillUnsubscribeFromWrappedSubscriber() {
-        OperatorWeakBinding<String, Object> op = new OperatorWeakBinding<String, Object>(new Object());
+        OperatorConditionalBinding<String, Object> op = new OperatorConditionalBinding<String, Object>(new Object());
 
         op.call(subscriber).unsubscribe();
         subscriber.assertUnsubscribed();