Merge pull request #2539 from soc/SI-7484

SI-7484 Add @SupressWarning("rawtypes") to MainNode.java

5 files changed, 31 insertions, 48 deletions

diff --git a/src/library/scala/collection/concurrent/BasicNode.java b/src/library/scala/collection/concurrent/BasicNode.java
index a65d84bbf8..97b8870036 100644
--- a/src/library/scala/collection/concurrent/BasicNode.java
+++ b/src/library/scala/collection/concurrent/BasicNode.java
@@ -8,13 +8,8 @@
 
 package scala.collection.concurrent;
 
-
-
-
-
-
 public abstract class BasicNode {
-    
+
     public abstract String string(int lev);
-    
-}
\ No newline at end of file
+
+}
diff --git a/src/library/scala/collection/concurrent/CNodeBase.java b/src/library/scala/collection/concurrent/CNodeBase.java
index d6eb29c8df..2fce971b2b 100644
--- a/src/library/scala/collection/concurrent/CNodeBase.java
+++ b/src/library/scala/collection/concurrent/CNodeBase.java
@@ -8,28 +8,26 @@
 
 package scala.collection.concurrent;
 
-
-
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
+abstract class CNodeBase<K, V> extends MainNode<K, V> {
 
+    @SuppressWarnings("rawtypes")
+    public static final AtomicIntegerFieldUpdater<CNodeBase> updater =
+            AtomicIntegerFieldUpdater.newUpdater(CNodeBase.class, "csize");
 
-abstract class CNodeBase<K, V> extends MainNode<K, V> {
-    
-    public static final AtomicIntegerFieldUpdater<CNodeBase> updater = AtomicIntegerFieldUpdater.newUpdater(CNodeBase.class, "csize");
-    
     public volatile int csize = -1;
-    
+
     public boolean CAS_SIZE(int oldval, int nval) {
 	return updater.compareAndSet(this, oldval, nval);
     }
-    
+
     public void WRITE_SIZE(int nval) {
 	updater.set(this, nval);
     }
-    
+
     public int READ_SIZE() {
 	return updater.get(this);
     }
-    
+
 }
\ No newline at end of file
diff --git a/src/library/scala/collection/concurrent/Gen.java b/src/library/scala/collection/concurrent/Gen.java
index 331eeca16b..6019884683 100644
--- a/src/library/scala/collection/concurrent/Gen.java
+++ b/src/library/scala/collection/concurrent/Gen.java
@@ -8,11 +8,4 @@
 
 package scala.collection.concurrent;
 
-
-
-
-
-
-final class Gen {
-}
-
+final class Gen {}
diff --git a/src/library/scala/collection/concurrent/INodeBase.java b/src/library/scala/collection/concurrent/INodeBase.java
index cbe404edf6..2f2d203287 100644
--- a/src/library/scala/collection/concurrent/INodeBase.java
+++ b/src/library/scala/collection/concurrent/INodeBase.java
@@ -8,28 +8,26 @@
 
 package scala.collection.concurrent;
 
-
-
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
+abstract class INodeBase<K, V> extends BasicNode {
 
+    @SuppressWarnings("rawtypes")
+    public static final AtomicReferenceFieldUpdater<INodeBase, MainNode> updater =
+            AtomicReferenceFieldUpdater.newUpdater(INodeBase.class, MainNode.class, "mainnode");
 
-abstract class INodeBase<K, V> extends BasicNode {
-    
-    public static final AtomicReferenceFieldUpdater<INodeBase, MainNode> updater = AtomicReferenceFieldUpdater.newUpdater(INodeBase.class, MainNode.class, "mainnode");
-    
     public static final Object RESTART = new Object();
-    
+
     public volatile MainNode<K, V> mainnode = null;
-    
+
     public final Gen gen;
-    
+
     public INodeBase(Gen generation) {
 	gen = generation;
     }
-    
+
     public BasicNode prev() {
 	return null;
     }
-    
+
 }
\ No newline at end of file
diff --git a/src/library/scala/collection/concurrent/MainNode.java b/src/library/scala/collection/concurrent/MainNode.java
index ffe535742e..adb9b59a3d 100644
--- a/src/library/scala/collection/concurrent/MainNode.java
+++ b/src/library/scala/collection/concurrent/MainNode.java
@@ -8,33 +8,32 @@
 
 package scala.collection.concurrent;
 
-
-
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
+abstract class MainNode<K, V> extends BasicNode {
 
+    @SuppressWarnings("rawtypes")
+    public static final AtomicReferenceFieldUpdater<MainNode, MainNode> updater =
+            AtomicReferenceFieldUpdater.newUpdater(MainNode.class, MainNode.class, "prev");
 
-abstract class MainNode<K, V> extends BasicNode {
-    
-    public static final AtomicReferenceFieldUpdater<MainNode, MainNode> updater = AtomicReferenceFieldUpdater.newUpdater(MainNode.class, MainNode.class, "prev");
-    
     public volatile MainNode<K, V> prev = null;
-    
+
     public abstract int cachedSize(Object ct);
-    
+
     public boolean CAS_PREV(MainNode<K, V> oldval, MainNode<K, V> nval) {
 	return updater.compareAndSet(this, oldval, nval);
     }
-    
+
     public void WRITE_PREV(MainNode<K, V> nval) {
 	updater.set(this, nval);
     }
-    
+
     // do we need this? unclear in the javadocs...
     // apparently not - volatile reads are supposed to be safe
     // irregardless of whether there are concurrent ARFU updates
+    @Deprecated @SuppressWarnings("unchecked")
     public MainNode<K, V> READ_PREV() {
 	return updater.get(this);
     }
-    
+
 }
\ No newline at end of file