From 694e4e7988a1ccf06c3d349dd3e76495e304bf6a Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 30 Nov 2013 18:39:28 +0000 Subject: [PATCH] Fix misspelling --- .../main/java/forge/gui/input/InputAttack.java | 2 +- .../main/java/forge/gui/match/CMatchUI.java | 18 +++++++++--------- .../java/forge/gui/match/views/VField.java | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/input/InputAttack.java b/forge-gui/src/main/java/forge/gui/input/InputAttack.java index a89d737cc9d..74e4efae289 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/gui/input/InputAttack.java @@ -203,7 +203,7 @@ public class InputAttack extends InputSyncronizedBase { CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)ge, ge == def); } else if (ge instanceof Player) { - CMatchUI.SINGLETON_INSTANCE.setHighLited((Player) ge, ge == def); + CMatchUI.SINGLETON_INSTANCE.setHighlighted((Player) ge, ge == def); } } diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java index 881262ea980..66552ae2f1b 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java @@ -319,28 +319,28 @@ public enum CMatchUI implements ICDoc, IMenuProvider { CCombat.SINGLETON_INSTANCE.update(); } // showBlockers() - Set highlitedPlayers = new HashSet(); - public void setHighLited(Player ge, boolean b) { - if (b) highlitedPlayers.add(ge); - else highlitedPlayers.remove(ge); + Set highlightedPlayers = new HashSet(); + public void setHighlighted(Player ge, boolean b) { + if (b) highlightedPlayers.add(ge); + else highlightedPlayers.remove(ge); } - public boolean isHighlited(Player player) { - return highlitedPlayers.contains(player); + public boolean isHighlighted(Player player) { + return highlightedPlayers.contains(player); } - Set highlitedCards = new HashSet(); + Set highlightedCards = new HashSet(); // used to highlight cards in UI public void setUsedToPay(Card card, boolean value) { FThreads.assertExecutedByEdt(true); - boolean hasChanged = value ? highlitedCards.add(card) : highlitedCards.remove(card); + boolean hasChanged = value ? highlightedCards.add(card) : highlightedCards.remove(card); if ( hasChanged ) // since we are in UI thread, may redraw the card right now updateSingleCard(card); } public boolean isUsedToPay(Card card) { - return highlitedCards.contains(card); + return highlightedCards.contains(card); } public void updateZones(List> zonesToUpdate) { diff --git a/forge-gui/src/main/java/forge/gui/match/views/VField.java b/forge-gui/src/main/java/forge/gui/match/views/VField.java index a539b930068..e82bb906348 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VField.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VField.java @@ -74,7 +74,7 @@ public class VField implements IVDoc { private final PhaseIndicator phaseIndicator = new PhaseIndicator(); private final Border borderAvatarSimple = new LineBorder(new Color(0, 0, 0, 0), 1); - private final Border borderAvatarHighlited = new LineBorder(Color.red, 2); + private final Border borderAvatarHighlighted = new LineBorder(Color.red, 2); //========= Constructor @@ -111,14 +111,14 @@ public class VField implements IVDoc { @Override public void mouseEntered(final MouseEvent e) { avatarArea.setOpaque(true); - if (!isHighlited()) + if (!isHighlighted()) FSkin.get(avatarArea).setLineBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS)); } @Override public void mouseExited(final MouseEvent e) { avatarArea.setOpaque(false); - if (!isHighlited()) + if (!isHighlighted()) avatarArea.setBorder(borderAvatarSimple); } }); @@ -246,8 +246,8 @@ public class VField implements IVDoc { return detailsPanel; } - public boolean isHighlited() { - return CMatchUI.SINGLETON_INSTANCE.isHighlited(player); + public boolean isHighlighted() { + return CMatchUI.SINGLETON_INSTANCE.isHighlighted(player); } /** @@ -265,9 +265,9 @@ public class VField implements IVDoc { FSkin.get(this.getLblLife()).setForeground(Color.red); } - boolean highlited = isHighlited(); - this.avatarArea.setBorder(highlited ? borderAvatarHighlited : borderAvatarSimple ); - this.avatarArea.setOpaque(highlited); + boolean highlighted = isHighlighted(); + this.avatarArea.setBorder(highlighted ? borderAvatarHighlighted : borderAvatarSimple ); + this.avatarArea.setOpaque(highlighted); } }