Skip to content

Commit 10f727f

Browse files
Mauinakarnokd
authored andcommitted
rename emitters #isCancelled to #isDisposed (#4490)
1 parent ff3c5d0 commit 10f727f

File tree

8 files changed

+16
-36
lines changed

8 files changed

+16
-36
lines changed

src/main/java/io/reactivex/CompletableEmitter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public interface CompletableEmitter {
5252
void setCancellable(Cancellable c);
5353

5454
/**
55-
* Returns true if the downstream cancelled the sequence.
56-
* @return true if the downstream cancelled the sequence
55+
* Returns true if the downstream disposed the sequence.
56+
* @return true if the downstream disposed the sequence
5757
*/
58-
boolean isCancelled();
58+
boolean isDisposed();
5959
}

src/main/java/io/reactivex/MaybeEmitter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ public interface MaybeEmitter<T> {
6363
* Returns true if the downstream cancelled the sequence.
6464
* @return true if the downstream cancelled the sequence
6565
*/
66-
boolean isCancelled();
66+
boolean isDisposed();
6767
}

src/main/java/io/reactivex/ObservableEmitter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public interface ObservableEmitter<T> extends Emitter<T> {
4242
* @param c the cancellable resource, null is allowed
4343
*/
4444
void setCancellable(Cancellable c);
45-
45+
4646
/**
47-
* Returns true if the downstream cancelled the sequence.
48-
* @return true if the downstream cancelled the sequence
47+
* Returns true if the downstream disposed the sequence.
48+
* @return true if the downstream disposed the sequence
4949
*/
50-
boolean isCancelled();
51-
50+
boolean isDisposed();
51+
5252
/**
5353
* Ensures that calls to onNext, onError and onComplete are properly serialized.
5454
* @return the serialized FlowableEmitter

src/main/java/io/reactivex/SingleEmitter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ public interface SingleEmitter<T> {
5858
* Returns true if the downstream cancelled the sequence.
5959
* @return true if the downstream cancelled the sequence
6060
*/
61-
boolean isCancelled();
61+
boolean isDisposed();
6262
}

src/main/java/io/reactivex/internal/operators/completable/CompletableCreate.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ public void setCancellable(Cancellable c) {
103103
setDisposable(new CancellableDisposable(c));
104104
}
105105

106-
@Override
107-
public boolean isCancelled() {
108-
return DisposableHelper.isDisposed(get());
109-
}
110-
111106
@Override
112107
public void dispose() {
113108
DisposableHelper.dispose(this);

src/main/java/io/reactivex/internal/operators/maybe/MaybeCreate.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ public void setCancellable(Cancellable c) {
129129
setDisposable(new CancellableDisposable(c));
130130
}
131131

132-
@Override
133-
public boolean isCancelled() {
134-
return DisposableHelper.isDisposed(get());
135-
}
136-
137132
@Override
138133
public void dispose() {
139134
DisposableHelper.dispose(this);

src/main/java/io/reactivex/internal/operators/observable/ObservableCreate.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ public void setCancellable(Cancellable c) {
104104
setDisposable(new CancellableDisposable(c));
105105
}
106106

107-
@Override
108-
public boolean isCancelled() {
109-
return isDisposed();
110-
}
111-
112107
@Override
113108
public ObservableEmitter<T> serialize() {
114109
return new SerializedEmitter<T>(this);
@@ -152,7 +147,7 @@ public SerializedEmitter(ObservableEmitter<T> emitter) {
152147

153148
@Override
154149
public void onNext(T t) {
155-
if (emitter.isCancelled() || done) {
150+
if (emitter.isDisposed() || done) {
156151
return;
157152
}
158153
if (t == null) {
@@ -178,7 +173,7 @@ public void onNext(T t) {
178173

179174
@Override
180175
public void onError(Throwable t) {
181-
if (emitter.isCancelled() || done) {
176+
if (emitter.isDisposed() || done) {
182177
RxJavaPlugins.onError(t);
183178
return;
184179
}
@@ -195,7 +190,7 @@ public void onError(Throwable t) {
195190

196191
@Override
197192
public void onComplete() {
198-
if (emitter.isCancelled() || done) {
193+
if (emitter.isDisposed() || done) {
199194
return;
200195
}
201196
done = true;
@@ -216,7 +211,7 @@ void drainLoop() {
216211
for (;;) {
217212

218213
for (;;) {
219-
if (e.isCancelled()) {
214+
if (e.isDisposed()) {
220215
q.clear();
221216
return;
222217
}
@@ -270,8 +265,8 @@ public void setCancellable(Cancellable c) {
270265
}
271266

272267
@Override
273-
public boolean isCancelled() {
274-
return emitter.isCancelled();
268+
public boolean isDisposed() {
269+
return emitter.isDisposed();
275270
}
276271

277272
@Override

src/main/java/io/reactivex/internal/operators/single/SingleCreate.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ public void setCancellable(Cancellable c) {
107107
setDisposable(new CancellableDisposable(c));
108108
}
109109

110-
@Override
111-
public boolean isCancelled() {
112-
return DisposableHelper.isDisposed(get());
113-
}
114-
115110
@Override
116111
public void dispose() {
117112
DisposableHelper.dispose(this);

0 commit comments

Comments
 (0)