package me.anhvannguyen;

/**
 * Card class to hold and display our card object
 * @author Anh Nguyen 
 * 
 */
public class Card {
	// Defining the suit of the cards
	public enum Suit {
		SPADES, CLUBS, HEARTS, DIAMONDS
	};

	// Defining the face of the cards and setting their value
	public enum Face {
		ACE(1), TWO(2), THREE(3), FOUR(4), FIVE(5), SIX(6), SEVEN(7), EIGHT(8), 
		NINE(9), TEN(10), JACK(10), QUEEN(10), KING(10);
		private final int value;	// The value of the card, we don't want this changed

		private Face(int value) {
			this.value = value;
		}

		// Get the value of the card
		public int getValue() {
			return value;
		}
	};

	private Face face; // represents the face of the card
	private Suit suit; // represents the suit of the card

	public Card(Face face, Suit suit) {
		this.face = face;
		this.suit = suit;
	}

	// Convert the Face value to a string representation
	public String getFaceAsString() {
		switch (face) {
		case ACE:
			return "Ace";
		case TWO:
			return "Two";
		case THREE:
			return "Three";
		case FOUR:
			return "Four";
		case FIVE:
			return "Five";
		case SIX:
			return "Six";
		case SEVEN:
			return "Seven";
		case EIGHT:
			return "Eight";
		case NINE:
			return "Nine";
		case TEN:
			return "Ten";
		case JACK:
			return "Jack";
		case QUEEN:
			return "Queen";
		case KING:
			return "King";
		default:
			return "?";
		}
	}

	// Convert the Suit value to a string representation
	public String getSuitAsString() {
		switch (suit) {
		case SPADES:
			return "Spades";
		case CLUBS:
			return "Clubs";
		case HEARTS:
			return "Hearts";
		case DIAMONDS:
			return "Diamonds";
		default:
			return "?";
		}
	}

	// Return what type of face the card has
	public Face getFaceOfCard() {
		return face;
	}

	// Return what type of suit the card has
	public Suit getSuitOfCard() {
		return suit;
	}


	// String representation of what our card looks like.
	// Output should look something like "Ace of Clubs" or "Ten of Diamonds"
	@Override
	public String toString() {
		return getFaceAsString() + " of " + getSuitAsString();
	}

}

@@ -73,16 +73,20 @@
  object%0A
+ * %0A
  * @auth
@@ -98,17 +98,16 @@
 h Nguyen
- 
 %0A * %0A */
@@ -215,16 +215,17 @@
 DIAMONDS
+;
 %0A%09%7D;%0A%0A%09/
@@ -453,17 +453,17 @@
 t value;
-%09
+ 
 // The v
@@ -506,16 +506,26 @@
  changed
+%0A%09%09%09%09%09%09%09%09%09
 %0A%0A%09%09priv
@@ -853,835 +853,8 @@
 %09%7D%0A%0A
-%09// Convert the Face value to a string representation%0A%09public String getFaceAsString() %7B%0A%09%09switch (face) %7B%0A%09%09case ACE:%0A%09%09%09return %22Ace%22;%0A%09%09case TWO:%0A%09%09%09return %22Two%22;%0A%09%09case THREE:%0A%09%09%09return %22Three%22;%0A%09%09case FOUR:%0A%09%09%09return %22Four%22;%0A%09%09case FIVE:%0A%09%09%09return %22Five%22;%0A%09%09case SIX:%0A%09%09%09return %22Six%22;%0A%09%09case SEVEN:%0A%09%09%09return %22Seven%22;%0A%09%09case EIGHT:%0A%09%09%09return %22Eight%22;%0A%09%09case NINE:%0A%09%09%09return %22Nine%22;%0A%09%09case TEN:%0A%09%09%09return %22Ten%22;%0A%09%09case JACK:%0A%09%09%09return %22Jack%22;%0A%09%09case QUEEN:%0A%09%09%09return %22Queen%22;%0A%09%09case KING:%0A%09%09%09return %22King%22;%0A%09%09default:%0A%09%09%09return %22?%22;%0A%09%09%7D%0A%09%7D%0A%0A%09// Convert the Suit value to a string representation%0A%09public String getSuitAsString() %7B%0A%09%09switch (suit) %7B%0A%09%09case SPADES:%0A%09%09%09return %22Spades%22;%0A%09%09case CLUBS:%0A%09%09%09return %22Clubs%22;%0A%09%09case HEARTS:%0A%09%09%09return %22Hearts%22;%0A%09%09case DIAMONDS:%0A%09%09%09return %22Diamonds%22;%0A%09%09default:%0A%09%09%09return %22?%22;%0A%09%09%7D%0A%09%7D%0A%0A
 %09// 
@@ -1033,17 +1033,16 @@
 it;%0A%09%7D%0A%0A
-%0A
 %09// Stri
@@ -1217,18 +1217,27 @@
  getFace
-As
+OfCard().to
 String()
@@ -1259,10 +1259,19 @@
 Suit
-As
+OfCard().to
 Stri

Clean up some unnecessary switch statements