package model;

/**
 * Stores the current state of the player's game. Represents the action they are
 * currently undertaking, if any.
 *
 * @author Eli Skeggs, Nick Chaput
 */
public enum PlayerState {
  NONE,
  REMOVE,
  // if we want an animation or something, this could be the current move to
  // disable user interaction
  SCRAMBLE,
  SELECT,
  SWAP;
  
  public String toString() {
	  switch (this) {
	    case REMOVE:
	          return "REMOVE";
	    case SCRAMBLE:
		      return "SCRAMBLE";
	    case SELECT:
		      return "SELECT";
	    case SWAP:
	          return "SWAP";
	    default:
	    	  return "NONE";
	      // do nothing!
	    }
  }
}

@@ -202,16 +202,24 @@
 %7B%0A  NONE
+(%22NONE%22)
 ,%0A  REMO
@@ -220,16 +220,26 @@
   REMOVE
+(%22REMOVE%22)
 ,%0A  // i
@@ -353,322 +353,194 @@
 MBLE
-,%0A  SELECT,%0A  SWAP;%0A  %0A  public String toString() %7B%0A%09  switch (this
+(%22SCRAMBLE%22),%0A  SELECT(%22SELECT%22),%0A  SWAP(%22SWAP%22);%0A%0A  public final String str;%0A%0A  private PlayerState(String str
 ) %7B%0A
-%09
     
-case REMOVE:%0A%09          return %22REMOVE%22;%0A%09    case SCRAMBLE:%0A%09%09      return %22SCRAMBLE%22;%0A%09    case SELECT:%0A%09%09      return %22SELECT%22;%0A%09    case SWAP:%0A%09          return %22SWAP%22;%0A%09    default:%0A%09    %09  return %22NONE%22;%0A%09      // do nothing!%0A%09    %7D
+this.str = str;%0A  %7D%0A  %0A  public String toString() %7B%0A    return str;
 %0A  %7D

Add better toString for PlayerState