Skip to content

Commit 5ec27bf

Browse files
author
Klemen Kresnik
committed
Dont keep indents on empty lines.
1 parent edacaf9 commit 5ec27bf

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/main/java/rx/subscriptions/CompositeSubscription.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
* All methods of this class are thread-safe.
3232
*/
3333
public final class CompositeSubscription implements Subscription {
34-
34+
3535
private Set<Subscription> subscriptions;
3636
private volatile boolean unsubscribed;
37-
37+
3838
public CompositeSubscription() {
3939
}
40-
40+
4141
public CompositeSubscription(final Subscription... subscriptions) {
4242
this.subscriptions = new HashSet<Subscription>(Arrays.asList(subscriptions));
4343
}
44-
44+
4545
@Override
4646
public boolean isUnsubscribed() {
4747
return unsubscribed;
4848
}
49-
49+
5050
/**
5151
* Adds a new {@link Subscription} to this {@code CompositeSubscription} if the
5252
* {@code CompositeSubscription} is not yet unsubscribed. If the {@code CompositeSubscription} <em>is</em>
@@ -74,7 +74,7 @@ public void add(final Subscription s) {
7474
// call after leaving the synchronized block so we're not holding a lock while executing this
7575
s.unsubscribe();
7676
}
77-
77+
7878
/**
7979
* Adds collection of {@link Subscription} to this {@code CompositeSubscription} if the
8080
* {@code CompositeSubscription} is not yet unsubscribed. If the {@code CompositeSubscription} <em>is</em>
@@ -91,7 +91,7 @@ public void addAll(final Subscription... subscriptions) {
9191
subscriptionList.add(s);
9292
}
9393
}
94-
94+
9595
if (!unsubscribed) {
9696
synchronized (this) {
9797
if (!unsubscribed) {
@@ -103,12 +103,12 @@ public void addAll(final Subscription... subscriptions) {
103103
}
104104
}
105105
}
106-
106+
107107
for (Subscription s : subscriptionList) {
108108
s.unsubscribe();
109109
}
110110
}
111-
111+
112112
/**
113113
* Removes a {@link Subscription} from this {@code CompositeSubscription}, and unsubscribes the
114114
* {@link Subscription}.
@@ -131,7 +131,7 @@ public void remove(final Subscription s) {
131131
}
132132
}
133133
}
134-
134+
135135
/**
136136
* Unsubscribes any subscriptions that are currently part of this {@code CompositeSubscription} and remove
137137
* them from the {@code CompositeSubscription} so that the {@code CompositeSubscription} is empty and
@@ -151,7 +151,7 @@ public void clear() {
151151
unsubscribeFromAll(unsubscribe);
152152
}
153153
}
154-
154+
155155
/**
156156
* Unsubscribes itself and all inner subscriptions.
157157
* <p>After call of this method, new {@code Subscription}s added to {@link CompositeSubscription}
@@ -173,7 +173,7 @@ public void unsubscribe() {
173173
unsubscribeFromAll(unsubscribe);
174174
}
175175
}
176-
176+
177177
private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
178178
if (subscriptions == null) {
179179
return;
@@ -191,7 +191,7 @@ private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
191191
}
192192
Exceptions.throwIfAny(es);
193193
}
194-
194+
195195
/**
196196
* Returns true if this composite is not unsubscribed and contains subscriptions.
197197
*

src/test/java/rx/subscriptions/CompositeSubscriptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public boolean isUnsubscribed() {
6565

6666
assertEquals(2, counter.get());
6767
}
68-
68+
6969
@Test(timeout = 1000)
7070
public void shouldUnsubscribeAll() throws InterruptedException {
7171
final AtomicInteger counter = new AtomicInteger();

0 commit comments

Comments
 (0)