Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Sonar cleanups 03032019

Browse source
This commit is contained in:
Ingmar Goudt 2019-03-04 10:43:20 +01:00
parent f46f321635
commit 45f665eb1d
13 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java
View file

@ -25,7 +25,7 @@ public enum TokensMtgImageSource implements CardImageSource {
private static final Logger logger = Logger.getLogger(TokensMtgImageSource.class);
// [[EXP/Name, TokenData>
private HashMap<String, ArrayList<TokenData>> tokensData;
private HashMap<String, List<TokenData>> tokensData;
private static final Set<String> supportedSets = new LinkedHashSet<String>();
private final Object tokensDataSync = new Object();
@ -177,7 +177,7 @@ public enum TokensMtgImageSource implements CardImageSource {
return false;
}
private HashMap<String, ArrayList<TokenData>> getTokensData() throws IOException {
private HashMap<String, List<TokenData>> getTokensData() throws IOException {
synchronized (tokensDataSync) {
if (tokensData == null) {
DownloadPicturesService.getInstance().updateAndViewMessage("Find tokens data...");
@ -188,7 +188,7 @@ public enum TokensMtgImageSource implements CardImageSource {
List<TokenData> fileTokensData = parseTokensData(inputStream);
for (TokenData tokenData : fileTokensData) {
String key = tokenData.getExpansionSetCode() + "/" + tokenData.getName();
ArrayList<TokenData> list = tokensData.get(key);
List<TokenData> list = tokensData.get(key);
if (list == null) {
list = new ArrayList<>();
tokensData.put(key, list);
@ -213,7 +213,7 @@ public enum TokensMtgImageSource implements CardImageSource {
// logger.info("TOK: " + siteData.getExpansionSetCode() + "/" + siteData.getName());
String key = siteData.getExpansionSetCode() + "/" + siteData.getName();
supportedSets.add(siteData.getExpansionSetCode());
ArrayList<TokenData> list = tokensData.get(key);
List<TokenData> list = tokensData.get(key);
if (list == null) {
list = new ArrayList<>();
tokensData.put(key, list);
@ -249,7 +249,7 @@ public enum TokensMtgImageSource implements CardImageSource {
BufferedReader reader = new BufferedReader(inputReader)) {
// we have to specify encoding to read special comma
reader.readLine(); // skip header
String header = reader.readLine(); // skip header
String line = reader.readLine();
// states
// 0 - wait set name

6
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -40,7 +40,7 @@ public enum WizardCardsImageSource implements CardImageSource {
WizardCardsImageSource() {
languageAliases = new HashMap<>();
languageAliases = new EnumMap<>(CardLanguage.class);
languageAliases.put(CardLanguage.ENGLISH, "English");
languageAliases.put(CardLanguage.SPANISH, "Spanish");
languageAliases.put(CardLanguage.FRENCH, "French");
@ -544,9 +544,9 @@ public enum WizardCardsImageSource implements CardImageSource {
getLandVariations(setLinks, cardSet, multiverseId, cardName);
} else {
String numberChar = "";
int pos1 = cardName.indexOf("(");
int pos1 = cardName.indexOf('(');
if (pos1 > 0) {
int pos2 = cardName.indexOf("(", pos1 + 1);
int pos2 = cardName.indexOf('(', pos1 + 1);
if (pos2 > 0) {
numberChar = cardName.substring(pos2 + 1, pos2 + 2);
cardName = cardName.substring(0, pos1);