External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* MageBook - Won't be loaded by default if the client starts.

Browse source
This commit is contained in:
LevelX2 2013-09-27 00:16:20 +02:00
parent 8841cca120
commit 3af0532623
4 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
View file

@ -268,6 +268,7 @@ public class MageBook extends JComponent {
private List<CardInfo> getCards(int page, String set) {
CardCriteria criteria = new CardCriteria();
criteria.setCodes(set).start((long) page * conf.CARDS_PER_PAGE).count((long) conf.CARDS_PER_PAGE + 1);
criteria.setOrderBy("cardNumber");
List<CardInfo> cards = CardRepository.instance.findCards(criteria);
if (cards.size() > conf.CARDS_PER_PAGE) {
pageRight.setVisible(true);

19
Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
View file

@ -7,6 +7,7 @@ import java.util.GregorianCalendar;
import java.util.List;
import mage.cards.repository.ExpansionInfo;
import mage.cards.repository.ExpansionRepository;
import mage.constants.SetType;
/**
* Utility class for constructed formats (expansions and other editions).
@ -391,14 +392,16 @@ public class ConstructedFormats {
private static void buildLists() {
for (ExpansionInfo set : ExpansionRepository.instance.getAll()) {
if (set.getReleaseDate().after(standardDate)) {
standard.add(set.getCode());
}
if (set.getReleaseDate().after(extendedDate)) {
extended.add(set.getCode());
}
if (set.getReleaseDate().after(modernDate)) {
modern.add(set.getCode());
if (!set.getType().equals(SetType.REPRINT)) {
if (set.getReleaseDate().after(standardDate)) {
standard.add(set.getCode());
}
if (set.getReleaseDate().after(extendedDate)) {
extended.add(set.getCode());
}
if (set.getReleaseDate().after(modernDate)) {
modern.add(set.getCode());
}
}
}
}