From c526306c5bbb1372c98b5bf73f8908569d37637e Mon Sep 17 00:00:00 2001 From: vraskulin Date: Thu, 29 Dec 2016 15:26:19 +0300 Subject: [PATCH] Refactoring See github line by line comments in 'File changed' --- Mage/src/main/java/mage/cards/Card.java | 2 +- Mage/src/main/java/mage/cards/CardImpl.java | 4 ++-- Mage/src/main/java/mage/cards/LevelerCard.java | 1 - Mage/src/main/java/mage/cards/Sets.java | 10 ++++------ Mage/src/main/java/mage/cards/SplitCard.java | 1 - Mage/src/main/java/mage/cards/SplitCardHalfImpl.java | 1 - .../src/main/java/mage/cards/basiclands/BasicLand.java | 1 - Mage/src/main/java/mage/cards/decks/DeckCardInfo.java | 2 +- .../java/mage/cards/decks/importer/DeckImporter.java | 9 ++------- .../mage/cards/decks/importer/MWSDeckImporter.java | 5 ++--- .../mage/cards/repository/ExpansionRepository.java | 10 +++++++++- 11 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java index 672bdd9f4d6..24d006f9ba0 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -53,7 +53,7 @@ public interface Card extends MageObject { void setOwnerId(UUID ownerId); - public Abilities getAbilities(Game game); + Abilities getAbilities(Game game); void setSpellAbility(SpellAbility ability); diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 9d5fed00577..f85dfb0c52c 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -462,9 +462,9 @@ public abstract class CardImpl extends MageObjectImpl implements Card { } break; case COMMAND: - lkiObject = (Commander) game.getObject(objectId); + lkiObject = game.getObject(objectId); if (lkiObject != null) { - removed = game.getState().getCommand().remove((Commander) game.getObject(objectId)); + removed = game.getState().getCommand().remove(game.getObject(objectId)); } break; case OUTSIDE: diff --git a/Mage/src/main/java/mage/cards/LevelerCard.java b/Mage/src/main/java/mage/cards/LevelerCard.java index c25aff9599d..bbcafa205e3 100644 --- a/Mage/src/main/java/mage/cards/LevelerCard.java +++ b/Mage/src/main/java/mage/cards/LevelerCard.java @@ -30,7 +30,6 @@ package mage.cards; import java.util.UUID; import mage.constants.CardType; -import mage.constants.Rarity; /** * diff --git a/Mage/src/main/java/mage/cards/Sets.java b/Mage/src/main/java/mage/cards/Sets.java index 9e1f648aa31..4ea294f199a 100644 --- a/Mage/src/main/java/mage/cards/Sets.java +++ b/Mage/src/main/java/mage/cards/Sets.java @@ -65,6 +65,7 @@ public class Sets extends HashMap { try { addSet((ExpansionSet) c.getMethod("getInstance").invoke(null)); } catch (Exception ex) { + logger.error(ex); } } } @@ -142,10 +143,9 @@ public class Sets extends HashMap { } public static void saveDeck(String file, DeckCardLists deck) throws FileNotFoundException { - PrintWriter out = new PrintWriter(file); Map deckCards = new HashMap<>(); Map sideboard = new HashMap<>(); - try { + try (PrintWriter out = new PrintWriter(file)) { if (deck.getName() != null && deck.getName().length() > 0) { out.println("NAME:" + deck.getName()); } @@ -169,10 +169,10 @@ public class Sets extends HashMap { } // Write out all of the cards - for (Map.Entry entry : deckCards.entrySet()) { + for (Entry entry : deckCards.entrySet()) { out.printf("%d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName()); } - for (Map.Entry entry : sideboard.entrySet()) { + for (Entry entry : sideboard.entrySet()) { out.printf("SB: %d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName()); } @@ -183,8 +183,6 @@ public class Sets extends HashMap { out.print("LAYOUT SIDEBOARD:"); writeCardLayout(out, deck.getSideboardLayout()); out.print("\n"); - } finally { - out.close(); } } diff --git a/Mage/src/main/java/mage/cards/SplitCard.java b/Mage/src/main/java/mage/cards/SplitCard.java index 67fd339042f..3eefebf443c 100644 --- a/Mage/src/main/java/mage/cards/SplitCard.java +++ b/Mage/src/main/java/mage/cards/SplitCard.java @@ -35,7 +35,6 @@ import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.constants.CardType; -import mage.constants.Rarity; import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java index 2c26ac71045..0dcb22f2d66 100644 --- a/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java +++ b/Mage/src/main/java/mage/cards/SplitCardHalfImpl.java @@ -8,7 +8,6 @@ package mage.cards; import java.util.ArrayList; import java.util.UUID; import mage.constants.CardType; -import mage.constants.Rarity; import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.game.Game; diff --git a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java index 8e5ff7793dc..b83da192632 100644 --- a/Mage/src/main/java/mage/cards/basiclands/BasicLand.java +++ b/Mage/src/main/java/mage/cards/basiclands/BasicLand.java @@ -32,7 +32,6 @@ import java.util.UUID; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.cards.CardImpl; diff --git a/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java b/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java index 65a6216c35b..bbde8f44434 100644 --- a/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java +++ b/Mage/src/main/java/mage/cards/decks/DeckCardInfo.java @@ -74,7 +74,7 @@ public class DeckCardInfo implements Serializable { } public String getCardKey() { - return new StringBuilder(setCode).append(cardNum).toString(); + return setCode + cardNum; } } diff --git a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java index 0f50787b9a5..b33821f2715 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java @@ -53,8 +53,7 @@ public abstract class DeckImporter { lineCount = 0; sbMessage.setLength(0); try { - Scanner scanner = new Scanner(f); - try { + try (Scanner scanner = new Scanner(f)) { while (scanner.hasNextLine()) { String line = scanner.nextLine().trim(); lineCount++; @@ -63,13 +62,9 @@ public abstract class DeckImporter { if (sbMessage.length() > 0) { logger.fatal(sbMessage); } - } - catch (Exception ex) { + } catch (Exception ex) { logger.fatal(null, ex); } - finally { - scanner.close(); - } } catch (Exception ex) { logger.fatal(null, ex); } diff --git a/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java index 54a9a6eb528..fed0aa179f1 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java @@ -28,7 +28,7 @@ package mage.cards.decks.importer; import java.util.List; -import java.util.Random; + import mage.cards.decks.DeckCardInfo; import mage.cards.decks.DeckCardLists; import mage.cards.repository.CardCriteria; @@ -69,8 +69,7 @@ public class MWSDeckImporter extends DeckImporter { CardCriteria criteria = new CardCriteria(); criteria.name(lineName); criteria.setCodes(setCode); - List cards = null; - cards = CardRepository.instance.findCards(criteria); + List cards = CardRepository.instance.findCards(criteria); if (!cards.isEmpty()) { cardInfo = cards.get(RandomUtil.nextInt(cards.size())); } diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java index b1fcecfda89..f63fce60aa8 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java @@ -33,7 +33,7 @@ public enum ExpansionRepository { private Dao expansionDao; - private ExpansionRepository() { + ExpansionRepository() { File file = new File("db"); if (!file.exists()) { file.mkdirs(); @@ -57,6 +57,7 @@ public enum ExpansionRepository { try { expansionDao.create(expansion); } catch (SQLException ex) { + logger.error(ex); } } @@ -83,6 +84,7 @@ public enum ExpansionRepository { List expansions = expansionDao.query(qb.prepare()); sets = expansions.toArray(new ExpansionInfo[0]); } catch (SQLException ex) { + logger.error(ex); } return sets; } @@ -95,6 +97,7 @@ public enum ExpansionRepository { qb.where().eq("basicLands", new SelectArg(true)); sets = expansionDao.query(qb.prepare()); } catch (SQLException ex) { + logger.error(ex); } return sets; } @@ -106,6 +109,7 @@ public enum ExpansionRepository { qb.where().eq("blockName", new SelectArg(blockName)); return expansionDao.query(qb.prepare()); } catch (SQLException ex) { + logger.error(ex); } return sets; } @@ -120,6 +124,7 @@ public enum ExpansionRepository { set = expansions.get(0); } } catch (SQLException ex) { + logger.error(ex); } return set; } @@ -134,6 +139,7 @@ public enum ExpansionRepository { set = expansions.get(0); } } catch (SQLException ex) { + logger.error(ex); } return set; } @@ -144,6 +150,7 @@ public enum ExpansionRepository { qb.orderBy("releaseDate", true); return expansionDao.query(qb.prepare()); } catch (SQLException ex) { + logger.error(ex); } return Collections.emptyList(); } @@ -159,6 +166,7 @@ public enum ExpansionRepository { } return setNames; } catch (SQLException ex) { + logger.error(ex); } return Collections.emptyList(); }