Refactored CLI, exceptions are handled properly now. Started looking into UI testing for the CLI.

1 files changed, 9 insertions, 23 deletions

diff --git a/src/eu/equalparts/cardbase/data/CardSet.java b/src/eu/equalparts/cardbase/data/CardSet.java
index 2c8f950..959e0a3 100644
--- a/src/eu/equalparts/cardbase/data/CardSet.java
+++ b/src/eu/equalparts/cardbase/data/CardSet.java
@@ -1,28 +1,14 @@
 package eu.equalparts.cardbase.data;
 
-import java.util.ArrayList;
-
 public class CardSet {
-	public String name;
-	public String code;
-	public String releaseDate;
-	public String border;
-	public String type;
-	public String block;
-	public String gathererCode;
-	public ArrayList<Card> cards;
 
-	/**
-	 * Searches for a card by number (the one shown on the card itself).
-	 * 
-	 * @param number the number of the card to search.
-	 * @return the card, or null if no card is found with that number.
-	 */
-	public Card getCardByNumber(String number) {
-		for (Card card : cards) {
-			if (card.number.equals(number)) 
-				return card;
-		}
-		return null;
+	public String name = "";
+	public String code = "";
+	public String releaseDate = "";
+	
+	@Override
+	public String toString() {
+		return String.format("%1$-12s : %2$s", code, name, releaseDate);
 	}
-}
\ No newline at end of file
+	
+}