--- jsr166/src/jsr166y/Phaser.java	2009/07/21 18:11:44	1.15
+++ jsr166/src/jsr166y/Phaser.java	2009/07/23 23:07:57	1.18
@@ -175,6 +175,9 @@ import java.lang.reflect.*;
  * parties result in IllegalStateExceptions. However, you can and
  * should create tiered phasers to accommodate arbitrarily large sets
  * of participants.
+ *
+ * @since 1.7
+ * @author Doug Lea
  */
 public class Phaser {
     /*
@@ -208,15 +211,15 @@ public class Phaser {
     private static final int phaseMask  = 0x7fffffff;
 
     private static int unarrivedOf(long s) {
-        return (int)(s & ushortMask);
+        return (int) (s & ushortMask);
     }
 
     private static int partiesOf(long s) {
-        return ((int)s) >>> 16;
+        return ((int) s) >>> 16;
     }
 
     private static int phaseOf(long s) {
-        return (int)(s >>> 32);
+        return (int) (s >>> 32);
     }
 
     private static int arrivedOf(long s) {
@@ -224,13 +227,13 @@ public class Phaser {
     }
 
     private static long stateFor(int phase, int parties, int unarrived) {
-        return ((((long)phase) << 32) | (((long)parties) << 16) |
-                (long)unarrived);
+        return ((((long) phase) << 32) | (((long) parties) << 16) |
+                (long) unarrived);
     }
 
     private static long trippedStateFor(int phase, int parties) {
-        long lp = (long)parties;
-        return (((long)phase) << 32) | (lp << 16) | lp;
+        long lp = (long) parties;
+        return (((long) phase) << 32) | (lp << 16) | lp;
     }
 
     /**
@@ -263,7 +266,7 @@ public class Phaser {
     private final AtomicReference<QNode> oddQ  = new AtomicReference<QNode>();
 
     private AtomicReference<QNode> queueFor(int phase) {
-        return (phase & 1) == 0? evenQ : oddQ;
+        return ((phase & 1) == 0) ? evenQ : oddQ;
     }
 
     /**
@@ -271,7 +274,7 @@ public class Phaser {
      * root if necessary.
      */
     private long getReconciledState() {
-        return parent == null? state : reconcileState();
+        return (parent == null) ? state : reconcileState();
     }
 
     /**
@@ -438,7 +441,7 @@ public class Phaser {
                 if (par == null) {      // directly trip
                     if (casState
                         (s,
-                         trippedStateFor(onAdvance(phase, parties)? -1 :
+                         trippedStateFor(onAdvance(phase, parties) ? -1 :
                                          ((phase + 1) & phaseMask), parties))) {
                         releaseWaiters(phase);
                         break;
@@ -499,7 +502,7 @@ public class Phaser {
                 if (unarrived == 0) {
                     if (casState
                         (s,
-                         trippedStateFor(onAdvance(phase, parties)? -1 :
+                         trippedStateFor(onAdvance(phase, parties) ? -1 :
                                          ((phase + 1) & phaseMask), parties))) {
                         releaseWaiters(phase);
                         break;
@@ -584,7 +587,8 @@ public class Phaser {
      * @throws InterruptedException if thread interrupted while waiting
      * @throws TimeoutException if timed out while waiting
      */
-    public int awaitAdvanceInterruptibly(int phase, long timeout, TimeUnit unit)
+    public int awaitAdvanceInterruptibly(int phase,
+                                         long timeout, TimeUnit unit)
         throws InterruptedException, TimeoutException {
         if (phase < 0)
             return phase;