Skip to content

3.x: Make DisposableContainer public API #6745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2019
Merged

3.x: Make DisposableContainer public API #6745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.exceptions.*;
import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
import io.reactivex.rxjava3.internal.functions.ObjectHelper;
import io.reactivex.rxjava3.internal.util.*;

Expand Down
6 changes: 2 additions & 4 deletions ...rnal/disposables/DisposableContainer.java → ...ava3/disposables/DisposableContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex.rxjava3.internal.disposables;

import io.reactivex.rxjava3.disposables.Disposable;
package io.reactivex.rxjava3.disposables;

/**
* Common interface to add and remove disposables from a container.
Expand All @@ -38,7 +36,7 @@ public interface DisposableContainer {
boolean remove(Disposable d);

/**
* Removes (but does not dispose) the given disposable if it is part of this
* Removes but does not dispose the given disposable if it is part of this
* container.
* @param d the disposable to remove, not null
* @return true if the operation was successful
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import java.util.*;

import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.disposables.*;
import io.reactivex.rxjava3.exceptions.*;
import io.reactivex.rxjava3.internal.functions.ObjectHelper;
import io.reactivex.rxjava3.internal.util.ExceptionHelper;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import io.reactivex.rxjava3.annotations.*;
import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.disposables.*;
import io.reactivex.rxjava3.internal.disposables.*;
import io.reactivex.rxjava3.plugins.RxJavaPlugins;

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReferenceArray;

import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
import io.reactivex.rxjava3.disposables.*;
import io.reactivex.rxjava3.plugins.RxJavaPlugins;

public final class ScheduledRunnable extends AtomicReferenceArray<Object>
Expand Down