From ff08a196fe98790d78ee7f5b26b9f367f9fa5a68 Mon Sep 17 00:00:00 2001 From: Eduardo Pedroni Date: Thu, 11 Jun 2015 18:12:24 +0200 Subject: Started work on the GUI, and added imageCode field to card, now need to update own collection --- src/eu/equalparts/cardbase/data/Card.java | 1 + src/eu/equalparts/cardbase/data/FullCardSet.java | 145 ++--------------------- 2 files changed, 10 insertions(+), 136 deletions(-) (limited to 'src/eu/equalparts/cardbase/data') diff --git a/src/eu/equalparts/cardbase/data/Card.java b/src/eu/equalparts/cardbase/data/Card.java index cca1747..2810564 100644 --- a/src/eu/equalparts/cardbase/data/Card.java +++ b/src/eu/equalparts/cardbase/data/Card.java @@ -22,6 +22,7 @@ public class Card { // Not part of upstream JSON public String setCode; + public String imageCode; public Integer count; } \ No newline at end of file diff --git a/src/eu/equalparts/cardbase/data/FullCardSet.java b/src/eu/equalparts/cardbase/data/FullCardSet.java index e831b74..a7f3ea5 100644 --- a/src/eu/equalparts/cardbase/data/FullCardSet.java +++ b/src/eu/equalparts/cardbase/data/FullCardSet.java @@ -1,76 +1,19 @@ package eu.equalparts.cardbase.data; -import java.util.Collections; import java.util.Map; public class FullCardSet { - private String name; - private String code; - private String magicCardsInfoCode; - private String releaseDate; - private String border; - private String type; - private String block; - private String gathererCode; - private Map cards; + public String name; + public String code; + public String magicCardsInfoCode; + public String releaseDate; + public String border; + public String type; + public String block; + public String gathererCode; + public Map cards; - /** - * @return the set's name. - */ - public String getName() { - return name; - } - - /** - * @return the set code. - */ - public String getCode() { - return code; - } - - /** - * @return the set's release date. - */ - public String getReleaseDate() { - return releaseDate; - } - - /** - * @return the set's border type. - */ - public String getBorder() { - return border; - } - - /** - * @return the type of the set. - */ - public String getType() { - return type; - } - - /** - * @return the set's block. - */ - public String getBlock() { - return block; - } - - /** - * @return the set's Gatherer code. - */ - public String getGathererCode() { - return gathererCode; - } - - /** - * @return a full unmodifiable map of the set's cards. - */ - public Map getCards() { - return Collections.unmodifiableMap(cards); - } - /** * Searches for a card by number (the one shown on the card itself). * @@ -80,74 +23,4 @@ public class FullCardSet { public Card getCardByNumber(String number) { return cards.get(number); } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @param code the code to set - */ - public void setCode(String code) { - this.code = code; - } - - /** - * @param releaseDate the releaseDate to set - */ - public void setReleaseDate(String releaseDate) { - this.releaseDate = releaseDate; - } - - /** - * @param border the border to set - */ - public void setBorder(String border) { - this.border = border; - } - - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - /** - * @param block the block to set - */ - public void setBlock(String block) { - this.block = block; - } - - /** - * @param gathererCode the gathererCode to set - */ - public void setGathererCode(String gathererCode) { - this.gathererCode = gathererCode; - } - - /** - * @param cards the cards to set - */ - public void setCards(Map cards) { - this.cards = cards; - } - - /** - * @return the magicCardsInfoCode - */ - public String getMagicCardsInfoCode() { - return magicCardsInfoCode; - } - - /** - * @param magicCardsInfoCode the magicCardsInfoCode to set - */ - public void setMagicCardsInfoCode(String magicCardsInfoCode) { - this.magicCardsInfoCode = magicCardsInfoCode; - } } \ No newline at end of file -- cgit v1.2.3