From 4d5018bef06cf321a5ba2ee2715f9d21e528ab26 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 7 Jun 2018 22:39:53 -0400 Subject: [PATCH] Fixed typos/misspellings based on IntelliJ's suggestions. --- .../dl/sources/WizardCardsImageSource.java | 24 +++++++++---------- .../main/java/mage/players/PlayerImpl.java | 22 ++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 593e165fff5..5d8368bb119 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -516,7 +516,7 @@ public enum WizardCardsImageSource implements CardImageSource { if (setNames == null) { setNames = Sets.getInstance().get(cardSet).getName(); } - String preferedLanguage = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PREF_LANGUAGE, "en"); + String preferredLanguage = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_PREF_LANGUAGE, "en"); for (String setName : setNames.split("\\^")) { // String URLSetName = URLEncoder.encode(setName, "UTF-8"); String URLSetName = setName.replaceAll(" ", "%20"); @@ -554,8 +554,8 @@ public enum WizardCardsImageSource implements CardImageSource { cardName = cardName.substring(0, pos1); } } - Integer preferedMultiverseId = getLocalizedMultiverseId(preferedLanguage, multiverseId); - setLinks.put(cardName.toLowerCase(Locale.ENGLISH) + numberChar, generateLink(preferedMultiverseId)); + Integer preferredMultiverseId = getLocalizedMultiverseId(preferredLanguage, multiverseId); + setLinks.put(cardName.toLowerCase(Locale.ENGLISH) + numberChar, generateLink(preferredMultiverseId)); } } } @@ -643,12 +643,12 @@ public enum WizardCardsImageSource implements CardImageSource { return "/Handlers/Image.ashx?multiverseid=" + landMultiverseId + "&type=card"; } - private int getLocalizedMultiverseId(String preferedLanguage, Integer multiverseId) throws IOException { - if (preferedLanguage.equals("en")) { + private int getLocalizedMultiverseId(String preferredLanguage, Integer multiverseId) throws IOException { + if (preferredLanguage.equals("en")) { return multiverseId; } - String languageName = languageAliases.get(preferedLanguage); + String languageName = languageAliases.get(preferredLanguage); HashMap localizedLanguageIds = getlocalizedMultiverseIds(multiverseId); if (localizedLanguageIds.containsKey(languageName)) { return localizedLanguageIds.get(languageName); @@ -712,20 +712,20 @@ public enum WizardCardsImageSource implements CardImageSource { // // private int multiverseId; // private String cardName; -// private String preferedLanguage; +// private String preferredLanguage; // private LinkedHashMap setLinks; // -// public GetImageLinkTask(int multiverseId, String cardName, String preferedLanguage, LinkedHashMap setLinks) { +// public GetImageLinkTask(int multiverseId, String cardName, String preferredLanguage, LinkedHashMap setLinks) { // try { // this.multiverseId = multiverseId; // this.cardName = cardName; -// this.preferedLanguage = preferedLanguage; +// this.preferredLanguage = preferredLanguage; // this.setLinks = setLinks; // } catch (Exception ex) { // logger.error(ex.getMessage()); // logger.error("multiverseId: " + multiverseId); // logger.error("cardName: " + cardName); -// logger.error("preferedLanguage: " + preferedLanguage); +// logger.error("preferredLanguage: " + preferredLanguage); // logger.error("setLinks: " + setLinks.toString()); // } // } @@ -736,8 +736,8 @@ public enum WizardCardsImageSource implements CardImageSource { // if (cardName.equals("Forest") || cardName.equals("Swamp") || cardName.equals("Mountain") || cardName.equals("Island") || cardName.equals("Plains")) { // setLinks.putAll(getLandVariations(multiverseId, cardName)); // } else { -// Integer preferedMultiverseId = getLocalizedMultiverseId(preferedLanguage, multiverseId); -// setLinks.put(cardName.toLowerCase(Locale.ENGLISH), generateLink(preferedMultiverseId)); +// Integer preferredMultiverseId = getLocalizedMultiverseId(preferredLanguage, multiverseId); +// setLinks.put(cardName.toLowerCase(Locale.ENGLISH), generateLink(preferredMultiverseId)); // } // } catch (IOException | NumberFormatException ex) { // logger.error("Exception when parsing the wizards page: " + ex.getMessage()); diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index a21a497df72..871bcdd0256 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -390,7 +390,7 @@ public abstract class PlayerImpl implements Player, Serializable { this.draws = false; this.loses = false; this.left = false; - // reset is neccessary because in tournament player will be used for each round + // reset is necessary because in tournament player will be used for each round this.quit = false; this.timerTimeout = false; this.idleTimeout = false; @@ -1117,12 +1117,12 @@ public abstract class PlayerImpl implements Player, Serializable { resetStoredBookmark(game); // prevent undo after playing a land return true; } - // putOntoBattlefield retured false if putOntoBattlefield was replaced by replacement effect (e.g. Kjeldorian Outpost). + // putOntoBattlefield returned false if putOntoBattlefield was replaced by replacement effect (e.g. Kjeldoran Outpost). // But that would undo the effect completely, - // what makes no real sense. So it makes no sense to generally do a restorState here. + // what makes no real sense. So it makes no sense to generally do a restoreState here. // restoreState(bookmark, card.getName(), game); } - // if the to play the land is replaced (e.g. Kjeldoran Outpos and don't sacrificing a Plains) it's a valid state so returning true here + // if the to play the land is replaced (e.g. Kjeldoran Outpost and don't sacrificing a Plains) it's a valid state so returning true here return true; } @@ -1132,7 +1132,7 @@ public abstract class PlayerImpl implements Player, Serializable { if (ability.activate(game, false)) { if (ability.resolve(game)) { if (ability.isUndoPossible()) { - if (storedBookmark == -1 || storedBookmark > bookmark) { // e.g. usefull for undo Nykthos, Shrine to Nyx + if (storedBookmark == -1 || storedBookmark > bookmark) { // e.g. useful for undo Nykthos, Shrine to Nyx setStoredBookmark(bookmark); } } else { @@ -1381,7 +1381,7 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public LinkedHashMap getUseableActivatedAbilities(MageObject object, Zone zone, Game game) { LinkedHashMap useable = new LinkedHashMap<>(); - if (object instanceof StackAbility) { // It may not be possible to activate abilities of stack actilities + if (object instanceof StackAbility) { // It may not be possible to activate abilities of stack abilities return useable; } if (object instanceof SplitCard) { @@ -1397,7 +1397,7 @@ public abstract class PlayerImpl implements Player, Serializable { return useable; } - // Adds special abilities that are given to non permanants by continuous effects + // Adds special abilities that are given to non permanents by continuous effects private void getOtherUseableActivatedAbilities(MageObject object, Zone zone, Game game, Map useable) { Abilities otherAbilities = game.getState().getActivatedOtherAbilities(object.getId(), zone); if (otherAbilities != null) { @@ -1587,7 +1587,7 @@ public abstract class PlayerImpl implements Player, Serializable { // selected permanents to untap List selectedToUntap = new ArrayList<>(); - // player can cancel the seletion of an effect to use a prefered order of restriction effects + // player can cancel the selection of an effect to use a preferred order of restriction effects boolean playerCanceledSelection; do { playerCanceledSelection = false; @@ -1601,7 +1601,7 @@ public abstract class PlayerImpl implements Player, Serializable { FilterControlledPermanent filter = handledEntry.getKey().getKey().getFilter().copy(); String message = filter.getMessage(); - // omitt already from other untap effects selected permanents + // omit already from other untap effects selected permanents for (Permanent permanent : selectedToUntap) { filter.add(Predicates.not(new PermanentIdPredicate(permanent.getId()))); } @@ -1702,7 +1702,7 @@ public abstract class PlayerImpl implements Player, Serializable { for (Permanent permanent : canBeUntapped) { if (handledEffect.getFilter().match(permanent, game)) { // matches the restricted permanents of handled entry boolean canBeSelected = true; - // check if the permanent is restriced by another restriction that has left no permanent + // check if the permanent is restricted by another restriction that has left no permanent for (Entry>, Integer> notMoreThanEffect : notMoreThanEffectsUsage.entrySet()) { if (notMoreThanEffect.getKey().getKey().getFilter().match(permanent, game) && notMoreThanEffect.getValue() == 0) { canBeSelected = false; @@ -2635,7 +2635,7 @@ public abstract class PlayerImpl implements Player, Serializable { available.addManaWithCost(manaAbilities, game); } - // remove duplicated variants (see ManaOptionsTest for info - when thats rises) + // remove duplicated variants (see ManaOptionsTest for info - when that rises) available.removeDuplicated(); return available;