Skip to content

Commit 9db9df7

Browse files
committed
SI-7484 Indentation and whitespace fixes
1 parent cba29e6 commit 9db9df7

File tree

5 files changed

+30
-51
lines changed

5 files changed

+30
-51
lines changed

src/library/scala/collection/concurrent/BasicNode.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88

99
package scala.collection.concurrent;
1010

11-
12-
13-
14-
15-
1611
public abstract class BasicNode {
17-
12+
1813
public abstract String string(int lev);
19-
20-
}
14+
15+
}

src/library/scala/collection/concurrent/CNodeBase.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,26 @@
88

99
package scala.collection.concurrent;
1010

11-
12-
1311
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
1412

15-
16-
1713
abstract class CNodeBase<K, V> extends MainNode<K, V> {
18-
14+
1915
@SuppressWarnings("rawtypes")
20-
public static final AtomicIntegerFieldUpdater<CNodeBase> updater = AtomicIntegerFieldUpdater.newUpdater(CNodeBase.class, "csize");
21-
16+
public static final AtomicIntegerFieldUpdater<CNodeBase> updater =
17+
AtomicIntegerFieldUpdater.newUpdater(CNodeBase.class, "csize");
18+
2219
public volatile int csize = -1;
23-
20+
2421
public boolean CAS_SIZE(int oldval, int nval) {
2522
return updater.compareAndSet(this, oldval, nval);
2623
}
27-
24+
2825
public void WRITE_SIZE(int nval) {
2926
updater.set(this, nval);
3027
}
31-
28+
3229
public int READ_SIZE() {
3330
return updater.get(this);
3431
}
35-
32+
3633
}

src/library/scala/collection/concurrent/Gen.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,4 @@
88

99
package scala.collection.concurrent;
1010

11-
12-
13-
14-
15-
16-
final class Gen {
17-
}
18-
11+
final class Gen {}

src/library/scala/collection/concurrent/INodeBase.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,26 @@
88

99
package scala.collection.concurrent;
1010

11-
12-
1311
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
1412

15-
16-
1713
abstract class INodeBase<K, V> extends BasicNode {
18-
14+
1915
@SuppressWarnings("rawtypes")
20-
public static final AtomicReferenceFieldUpdater<INodeBase, MainNode> updater = AtomicReferenceFieldUpdater.newUpdater(INodeBase.class, MainNode.class, "mainnode");
21-
16+
public static final AtomicReferenceFieldUpdater<INodeBase, MainNode> updater =
17+
AtomicReferenceFieldUpdater.newUpdater(INodeBase.class, MainNode.class, "mainnode");
18+
2219
public static final Object RESTART = new Object();
23-
20+
2421
public volatile MainNode<K, V> mainnode = null;
25-
22+
2623
public final Gen gen;
27-
24+
2825
public INodeBase(Gen generation) {
2926
gen = generation;
3027
}
31-
28+
3229
public BasicNode prev() {
3330
return null;
3431
}
35-
32+
3633
}

src/library/scala/collection/concurrent/MainNode.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,32 @@
88

99
package scala.collection.concurrent;
1010

11-
12-
1311
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
1412

15-
16-
1713
abstract class MainNode<K, V> extends BasicNode {
18-
14+
1915
@SuppressWarnings("rawtypes")
20-
public static final AtomicReferenceFieldUpdater<MainNode, MainNode> updater = AtomicReferenceFieldUpdater.newUpdater(MainNode.class, MainNode.class, "prev");
21-
16+
public static final AtomicReferenceFieldUpdater<MainNode, MainNode> updater =
17+
AtomicReferenceFieldUpdater.newUpdater(MainNode.class, MainNode.class, "prev");
18+
2219
public volatile MainNode<K, V> prev = null;
23-
20+
2421
public abstract int cachedSize(Object ct);
25-
22+
2623
public boolean CAS_PREV(MainNode<K, V> oldval, MainNode<K, V> nval) {
2724
return updater.compareAndSet(this, oldval, nval);
2825
}
29-
26+
3027
public void WRITE_PREV(MainNode<K, V> nval) {
3128
updater.set(this, nval);
3229
}
33-
30+
3431
// do we need this? unclear in the javadocs...
3532
// apparently not - volatile reads are supposed to be safe
3633
// irregardless of whether there are concurrent ARFU updates
3734
@Deprecated @SuppressWarnings("unchecked")
3835
public MainNode<K, V> READ_PREV() {
3936
return updater.get(this);
4037
}
41-
38+
4239
}

0 commit comments

Comments
 (0)