aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/equalparts/cardbase/data
diff options
context:
space:
mode:
authorEduardo Pedroni <e.pedroni91@gmail.com>2015-06-05 21:50:36 +0200
committerEduardo Pedroni <e.pedroni91@gmail.com>2015-06-05 21:50:36 +0200
commit62bb720ea707765e2a33a03ee5dfa91b753123e8 (patch)
tree868eedcbedb07ba8ef2e70768dbe516ebe1e7ef5 /src/eu/equalparts/cardbase/data
parent0465829c25ef43ba9ba898dff01ebaa5106fd1f8 (diff)
Tidied up README and help, sorted out a neater Ant build script
Diffstat (limited to 'src/eu/equalparts/cardbase/data')
-rw-r--r--src/eu/equalparts/cardbase/data/CardBaseManager.java4
-rw-r--r--src/eu/equalparts/cardbase/data/Cardbase.java (renamed from src/eu/equalparts/cardbase/data/CardBase.java)2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/equalparts/cardbase/data/CardBaseManager.java b/src/eu/equalparts/cardbase/data/CardBaseManager.java
index 0baf9d7..d6a63dc 100644
--- a/src/eu/equalparts/cardbase/data/CardBaseManager.java
+++ b/src/eu/equalparts/cardbase/data/CardBaseManager.java
@@ -12,7 +12,7 @@ import eu.equalparts.cardbase.query.IO;
public class CardBaseManager {
private ArrayList<MetaCardSet> metaSets;
- public CardBase cardBase;
+ public Cardbase cardBase;
/**
* Parse a cardbase file and create an associated CardBase object.
@@ -33,7 +33,7 @@ public class CardBaseManager {
*/
public CardBaseManager() throws JsonParseException, JsonMappingException, IOException {
metaSets = IO.getAllMetaSets();
- cardBase = new CardBase();
+ cardBase = new Cardbase();
}
public ArrayList<MetaCardSet> getAllMetaSets() {
diff --git a/src/eu/equalparts/cardbase/data/CardBase.java b/src/eu/equalparts/cardbase/data/Cardbase.java
index abdd423..1c2aa12 100644
--- a/src/eu/equalparts/cardbase/data/CardBase.java
+++ b/src/eu/equalparts/cardbase/data/Cardbase.java
@@ -2,7 +2,7 @@ package eu.equalparts.cardbase.data;
import java.util.ArrayList;
-public class CardBase {
+public class Cardbase {
public ArrayList<Card> cards = new ArrayList<>();
public ArrayList<Deck> decks = new ArrayList<>();