Skip to content

Commit 476ce0a

Browse files
committed
Merge pull request #3029 from akarnokd/TabsReplacedWithSpaces
Replaced tabs with spaces for good.
2 parents ec3d522 + 9619bb0 commit 476ce0a

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

src/main/java/rx/internal/util/PaddedAtomicIntegerBase.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ public final int getAndSet(int newValue) {
5959
}
6060

6161
public final int getAndAdd(int delta) {
62-
return updater.getAndAdd(this, delta);
62+
return updater.getAndAdd(this, delta);
6363
}
6464
public final int incrementAndGet() {
65-
return updater.incrementAndGet(this);
65+
return updater.incrementAndGet(this);
6666
}
6767
public final int decrementAndGet() {
68-
return updater.decrementAndGet(this);
68+
return updater.decrementAndGet(this);
6969
}
7070
public final int getAndIncrement() {
71-
return updater.getAndIncrement(this);
71+
return updater.getAndIncrement(this);
7272
}
7373
public final int getAndDecrement() {
74-
return updater.getAndDecrement(this);
74+
return updater.getAndDecrement(this);
7575
}
7676
public final int addAndGet(int delta) {
77-
return updater.addAndGet(this, delta);
77+
return updater.addAndGet(this, delta);
7878
}
7979

8080
@Override

src/test/java/rx/ConcatTests.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ public void testConcatWithIterableOfObservable() {
8181

8282
@Test
8383
public void testConcatCovariance() {
84-
HorrorMovie horrorMovie1 = new HorrorMovie();
85-
Movie movie = new Movie();
86-
Media media = new Media();
87-
HorrorMovie horrorMovie2 = new HorrorMovie();
88-
84+
HorrorMovie horrorMovie1 = new HorrorMovie();
85+
Movie movie = new Movie();
86+
Media media = new Media();
87+
HorrorMovie horrorMovie2 = new HorrorMovie();
88+
8989
Observable<Media> o1 = Observable.<Media> just(horrorMovie1, movie);
9090
Observable<Media> o2 = Observable.just(media, horrorMovie2);
9191

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

103103
@Test
104104
public void testConcatCovariance2() {
105-
HorrorMovie horrorMovie1 = new HorrorMovie();
106-
Movie movie = new Movie();
107-
Media media1 = new Media();
108-
Media media2 = new Media();
109-
HorrorMovie horrorMovie2 = new HorrorMovie();
110-
105+
HorrorMovie horrorMovie1 = new HorrorMovie();
106+
Movie movie = new Movie();
107+
Media media1 = new Media();
108+
Media media2 = new Media();
109+
HorrorMovie horrorMovie2 = new HorrorMovie();
110+
111111
Observable<Media> o1 = Observable.just(horrorMovie1, movie, media1);
112112
Observable<Media> o2 = Observable.just(media2, horrorMovie2);
113113

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

126126
@Test
127127
public void testConcatCovariance3() {
128-
HorrorMovie horrorMovie1 = new HorrorMovie();
129-
Movie movie = new Movie();
130-
Media media = new Media();
131-
HorrorMovie horrorMovie2 = new HorrorMovie();
132-
128+
HorrorMovie horrorMovie1 = new HorrorMovie();
129+
Movie movie = new Movie();
130+
Media media = new Media();
131+
HorrorMovie horrorMovie2 = new HorrorMovie();
132+
133133
Observable<Movie> o1 = Observable.just(horrorMovie1, movie);
134134
Observable<Media> o2 = Observable.just(media, horrorMovie2);
135135

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

145145
@Test
146146
public void testConcatCovariance4() {
147-
final HorrorMovie horrorMovie1 = new HorrorMovie();
148-
final Movie movie = new Movie();
149-
Media media = new Media();
150-
HorrorMovie horrorMovie2 = new HorrorMovie();
151-
147+
final HorrorMovie horrorMovie1 = new HorrorMovie();
148+
final Movie movie = new Movie();
149+
Media media = new Media();
150+
HorrorMovie horrorMovie2 = new HorrorMovie();
151+
152152
Observable<Movie> o1 = Observable.create(new OnSubscribe<Movie>() {
153153

154154
@Override

src/test/java/rx/internal/operators/OperatorBufferTest.java

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -983,36 +983,36 @@ public void onNext(List<Integer> t) {
983983
}
984984
@Test(timeout = 3000)
985985
public void testBufferWithTimeDoesntUnsubscribeDownstream() throws InterruptedException {
986-
@SuppressWarnings("unchecked")
987-
final Observer<Object> o = mock(Observer.class);
988-
989-
990-
final CountDownLatch cdl = new CountDownLatch(1);
991-
Subscriber<Object> s = new Subscriber<Object>() {
992-
@Override
993-
public void onNext(Object t) {
994-
o.onNext(t);
995-
}
996-
@Override
997-
public void onError(Throwable e) {
998-
o.onError(e);
999-
cdl.countDown();
1000-
}
1001-
@Override
1002-
public void onCompleted() {
1003-
o.onCompleted();
1004-
cdl.countDown();
1005-
}
1006-
};
1007-
1008-
Observable.range(1, 1).delay(1, TimeUnit.SECONDS).buffer(2, TimeUnit.SECONDS).unsafeSubscribe(s);
1009-
1010-
cdl.await();
1011-
1012-
verify(o).onNext(Arrays.asList(1));
1013-
verify(o).onCompleted();
1014-
verify(o, never()).onError(any(Throwable.class));
1015-
1016-
assertFalse(s.isUnsubscribed());
986+
@SuppressWarnings("unchecked")
987+
final Observer<Object> o = mock(Observer.class);
988+
989+
990+
final CountDownLatch cdl = new CountDownLatch(1);
991+
Subscriber<Object> s = new Subscriber<Object>() {
992+
@Override
993+
public void onNext(Object t) {
994+
o.onNext(t);
995+
}
996+
@Override
997+
public void onError(Throwable e) {
998+
o.onError(e);
999+
cdl.countDown();
1000+
}
1001+
@Override
1002+
public void onCompleted() {
1003+
o.onCompleted();
1004+
cdl.countDown();
1005+
}
1006+
};
1007+
1008+
Observable.range(1, 1).delay(1, TimeUnit.SECONDS).buffer(2, TimeUnit.SECONDS).unsafeSubscribe(s);
1009+
1010+
cdl.await();
1011+
1012+
verify(o).onNext(Arrays.asList(1));
1013+
verify(o).onCompleted();
1014+
verify(o, never()).onError(any(Throwable.class));
1015+
1016+
assertFalse(s.isUnsubscribed());
10171017
}
10181018
}

src/test/java/rx/internal/operators/OperatorOnErrorReturnTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ public void testBackpressure() {
153153
Observable.range(0, 100000)
154154
.onErrorReturn(new Func1<Throwable, Integer>() {
155155

156-
@Override
157-
public Integer call(Throwable t1) {
158-
return 1;
159-
}
160-
156+
@Override
157+
public Integer call(Throwable t1) {
158+
return 1;
159+
}
160+
161161
})
162162
.observeOn(Schedulers.computation())
163163
.map(new Func1<Integer, Integer>() {

0 commit comments

Comments
 (0)