diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index d7d5a1ab6f0..af669d32ad9 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -83,7 +83,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { phaseUpdPlanned.set(false); final CMatchUI matchUi = CMatchUI.SINGLETON_INSTANCE; - PhaseLabel lbl = matchUi.getFieldViewFor(p).getPhaseInidicator().getLabelFor(ph); + PhaseLabel lbl = matchUi.getFieldViewFor(p).getPhaseIndicator().getLabelFor(ph); matchUi.resetAllPhaseButtons(); if (lbl != null) lbl.setActive(true); diff --git a/forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java b/forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java index 2272029fdd3..8605fc80a5c 100644 --- a/forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java +++ b/forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java @@ -9,7 +9,6 @@ import forge.util.Lang; * */ public class GameEventTurnPhase extends GameEvent { - public final Player playerTurn; public final PhaseType phase; public final String phaseDesc; @@ -20,12 +19,11 @@ public class GameEventTurnPhase extends GameEvent { phaseDesc = desc; } - @Override public T visit(IGameEventVisitor visitor) { return visitor.visit(this); } - + @Override public String toString() { String playerName = Lang.getPossesive(playerTurn.getName()); 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 031a6a5f984..881262ea980 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java @@ -204,7 +204,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider { // (not just one). public void resetAllPhaseButtons() { for (final VField v : view.getFieldViews()) { - v.getPhaseInidicator().resetPhaseButtons(); + v.getPhaseIndicator().resetPhaseButtons(); } } @@ -273,7 +273,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider { */ public final boolean stopAtPhase(final Player turn, final PhaseType phase) { VField vf = getFieldViewFor(turn); - PhaseLabel label = vf.getPhaseInidicator().getLabelFor(phase); + PhaseLabel label = vf.getPhaseIndicator().getLabelFor(phase); return label == null || label.getEnabled(); } 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 96203194925..a539b930068 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 @@ -71,7 +71,7 @@ public class VField implements IVDoc { private final FLabel lblLife = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).build(); - private final PhaseIndicator phaseInidicator = new PhaseIndicator(); + 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); @@ -92,7 +92,6 @@ public class VField implements IVDoc { if (playerOnwer != null) { tab.setText(playerOnwer.getName() + " Field"); } else { tab.setText("NO PLAYER FOR " + docID.toString()); } - detailsPanel = new PlayerDetailsPanel(player); // TODO player is hard-coded into tabletop...should be dynamic @@ -131,7 +130,7 @@ public class VField implements IVDoc { scroller.setOpaque(false); scroller.getViewport().setOpaque(false); scroller.setBorder(null); - + updateDetails(); } @@ -146,7 +145,7 @@ public class VField implements IVDoc { pnl.setLayout(new MigLayout("insets 0, gap 0")); pnl.add(avatarArea, "w 10%!, h 30%!"); - pnl.add(phaseInidicator, "w 5%!, h 100%!, span 1 2"); + pnl.add(phaseIndicator, "w 5%!, h 100%!, span 1 2"); pnl.add(scroller, "w 85%!, h 100%!, span 1 2, wrap"); pnl.add(detailsPanel, "w 10%!, h 69%!, gapleft 1px"); } @@ -234,11 +233,10 @@ public class VField implements IVDoc { } /** - * TODO: Write javadoc for this method. - * @return + * @return the phase indicator */ - public PhaseIndicator getPhaseInidicator() { - return phaseInidicator; + public PhaseIndicator getPhaseIndicator() { + return phaseIndicator; } /** @@ -251,14 +249,14 @@ public class VField implements IVDoc { public boolean isHighlited() { return CMatchUI.SINGLETON_INSTANCE.isHighlited(player); } - + /** * TODO: Write javadoc for this method. * @param player2 */ public void updateDetails() { detailsPanel.updateDetails(); - + this.getLblLife().setText("" + player.getLife()); if (player.getLife() > 5) { FSkin.get(this.getLblLife()).setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); @@ -266,8 +264,8 @@ public class VField implements IVDoc { else { FSkin.get(this.getLblLife()).setForeground(Color.red); } - - boolean highlited = isHighlited(); + + boolean highlited = isHighlited(); this.avatarArea.setBorder(highlited ? borderAvatarHighlited : borderAvatarSimple ); this.avatarArea.setOpaque(highlited); diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java index 01b07d84e23..04d8e3b807e 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java @@ -177,7 +177,7 @@ public class ForgePreferences extends PreferencesStore { final List fieldViews = VMatchUI.SINGLETON_INSTANCE.getFieldViews(); // AI field is at index [1] - PhaseIndicator fvAi = fieldViews.get(1).getPhaseInidicator(); + PhaseIndicator fvAi = fieldViews.get(1).getPhaseIndicator(); this.setPref(FPref.PHASE_AI_UPKEEP, String.valueOf(fvAi.getLblUpkeep().getEnabled())); this.setPref(FPref.PHASE_AI_DRAW, String.valueOf(fvAi.getLblDraw().getEnabled())); this.setPref(FPref.PHASE_AI_MAIN1, String.valueOf(fvAi.getLblMain1().getEnabled())); @@ -192,7 +192,7 @@ public class ForgePreferences extends PreferencesStore { this.setPref(FPref.PHASE_AI_CLEANUP, String.valueOf(fvAi.getLblCleanup().getEnabled())); // Human field is at index [0] - PhaseIndicator fvHuman = fieldViews.get(0).getPhaseInidicator(); + PhaseIndicator fvHuman = fieldViews.get(0).getPhaseIndicator(); this.setPref(FPref.PHASE_HUMAN_UPKEEP, String.valueOf(fvHuman.getLblUpkeep().getEnabled())); this.setPref(FPref.PHASE_HUMAN_DRAW, String.valueOf(fvHuman.getLblDraw().getEnabled())); this.setPref(FPref.PHASE_HUMAN_MAIN1, String.valueOf(fvHuman.getLblMain1().getEnabled())); @@ -223,7 +223,7 @@ public class ForgePreferences extends PreferencesStore { Preferences.UPLOAD_DRAFT = Constant.Runtime.NET_CONN && this.getPrefBoolean(FPref.UI_UPLOAD_DRAFT); // AI field is at index [0] - PhaseIndicator fvAi = fieldViews.get(1).getPhaseInidicator(); + PhaseIndicator fvAi = fieldViews.get(1).getPhaseIndicator(); fvAi.getLblUpkeep().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_UPKEEP)); fvAi.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_DRAW)); fvAi.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_MAIN1)); @@ -238,7 +238,7 @@ public class ForgePreferences extends PreferencesStore { fvAi.getLblCleanup().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_CLEANUP)); // Human field is at index [1] - PhaseIndicator fvHuman = fieldViews.get(0).getPhaseInidicator(); + PhaseIndicator fvHuman = fieldViews.get(0).getPhaseIndicator(); fvHuman.getLblUpkeep().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_UPKEEP)); fvHuman.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_DRAW)); fvHuman.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1));