external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix misspelling

Browse Source
This commit is contained in:
drdev
2013-11-30 18:39:28 +00:00
parent 1c0e786489
commit 694e4e7988
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gui/input/InputAttack.java
View File

@@ -203,7 +203,7 @@ public class InputAttack extends InputSyncronizedBase {
CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)ge, ge == def); CMatchUI.SINGLETON_INSTANCE.setUsedToPay((Card)ge, ge == def);
} }
else if (ge instanceof Player) { else if (ge instanceof Player) {
CMatchUI.SINGLETON_INSTANCE.setHighLited((Player) ge, ge == def); CMatchUI.SINGLETON_INSTANCE.setHighlighted((Player) ge, ge == def);
} }
} }

18
forge-gui/src/main/java/forge/gui/match/CMatchUI.java
View File

@@ -319,28 +319,28 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
CCombat.SINGLETON_INSTANCE.update(); CCombat.SINGLETON_INSTANCE.update();
} // showBlockers() } // showBlockers()
Set<Player> highlitedPlayers = new HashSet<Player>(); Set<Player> highlightedPlayers = new HashSet<Player>();
public void setHighLited(Player ge, boolean b) { public void setHighlighted(Player ge, boolean b) {
if (b) highlitedPlayers.add(ge); if (b) highlightedPlayers.add(ge);
else highlitedPlayers.remove(ge); else highlightedPlayers.remove(ge);
} }
public boolean isHighlited(Player player) { public boolean isHighlighted(Player player) {
return highlitedPlayers.contains(player); return highlightedPlayers.contains(player);
} }
Set<Card> highlitedCards = new HashSet<Card>(); Set<Card> highlightedCards = new HashSet<Card>();
// used to highlight cards in UI // used to highlight cards in UI
public void setUsedToPay(Card card, boolean value) { public void setUsedToPay(Card card, boolean value) {
FThreads.assertExecutedByEdt(true); 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 if ( hasChanged ) // since we are in UI thread, may redraw the card right now
updateSingleCard(card); updateSingleCard(card);
} }
public boolean isUsedToPay(Card card) { public boolean isUsedToPay(Card card) {
return highlitedCards.contains(card); return highlightedCards.contains(card);
} }
public void updateZones(List<Pair<Player, ZoneType>> zonesToUpdate) { public void updateZones(List<Pair<Player, ZoneType>> zonesToUpdate) {

16
forge-gui/src/main/java/forge/gui/match/views/VField.java
View File

@@ -74,7 +74,7 @@ public class VField implements IVDoc<CField> {
private final PhaseIndicator phaseIndicator = new PhaseIndicator(); private final PhaseIndicator phaseIndicator = new PhaseIndicator();
private final Border borderAvatarSimple = new LineBorder(new Color(0, 0, 0, 0), 1); 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 //========= Constructor
@@ -111,14 +111,14 @@ public class VField implements IVDoc<CField> {
@Override @Override
public void mouseEntered(final MouseEvent e) { public void mouseEntered(final MouseEvent e) {
avatarArea.setOpaque(true); avatarArea.setOpaque(true);
if (!isHighlited()) if (!isHighlighted())
FSkin.get(avatarArea).setLineBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS)); FSkin.get(avatarArea).setLineBorder(FSkin.getColor(FSkin.Colors.CLR_BORDERS));
} }
@Override @Override
public void mouseExited(final MouseEvent e) { public void mouseExited(final MouseEvent e) {
avatarArea.setOpaque(false); avatarArea.setOpaque(false);
if (!isHighlited()) if (!isHighlighted())
avatarArea.setBorder(borderAvatarSimple); avatarArea.setBorder(borderAvatarSimple);
} }
}); });
@@ -246,8 +246,8 @@ public class VField implements IVDoc<CField> {
return detailsPanel; return detailsPanel;
} }
public boolean isHighlited() { public boolean isHighlighted() {
return CMatchUI.SINGLETON_INSTANCE.isHighlited(player); return CMatchUI.SINGLETON_INSTANCE.isHighlighted(player);
} }
/** /**
@@ -265,9 +265,9 @@ public class VField implements IVDoc<CField> {
FSkin.get(this.getLblLife()).setForeground(Color.red); FSkin.get(this.getLblLife()).setForeground(Color.red);
} }
boolean highlited = isHighlited(); boolean highlighted = isHighlighted();
this.avatarArea.setBorder(highlited ? borderAvatarHighlited : borderAvatarSimple ); this.avatarArea.setBorder(highlighted ? borderAvatarHighlighted : borderAvatarSimple );
this.avatarArea.setOpaque(highlited); this.avatarArea.setOpaque(highlighted);
} }
} }