5 files changed, 1 insertions, 147 deletions
diff --git a/src/eu/equalparts/cardbase/Cardbase.java b/src/eu/equalparts/cardbase/Cardbase.java
index d17ab2a..e42a105 100644
--- a/src/eu/equalparts/cardbase/Cardbase.java
+++ b/src/eu/equalparts/cardbase/Cardbase.java
@@ -10,7 +10,6 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 
 import eu.equalparts.cardbase.cardstorage.StandaloneCardContainer;
-import eu.equalparts.cardbase.decks.ReferenceDeck;
 import eu.equalparts.cardbase.utils.JSON;
 
 /**
@@ -23,7 +22,7 @@ public class Cardbase extends StandaloneCardContainer {
 	/**
 	 * The decks which have been saved along with this collection of cards.
 	 */
-	@JsonProperty private Map<String, ReferenceDeck> decks;
+	@JsonProperty private Map<String, Object> decks;
 	
 	/**
 	 * Initialises the cardbase with the contents of a file.
diff --git a/src/eu/equalparts/cardbase/decks/Deck.java b/src/eu/equalparts/cardbase/decks/Deck.java
deleted file mode 100644
index 7a7b819..0000000
--- a/src/eu/equalparts/cardbase/decks/Deck.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.equalparts.cardbase.decks;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class Deck {
-	public String name = "Unnamed Deck";
-	public int plains = 0,
-			islands = 0,
-			swamps = 0,
-			mountains = 0,
-			forests = 0;
-
-	private Map<Integer, Integer> cardReferences = new HashMap<Integer, Integer>();
-	
-	public void addCard(Integer cardHash, Integer count) {
-		cardReferences.put(cardHash, count);
-	}
-	
-	public Map<Integer, Integer> getCardReferences() {
-		return Collections.unmodifiableMap(cardReferences);
-	}
-}
diff --git a/src/eu/equalparts/cardbase/decks/ReferenceDeck.java b/src/eu/equalparts/cardbase/decks/ReferenceDeck.java
deleted file mode 100644
index ab9abf8..0000000
--- a/src/eu/equalparts/cardbase/decks/ReferenceDeck.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.equalparts.cardbase.decks;
-
-import java.util.Map.Entry;
-
-public class ReferenceDeck extends Deck {
-	
-	public ReferenceDeck(String deckName) {
-		this.name = deckName;
-	}
-	
-	public ReferenceDeck(StandaloneDeck deck) {
-		this.name = deck.name;
-		this.plains = deck.plains;
-		this.islands = deck.islands;
-		this.swamps = deck.swamps;
-		this.mountains = deck.mountains;
-		this.forests = deck.forests;
-		
-		for (Entry<Integer, Integer> entry : deck.getCardReferences().entrySet()) {
-			getCardReferences().put(entry.getKey(), entry.getValue());
-		}
-	}
-	
-}
diff --git a/src/eu/equalparts/cardbase/decks/StandaloneDeck.java b/src/eu/equalparts/cardbase/decks/StandaloneDeck.java
deleted file mode 100644
index d66311d..0000000
--- a/src/eu/equalparts/cardbase/decks/StandaloneDeck.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.equalparts.cardbase.decks;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import eu.equalparts.cardbase.cards.Card;
-
-public class StandaloneDeck extends Deck {
-	private Map<Integer, Card> cardData = new HashMap<Integer, Card>();
-	
-	public Map<Integer, Card> getCardData() {
-		return Collections.unmodifiableMap(cardData);
-	}
-}
diff --git a/src/eu/equalparts/cardbase/decks/Statistics.java b/src/eu/equalparts/cardbase/decks/Statistics.java
deleted file mode 100644
index b2c4108..0000000
--- a/src/eu/equalparts/cardbase/decks/Statistics.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package eu.equalparts.cardbase.decks;
-
-import eu.equalparts.cardbase.cards.Card;
-
-public final class Statistics {
-
-	private Statistics() {}
-	
-	public static double calculatePercentage(StandaloneDeck deck, String type) {
-		double allCardsByType = count(deck, type);
-		double allCards = count(deck);
-		return allCardsByType / allCards;
-	}
-	
-	public static int count(StandaloneDeck deck, String type) {
-		int count = type.contains("Land") ? countBasicLands(deck) : 0;
-		for (Card card : deck.cards) {
-			if (card.type != null &&
-					card.type.contains(type)) {
-				// TODO sort this out
-				count += 1;
-			}
-		}
-		return count;
-	}
-
-	public static int count(StandaloneDeck deck) {
-		int totalCards = countBasicLands(deck);
-		
-		for (Card card : deck.cards) {
-			// TODO sort this out
-			totalCards += 1;
-		}
-		
-		return totalCards;
-	}
-	
-	private static int countBasicLands(StandaloneDeck deck) {
-		return deck.plains + 
-				deck.islands + 
-				deck.swamps + 
-				deck.mountains + 
-				deck.forests;
-	}
-	
-	public static int[] computeDistribution(StandaloneDeck deck, String type) {
-		int arraySize = 0;
-		for (Card card : deck.cards) {
-			if (card.type != null && card.type.contains(type))
-				if (card.cmc != null && card.cmc >= arraySize)
-					arraySize = card.cmc + 1;
-		}
-
-		int[] costs = new int[arraySize];
-		for (Card card : deck.cards) {
-			if (card.type != null && card.type.contains(type))
-				if (card.cmc != null)
-					// TODO sort this out
-					costs[card.cmc] += 1; 
-		}
-		
-		return costs;
-	}
-
-	public static int[] computeDistribution(StandaloneDeck deck) {
-		int arraySize = 0;
-		for (Card card : deck.cards) {
-			if (card.cmc != null && card.cmc >= arraySize)
-				arraySize = card.cmc + 1;
-		}
-		
-		int[] costs = new int[arraySize];
-		for (Card card : deck.cards) {
-			if (card.cmc != null)
-				// TODO sort this out
-				costs[card.cmc] += 1; 
-		}
-		
-		return costs;
-	}
-	
-}