Skip to content

Replaced tabs with spaces for good. #3029

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
Jun 18, 2015
Merged

Replaced tabs with spaces for good. #3029

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
12 changes: 6 additions & 6 deletions src/main/java/rx/internal/util/PaddedAtomicIntegerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@ public final int getAndSet(int newValue) {
}

public final int getAndAdd(int delta) {
return updater.getAndAdd(this, delta);
return updater.getAndAdd(this, delta);
}
public final int incrementAndGet() {
return updater.incrementAndGet(this);
return updater.incrementAndGet(this);
}
public final int decrementAndGet() {
return updater.decrementAndGet(this);
return updater.decrementAndGet(this);
}
public final int getAndIncrement() {
return updater.getAndIncrement(this);
return updater.getAndIncrement(this);
}
public final int getAndDecrement() {
return updater.getAndDecrement(this);
return updater.getAndDecrement(this);
}
public final int addAndGet(int delta) {
return updater.addAndGet(this, delta);
return updater.addAndGet(this, delta);
}

@Override
Expand Down
42 changes: 21 additions & 21 deletions src/test/java/rx/ConcatTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ public void testConcatWithIterableOfObservable() {

@Test
public void testConcatCovariance() {
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
Observable<Media> o1 = Observable.<Media> just(horrorMovie1, movie);
Observable<Media> o2 = Observable.just(media, horrorMovie2);

Expand All @@ -102,12 +102,12 @@ public void testConcatCovariance() {

@Test
public void testConcatCovariance2() {
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media1 = new Media();
Media media2 = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media1 = new Media();
Media media2 = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
Observable<Media> o1 = Observable.just(horrorMovie1, movie, media1);
Observable<Media> o2 = Observable.just(media2, horrorMovie2);

Expand All @@ -125,11 +125,11 @@ public void testConcatCovariance2() {

@Test
public void testConcatCovariance3() {
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
Observable<Movie> o1 = Observable.just(horrorMovie1, movie);
Observable<Media> o2 = Observable.just(media, horrorMovie2);

Expand All @@ -144,11 +144,11 @@ public void testConcatCovariance3() {

@Test
public void testConcatCovariance4() {
final HorrorMovie horrorMovie1 = new HorrorMovie();
final Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
final HorrorMovie horrorMovie1 = new HorrorMovie();
final Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();
Observable<Movie> o1 = Observable.create(new OnSubscribe<Movie>() {

@Override
Expand Down
62 changes: 31 additions & 31 deletions src/test/java/rx/internal/operators/OperatorBufferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,36 +983,36 @@ public void onNext(List<Integer> t) {
}
@Test(timeout = 3000)
public void testBufferWithTimeDoesntUnsubscribeDownstream() throws InterruptedException {
@SuppressWarnings("unchecked")
final Observer<Object> o = mock(Observer.class);
final CountDownLatch cdl = new CountDownLatch(1);
Subscriber<Object> s = new Subscriber<Object>() {
@Override
public void onNext(Object t) {
o.onNext(t);
}
@Override
public void onError(Throwable e) {
o.onError(e);
cdl.countDown();
}
@Override
public void onCompleted() {
o.onCompleted();
cdl.countDown();
}
};
Observable.range(1, 1).delay(1, TimeUnit.SECONDS).buffer(2, TimeUnit.SECONDS).unsafeSubscribe(s);
cdl.await();
verify(o).onNext(Arrays.asList(1));
verify(o).onCompleted();
verify(o, never()).onError(any(Throwable.class));
assertFalse(s.isUnsubscribed());
@SuppressWarnings("unchecked")
final Observer<Object> o = mock(Observer.class);
final CountDownLatch cdl = new CountDownLatch(1);
Subscriber<Object> s = new Subscriber<Object>() {
@Override
public void onNext(Object t) {
o.onNext(t);
}
@Override
public void onError(Throwable e) {
o.onError(e);
cdl.countDown();
}
@Override
public void onCompleted() {
o.onCompleted();
cdl.countDown();
}
};
Observable.range(1, 1).delay(1, TimeUnit.SECONDS).buffer(2, TimeUnit.SECONDS).unsafeSubscribe(s);
cdl.await();
verify(o).onNext(Arrays.asList(1));
verify(o).onCompleted();
verify(o, never()).onError(any(Throwable.class));
assertFalse(s.isUnsubscribed());
}
}
10 changes: 5 additions & 5 deletions src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ public void testBackpressure() {
Observable.range(0, 100000)
.onErrorReturn(new Func1<Throwable, Integer>() {

@Override
public Integer call(Throwable t1) {
return 1;
}
@Override
public Integer call(Throwable t1) {
return 1;
}
})
.observeOn(Schedulers.computation())
.map(new Func1<Integer, Integer>() {
Expand Down