Skip to content

Commit c286285

Browse files
Corrected all Java interfaces declarations
1 parent 8758fdd commit c286285

21 files changed

+26
-26
lines changed

src/main/java/rx/Observable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public final static <T> Observable<T> create(OnSubscribe<T> f) {
9898
/**
9999
* Invoked when Obserable.subscribe is called.
100100
*/
101-
public static interface OnSubscribe<T> extends Action1<Subscriber<? super T>> {
101+
public interface OnSubscribe<T> extends Action1<Subscriber<? super T>> {
102102
// cover for generics insanity
103103
}
104104

@@ -191,7 +191,7 @@ public <R> Observable<R> compose(Transformer<? super T, ? extends R> transformer
191191
* Transformer function used by {@link #compose}.
192192
* @warn more complete description needed
193193
*/
194-
public static interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> {
194+
public interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> {
195195
// cover for generics insanity
196196
}
197197

src/main/java/rx/Observer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface Observer<T> {
3434
* <p>
3535
* The {@link Observable} will not call this method if it calls {@link #onError}.
3636
*/
37-
public abstract void onCompleted();
37+
void onCompleted();
3838

3939
/**
4040
* Notifies the Observer that the {@link Observable} has experienced an error condition.
@@ -45,7 +45,7 @@ public interface Observer<T> {
4545
* @param e
4646
* the exception encountered by the Observable
4747
*/
48-
public abstract void onError(Throwable e);
48+
void onError(Throwable e);
4949

5050
/**
5151
* Provides the Observer with a new item to observe.
@@ -58,6 +58,6 @@ public interface Observer<T> {
5858
* @param t
5959
* the item emitted by the Observable
6060
*/
61-
public abstract void onNext(T t);
61+
void onNext(T t);
6262

6363
}

src/main/java/rx/Producer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public interface Producer {
3737
* @param n the maximum number of items you want this Producer to produce, or {@code Long.MAX_VALUE} if you
3838
* want the Producer to produce items at its own pace
3939
*/
40-
public void request(long n);
40+
void request(long n);
4141

4242
}

src/main/java/rx/Subscription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public interface Subscription {
3333
* This allows unregistering an {@link Subscriber} before it has finished receiving all events (i.e. before
3434
* onCompleted is called).
3535
*/
36-
public void unsubscribe();
36+
void unsubscribe();
3737

3838
/**
3939
* Indicates whether this {@code Subscription} is currently unsubscribed.
4040
*
4141
* @return {@code true} if this {@code Subscription} is currently unsubscribed, {@code false} otherwise
4242
*/
43-
public boolean isUnsubscribed();
43+
boolean isUnsubscribed();
4444

4545
}

src/main/java/rx/functions/Action0.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* A zero-argument action.
2020
*/
2121
public interface Action0 extends Action {
22-
public void call();
22+
void call();
2323
}

src/main/java/rx/functions/Action1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* A one-argument action.
2020
*/
2121
public interface Action1<T1> extends Action {
22-
public void call(T1 t1);
22+
void call(T1 t1);
2323
}

src/main/java/rx/functions/Action2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* A two-argument action.
2020
*/
2121
public interface Action2<T1, T2> extends Action {
22-
public void call(T1 t1, T2 t2);
22+
void call(T1 t1, T2 t2);
2323
}

src/main/java/rx/functions/Action3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* A three-argument action.
2020
*/
2121
public interface Action3<T1, T2, T3> extends Action {
22-
public void call(T1 t1, T2 t2, T3 t3);
22+
void call(T1 t1, T2 t2, T3 t3);
2323
}

src/main/java/rx/functions/Func0.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
*/
2323
public interface Func0<R> extends Function, Callable<R> {
2424
@Override
25-
public R call();
25+
R call();
2626
}

src/main/java/rx/functions/Func1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with one argument.
2020
*/
2121
public interface Func1<T1, R> extends Function {
22-
public R call(T1 t1);
22+
R call(T1 t1);
2323
}

src/main/java/rx/functions/Func2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with two arguments.
2020
*/
2121
public interface Func2<T1, T2, R> extends Function {
22-
public R call(T1 t1, T2 t2);
22+
R call(T1 t1, T2 t2);
2323
}

src/main/java/rx/functions/Func3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with three arguments.
2020
*/
2121
public interface Func3<T1, T2, T3, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3);
22+
R call(T1 t1, T2 t2, T3 t3);
2323
}

src/main/java/rx/functions/Func4.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with four arguments.
2020
*/
2121
public interface Func4<T1, T2, T3, T4, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4);
2323
}

src/main/java/rx/functions/Func5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with five arguments.
2020
*/
2121
public interface Func5<T1, T2, T3, T4, T5, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
2323
}

src/main/java/rx/functions/Func6.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with six arguments.
2020
*/
2121
public interface Func6<T1, T2, T3, T4, T5, T6, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
2323
}

src/main/java/rx/functions/Func7.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with seven arguments.
2020
*/
2121
public interface Func7<T1, T2, T3, T4, T5, T6, T7, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
2323
}

src/main/java/rx/functions/Func8.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with eight arguments.
2020
*/
2121
public interface Func8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
2323
}

src/main/java/rx/functions/Func9.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a function with nine arguments.
2020
*/
2121
public interface Func9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends Function {
22-
public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
22+
R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
2323
}

src/main/java/rx/functions/FuncN.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
* Represents a vector-argument function.
2020
*/
2121
public interface FuncN<R> extends Function {
22-
public R call(Object... args);
22+
R call(Object... args);
2323
}

src/main/java/rx/internal/operators/OperatorTimeoutBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class OperatorTimeoutBase<T> implements Operator<T, T> {
3636
*
3737
* @param <T>
3838
*/
39-
/* package-private */static interface FirstTimeoutStub<T> extends
39+
/* package-private */interface FirstTimeoutStub<T> extends
4040
Func3<TimeoutSubscriber<T>, Long, Scheduler.Worker, Subscription> {
4141
}
4242

@@ -45,7 +45,7 @@ class OperatorTimeoutBase<T> implements Operator<T, T> {
4545
*
4646
* @param <T>
4747
*/
48-
/* package-private */static interface TimeoutStub<T> extends
48+
/* package-private */interface TimeoutStub<T> extends
4949
Func4<TimeoutSubscriber<T>, Long, T, Scheduler.Worker, Subscription> {
5050
}
5151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
public class OnSubscribeUsingTest {
4646

47-
private static interface Resource {
47+
private interface Resource {
4848
public String getTextFromWeb();
4949

5050
public void dispose();

0 commit comments

Comments
 (0)