ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/loops/Microscope.java

Comparing jsr166/src/test/loops/Microscope.java (file contents):
Revision 1.7 by jsr166, Mon Oct 10 16:59:04 2011 UTC vs.
Revision 1.8 by jsr166, Mon Dec 5 04:08:46 2011 UTC

#	Line 606 | Line 606 | public class Microscope extends JPanel {
606		// place a tile, taking all adjacent tiles of opponent
607
608		public void take(Player player, int row, int col) {
609	<	int k =  (row + col * RANKS);
609	>	int k = row + col * RANKS;
610		long dest = 1L << k;
611		long nbrMask = adjacentMasks[k];
612		long sourceBlue = blue_;
#	Line 617 | Line 617 | public class Microscope extends JPanel {
617		}
618		else {
619		blue_ = sourceBlue & ~(sourceBlue & nbrMask);
620	<	green_ =  sourceGreen | dest | (sourceBlue & nbrMask);
620	>	green_ = sourceGreen | dest | (sourceBlue & nbrMask);
621		}
622		}
623
#	Line 751 | Line 751 | public class Microscope extends JPanel {
751
752		// setters:
753
754	<	synchronized void player(Player p)       { player_ = p;  }
755	<	synchronized void board(Board b)         { board_ = b;  }
756	<	synchronized void from(int sr, int sc)   { fromRow = sr; fromCol = sc;  }
754	>	synchronized void player(Player p)       { player_ = p; }
755	>	synchronized void board(Board b)         { board_ = b; }
756	>	synchronized void from(int sr, int sc)   { fromRow = sr; fromCol = sc; }
757		synchronized void to(int dr, int dc)     { toRow = dr;   toCol = dc; }
758
759		//  accessors:

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines