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

Code cleanup

Browse Source
This commit is contained in:
drdev
2013-11-30 18:31:18 +00:00
parent 7420e94876
commit 1c0e786489
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -83,7 +83,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
phaseUpdPlanned.set(false); phaseUpdPlanned.set(false);
final CMatchUI matchUi = CMatchUI.SINGLETON_INSTANCE; final CMatchUI matchUi = CMatchUI.SINGLETON_INSTANCE;
PhaseLabel lbl = matchUi.getFieldViewFor(p).getPhaseInidicator().getLabelFor(ph); PhaseLabel lbl = matchUi.getFieldViewFor(p).getPhaseIndicator().getLabelFor(ph);
matchUi.resetAllPhaseButtons(); matchUi.resetAllPhaseButtons();
if (lbl != null) lbl.setActive(true); if (lbl != null) lbl.setActive(true);

4
forge-gui/src/main/java/forge/game/event/GameEventTurnPhase.java
View File

@@ -9,7 +9,6 @@ import forge.util.Lang;
* *
*/ */
public class GameEventTurnPhase extends GameEvent { public class GameEventTurnPhase extends GameEvent {
public final Player playerTurn; public final Player playerTurn;
public final PhaseType phase; public final PhaseType phase;
public final String phaseDesc; public final String phaseDesc;
@@ -20,12 +19,11 @@ public class GameEventTurnPhase extends GameEvent {
phaseDesc = desc; phaseDesc = desc;
} }
@Override @Override
public <T> T visit(IGameEventVisitor<T> visitor) { public <T> T visit(IGameEventVisitor<T> visitor) {
return visitor.visit(this); return visitor.visit(this);
} }
@Override @Override
public String toString() { public String toString() {
String playerName = Lang.getPossesive(playerTurn.getName()); String playerName = Lang.getPossesive(playerTurn.getName());

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

@@ -204,7 +204,7 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
// (not just one). // (not just one).
public void resetAllPhaseButtons() { public void resetAllPhaseButtons() {
for (final VField v : view.getFieldViews()) { 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) { public final boolean stopAtPhase(final Player turn, final PhaseType phase) {
VField vf = getFieldViewFor(turn); VField vf = getFieldViewFor(turn);
PhaseLabel label = vf.getPhaseInidicator().getLabelFor(phase); PhaseLabel label = vf.getPhaseIndicator().getLabelFor(phase);
return label == null || label.getEnabled(); return label == null || label.getEnabled();
} }

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

@@ -71,7 +71,7 @@ public class VField implements IVDoc<CField> {
private final FLabel lblLife = new FLabel.Builder().fontAlign(SwingConstants.CENTER).fontStyle(Font.BOLD).build(); 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 borderAvatarSimple = new LineBorder(new Color(0, 0, 0, 0), 1);
private final Border borderAvatarHighlited = new LineBorder(Color.red, 2); private final Border borderAvatarHighlited = new LineBorder(Color.red, 2);
@@ -92,7 +92,6 @@ public class VField implements IVDoc<CField> {
if (playerOnwer != null) { tab.setText(playerOnwer.getName() + " Field"); } if (playerOnwer != null) { tab.setText(playerOnwer.getName() + " Field"); }
else { tab.setText("NO PLAYER FOR " + docID.toString()); } else { tab.setText("NO PLAYER FOR " + docID.toString()); }
detailsPanel = new PlayerDetailsPanel(player); detailsPanel = new PlayerDetailsPanel(player);
// TODO player is hard-coded into tabletop...should be dynamic // TODO player is hard-coded into tabletop...should be dynamic
@@ -131,7 +130,7 @@ public class VField implements IVDoc<CField> {
scroller.setOpaque(false); scroller.setOpaque(false);
scroller.getViewport().setOpaque(false); scroller.getViewport().setOpaque(false);
scroller.setBorder(null); scroller.setBorder(null);
updateDetails(); updateDetails();
} }
@@ -146,7 +145,7 @@ public class VField implements IVDoc<CField> {
pnl.setLayout(new MigLayout("insets 0, gap 0")); pnl.setLayout(new MigLayout("insets 0, gap 0"));
pnl.add(avatarArea, "w 10%!, h 30%!"); 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(scroller, "w 85%!, h 100%!, span 1 2, wrap");
pnl.add(detailsPanel, "w 10%!, h 69%!, gapleft 1px"); pnl.add(detailsPanel, "w 10%!, h 69%!, gapleft 1px");
} }
@@ -234,11 +233,10 @@ public class VField implements IVDoc<CField> {
} }
/** /**
* TODO: Write javadoc for this method. * @return the phase indicator
* @return
*/ */
public PhaseIndicator getPhaseInidicator() { public PhaseIndicator getPhaseIndicator() {
return phaseInidicator; return phaseIndicator;
} }
/** /**
@@ -251,14 +249,14 @@ public class VField implements IVDoc<CField> {
public boolean isHighlited() { public boolean isHighlited() {
return CMatchUI.SINGLETON_INSTANCE.isHighlited(player); return CMatchUI.SINGLETON_INSTANCE.isHighlited(player);
} }
/** /**
* TODO: Write javadoc for this method. * TODO: Write javadoc for this method.
* @param player2 * @param player2
*/ */
public void updateDetails() { public void updateDetails() {
detailsPanel.updateDetails(); detailsPanel.updateDetails();
this.getLblLife().setText("" + player.getLife()); this.getLblLife().setText("" + player.getLife());
if (player.getLife() > 5) { if (player.getLife() > 5) {
FSkin.get(this.getLblLife()).setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); FSkin.get(this.getLblLife()).setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
@@ -266,8 +264,8 @@ public class VField implements IVDoc<CField> {
else { else {
FSkin.get(this.getLblLife()).setForeground(Color.red); FSkin.get(this.getLblLife()).setForeground(Color.red);
} }
boolean highlited = isHighlited(); boolean highlited = isHighlited();
this.avatarArea.setBorder(highlited ? borderAvatarHighlited : borderAvatarSimple ); this.avatarArea.setBorder(highlited ? borderAvatarHighlited : borderAvatarSimple );
this.avatarArea.setOpaque(highlited); this.avatarArea.setOpaque(highlited);

8
forge-gui/src/main/java/forge/properties/ForgePreferences.java
View File

@@ -177,7 +177,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
final List<VField> fieldViews = VMatchUI.SINGLETON_INSTANCE.getFieldViews(); final List<VField> fieldViews = VMatchUI.SINGLETON_INSTANCE.getFieldViews();
// AI field is at index [1] // 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_UPKEEP, String.valueOf(fvAi.getLblUpkeep().getEnabled()));
this.setPref(FPref.PHASE_AI_DRAW, String.valueOf(fvAi.getLblDraw().getEnabled())); this.setPref(FPref.PHASE_AI_DRAW, String.valueOf(fvAi.getLblDraw().getEnabled()));
this.setPref(FPref.PHASE_AI_MAIN1, String.valueOf(fvAi.getLblMain1().getEnabled())); this.setPref(FPref.PHASE_AI_MAIN1, String.valueOf(fvAi.getLblMain1().getEnabled()));
@@ -192,7 +192,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
this.setPref(FPref.PHASE_AI_CLEANUP, String.valueOf(fvAi.getLblCleanup().getEnabled())); this.setPref(FPref.PHASE_AI_CLEANUP, String.valueOf(fvAi.getLblCleanup().getEnabled()));
// Human field is at index [0] // 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_UPKEEP, String.valueOf(fvHuman.getLblUpkeep().getEnabled()));
this.setPref(FPref.PHASE_HUMAN_DRAW, String.valueOf(fvHuman.getLblDraw().getEnabled())); this.setPref(FPref.PHASE_HUMAN_DRAW, String.valueOf(fvHuman.getLblDraw().getEnabled()));
this.setPref(FPref.PHASE_HUMAN_MAIN1, String.valueOf(fvHuman.getLblMain1().getEnabled())); this.setPref(FPref.PHASE_HUMAN_MAIN1, String.valueOf(fvHuman.getLblMain1().getEnabled()));
@@ -223,7 +223,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
Preferences.UPLOAD_DRAFT = Constant.Runtime.NET_CONN && this.getPrefBoolean(FPref.UI_UPLOAD_DRAFT); Preferences.UPLOAD_DRAFT = Constant.Runtime.NET_CONN && this.getPrefBoolean(FPref.UI_UPLOAD_DRAFT);
// AI field is at index [0] // 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.getLblUpkeep().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_UPKEEP));
fvAi.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_DRAW)); fvAi.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_DRAW));
fvAi.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_MAIN1)); fvAi.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_MAIN1));
@@ -238,7 +238,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
fvAi.getLblCleanup().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_CLEANUP)); fvAi.getLblCleanup().setEnabled(this.getPrefBoolean(FPref.PHASE_AI_CLEANUP));
// Human field is at index [1] // 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.getLblUpkeep().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_UPKEEP));
fvHuman.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_DRAW)); fvHuman.getLblDraw().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_DRAW));
fvHuman.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1)); fvHuman.getLblMain1().setEnabled(this.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1));