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

remove unused field ExpansionSet.packageName

Browse source
This commit is contained in:
Neil Gentleman 2016-10-15 14:49:15 -07:00
parent 85346708bf
commit 431fe30ab7
186 changed files with 186 additions and 715 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -127,17 +127,15 @@ public abstract class ExpansionSet implements Serializable {
protected int numBoosterDoubleFaced; // -1 = include normally 0 = exclude 1-n = include explicit
protected int ratioBoosterMythic;
protected String packageName;
protected int maxCardNumberInBooster; // used to ommit cards with collector numbers beyond the regular cards in a set for boosters
protected int maxCardNumberInBooster; // used to omit cards with collector numbers beyond the regular cards in a set for boosters
protected final EnumMap<Rarity, List<CardInfo>> savedCards;
public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) {
public ExpansionSet(String name, String code, Date releaseDate, SetType setType) {
this.name = name;
this.code = code;
this.releaseDate = releaseDate;
this.setType = setType;
this.packageName = packageName;
this.maxCardNumberInBooster = Integer.MAX_VALUE;
savedCards = new EnumMap<>(Rarity.class);
}
@ -162,10 +160,6 @@ public abstract class ExpansionSet implements Serializable {
return setType;
}
public String getPackageName() {
return packageName;
}
public String getBlockName() {
return blockName;
}

8
Mage/src/main/java/mage/cards/repository/CardScanner.java
View file

@ -29,12 +29,9 @@
package mage.cards.repository;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mage.cards.*;
import mage.util.ClassScanner;
import org.apache.log4j.Logger;
/**
@ -54,13 +51,8 @@ public class CardScanner {
scanned = true;
List<CardInfo> cardsToAdd = new ArrayList<>();
Map<ClassLoader, List<String>> packageMap = new HashMap<>();
for (ExpansionSet set : Sets.getInstance().values()) {
ClassLoader cl = set.getClass().getClassLoader();
if(!packageMap.containsKey(cl)) packageMap.put(cl, new ArrayList<String>());
List<String> packages = packageMap.get(cl);
packages.add(set.getPackageName());
ExpansionRepository.instance.add(new ExpansionInfo(set));
}
ExpansionRepository.instance.setContentVersion(ExpansionRepository.instance.getContentVersionConstant());