rename emitters #isCancelled to #isDisposed (#4490)

ReactiveX · Sep 6, 2016 · 10f727f · 10f727f
1 parent ff3c5d0
commit 10f727f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 36 deletions.
diff --git a/src/main/java/io/reactivex/CompletableEmitter.java b/src/main/java/io/reactivex/CompletableEmitter.java
@@ -52,8 +52,8 @@ public interface CompletableEmitter {
     void setCancellable(Cancellable c);
 
     /**
-     * Returns true if the downstream cancelled the sequence.
-     * @return true if the downstream cancelled the sequence
+     * Returns true if the downstream disposed the sequence.
+     * @return true if the downstream disposed the sequence
      */
-    boolean isCancelled();
+    boolean isDisposed();
 }
diff --git a/src/main/java/io/reactivex/MaybeEmitter.java b/src/main/java/io/reactivex/MaybeEmitter.java
@@ -63,5 +63,5 @@ public interface MaybeEmitter<T> {
      * Returns true if the downstream cancelled the sequence.
      * @return true if the downstream cancelled the sequence
      */
-    boolean isCancelled();
+    boolean isDisposed();
 }
diff --git a/src/main/java/io/reactivex/ObservableEmitter.java b/src/main/java/io/reactivex/ObservableEmitter.java
@@ -42,13 +42,13 @@ public interface ObservableEmitter<T> extends Emitter<T> {
      * @param c the cancellable resource, null is allowed
      */
     void setCancellable(Cancellable c);
-    
+
     /**
-     * Returns true if the downstream cancelled the sequence.
-     * @return true if the downstream cancelled the sequence
+     * Returns true if the downstream disposed the sequence.
+     * @return true if the downstream disposed the sequence
      */
-    boolean isCancelled();
-    
+    boolean isDisposed();
+
     /**
      * Ensures that calls to onNext, onError and onComplete are properly serialized.
      * @return the serialized FlowableEmitter

diff --git a/src/main/java/io/reactivex/SingleEmitter.java b/src/main/java/io/reactivex/SingleEmitter.java
@@ -58,5 +58,5 @@ public interface SingleEmitter<T> {
      * Returns true if the downstream cancelled the sequence.
      * @return true if the downstream cancelled the sequence
      */
-    boolean isCancelled();
+    boolean isDisposed();
 }
diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java b/src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java
@@ -103,11 +103,6 @@ public void setCancellable(Cancellable c) {
             setDisposable(new CancellableDisposable(c));
         }
 
-        @Override
-        public boolean isCancelled() {
-            return DisposableHelper.isDisposed(get());
-        }
-
         @Override
         public void dispose() {
             DisposableHelper.dispose(this);

diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java b/src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java
@@ -129,11 +129,6 @@ public void setCancellable(Cancellable c) {
             setDisposable(new CancellableDisposable(c));
         }
 
-        @Override
-        public boolean isCancelled() {
-            return DisposableHelper.isDisposed(get());
-        }
-
         @Override
         public void dispose() {
             DisposableHelper.dispose(this);

diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java
@@ -104,11 +104,6 @@ public void setCancellable(Cancellable c) {
             setDisposable(new CancellableDisposable(c));
         }
 
-        @Override
-        public boolean isCancelled() {
-            return isDisposed();
-        }
-
         @Override
         public ObservableEmitter<T> serialize() {
             return new SerializedEmitter<T>(this);
@@ -152,7 +147,7 @@ public SerializedEmitter(ObservableEmitter<T> emitter) {
 
         @Override
         public void onNext(T t) {
-            if (emitter.isCancelled() || done) {
+            if (emitter.isDisposed() || done) {
                 return;
             }
             if (t == null) {
@@ -178,7 +173,7 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            if (emitter.isCancelled() || done) {
+            if (emitter.isDisposed() || done) {
                 RxJavaPlugins.onError(t);
                 return;
             }
@@ -195,7 +190,7 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
-            if (emitter.isCancelled() || done) {
+            if (emitter.isDisposed() || done) {
                 return;
             }
             done = true;
@@ -216,7 +211,7 @@ void drainLoop() {
             for (;;) {
 
                 for (;;) {
-                    if (e.isCancelled()) {
+                    if (e.isDisposed()) {
                         q.clear();
                         return;
                     }
@@ -270,8 +265,8 @@ public void setCancellable(Cancellable c) {
         }
 
         @Override
-        public boolean isCancelled() {
-            return emitter.isCancelled();
+        public boolean isDisposed() {
+            return emitter.isDisposed();
         }
 
         @Override

diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleCreate.java b/src/main/java/io/reactivex/internal/operators/single/SingleCreate.java
@@ -107,11 +107,6 @@ public void setCancellable(Cancellable c) {
             setDisposable(new CancellableDisposable(c));
         }
 
-        @Override
-        public boolean isCancelled() {
-            return DisposableHelper.isDisposed(get());
-        }
-
         @Override
         public void dispose() {
             DisposableHelper.dispose(this);