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

Updated document ID enum with more descriptive names.

Browse Source
This commit is contained in:
Doublestrike
2012-05-20 06:31:54 +00:00
parent b8a5622424
commit aa25a17f29
16 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/control/KeyboardShortcuts.java
View File

@@ -52,7 +52,7 @@ public class KeyboardShortcuts {
@Override
public void actionPerformed(final ActionEvent e) {
if (Singletons.getControl().getState() != 1) { return; }
SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
}
};
@@ -61,7 +61,7 @@ public class KeyboardShortcuts {
@Override
public void actionPerformed(final ActionEvent e) {
if (Singletons.getControl().getState() != 1) { return; }
SDisplayUtil.showTab(EDocID.REPORT_COMBAT.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_COMBAT.getDoc());
}
};
@@ -70,7 +70,7 @@ public class KeyboardShortcuts {
@Override
public void actionPerformed(final ActionEvent e) {
if (Singletons.getControl().getState() != 1) { return; }
SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_LOG.getDoc());
}
};
@@ -79,7 +79,7 @@ public class KeyboardShortcuts {
@Override
public void actionPerformed(final ActionEvent e) {
if (Singletons.getControl().getState() != 1) { return; }
SDisplayUtil.showTab(EDocID.REPORT_PLAYERS.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_PLAYERS.getDoc());
}
};
@@ -88,7 +88,7 @@ public class KeyboardShortcuts {
@Override
public void actionPerformed(final ActionEvent e) {
if (Singletons.getControl().getState() != 1) { return; }
SDisplayUtil.showTab(EDocID.DEV_MODE.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_DEV_MODE.getDoc());
}
};

2
src/main/java/forge/game/phase/CombatUtil.java
View File

@@ -2401,7 +2401,7 @@ public class CombatUtil {
} // loop through attackers
}
SDisplayUtil.showTab(EDocID.REPORT_COMBAT.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_COMBAT.getDoc());
VCombat.SINGLETON_INSTANCE.updateCombat(display.toString().trim());
} // showBlockers()

8
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -330,7 +330,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
switch(phase) {
case UNTAP:
//SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
//SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
PhaseUtil.handleUntap();
break;
@@ -415,12 +415,12 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
AllZone.getEndOfCombat().executeUntil();
AllZone.getEndOfCombat().executeAt();
CombatUtil.showCombat();
//SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
//SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
break;
case MAIN2:
CombatUtil.showCombat();
//SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
//SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
break;
case END_OF_TURN:
@@ -535,7 +535,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
}
if (this.getPhase() == PhaseType.COMBAT_END) {
//SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
//SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
AllZone.getCombat().reset();
this.resetAttackedThisCombat(this.getPlayerTurn());
this.bCombat = false;

2
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -917,7 +917,7 @@ public class MagicStack extends MyObservable {
final SpellAbilityStackInstance si = new SpellAbilityStackInstance(sp);
this.getStack().push(si);
SDisplayUtil.showTab(EDocID.REPORT_STACK.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_STACK.getDoc());
this.updateObservers();
if (sp.isSpell() && !sp.getSourceCard().isCopiedSpell()) {

31
src/main/java/forge/gui/framework/EDocID.java
View File

@@ -29,6 +29,9 @@ import forge.gui.match.views.VStack;
* <br><br><i>(E at beginning of class name denotes an enum.)</i>
*/
public enum EDocID { /** */
CARD_PICTURE (VPicture.SINGLETON_INSTANCE), /** */
CARD_DETAIL (VDetail.SINGLETON_INSTANCE), /** */
EDITOR_FILTERS (VFilters.SINGLETON_INSTANCE), /** */
EDITOR_PREFERENCES (VEditorPreferences.SINGLETON_INSTANCE), /** */
EDITOR_ALLDECKS (VAllDecks.SINGLETON_INSTANCE), /** */
@@ -38,26 +41,22 @@ public enum EDocID { /** */
EDITOR_CURRENTDECK (VCurrentDeck.SINGLETON_INSTANCE), /** */
EDITOR_DECKGEN (VDeckgen.SINGLETON_INSTANCE), /** */
CARD_PICTURE (VPicture.SINGLETON_INSTANCE), /** */
CARD_DETAIL (VDetail.SINGLETON_INSTANCE), /** */
CARD_ANTES (VAntes.SINGLETON_INSTANCE), /** */
REPORT_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
REPORT_STACK (VStack.SINGLETON_INSTANCE), /** */
REPORT_COMBAT (VCombat.SINGLETON_INSTANCE), /** */
REPORT_LOG (VLog.SINGLETON_INSTANCE), /** */
REPORT_PLAYERS (VPlayers.SINGLETON_INSTANCE), /** */
DEV_MODE (VDev.SINGLETON_INSTANCE), /** */
BUTTON_DOCK (VDock.SINGLETON_INSTANCE), /** */
MATCH_ANTES (VAntes.SINGLETON_INSTANCE), /** */
MATCH_MESSAGE (VMessage.SINGLETON_INSTANCE), /** */
MATCH_STACK (VStack.SINGLETON_INSTANCE), /** */
MATCH_COMBAT (VCombat.SINGLETON_INSTANCE), /** */
MATCH_LOG (VLog.SINGLETON_INSTANCE), /** */
MATCH_PLAYERS (VPlayers.SINGLETON_INSTANCE), /** */
MATCH_DEV_MODE (VDev.SINGLETON_INSTANCE), /** */
MATCH_DOCK (VDock.SINGLETON_INSTANCE), /** */
// Non-user battlefields (AI or teammate), use setDoc to register.
FIELD_0 (null), /** */
FIELD_1 (null), /** */
MATCH_FIELD_0 (null), /** */
MATCH_FIELD_1 (null), /** */
// Non-user hands (AI or teammate), use setDoc to register.
HAND_0 (null), /** */
HAND_1 (null);
MATCH_HAND_0 (null), /** */
MATCH_HAND_1 (null);
// End enum declarations, start enum methods.
private IVDoc vDoc;

2
src/main/java/forge/gui/match/CMatchUI.java
View File

@@ -67,7 +67,7 @@ public enum CMatchUI implements CardContainer {
*
*/
public void initMatch(final String strAvatarIcon) {
SDisplayUtil.showTab(EDocID.REPORT_LOG.getDoc());
SDisplayUtil.showTab(EDocID.MATCH_LOG.getDoc());
// Update avatars
final String[] indices = Singletons.getModel().getPreferences().getPref(FPref.UI_AVATARS).split(",");

8
src/main/java/forge/gui/match/VMatchUI.java
View File

@@ -26,11 +26,11 @@ public enum VMatchUI implements IVTopLevelUI {
SINGLETON_INSTANCE;
// Instantiate non-singleton tab instances
private final IVDoc field0 = new VField(EDocID.FIELD_0, AllZone.getComputerPlayer());
private final IVDoc field1 = new VField(EDocID.FIELD_1, AllZone.getHumanPlayer());
private final IVDoc field0 = new VField(EDocID.MATCH_FIELD_0, AllZone.getComputerPlayer());
private final IVDoc field1 = new VField(EDocID.MATCH_FIELD_1, AllZone.getHumanPlayer());
private final IVDoc hand0 = new VHand(EDocID.HAND_0, AllZone.getComputerPlayer());
private final IVDoc hand1 = new VHand(EDocID.HAND_1, AllZone.getHumanPlayer());
private final IVDoc hand0 = new VHand(EDocID.MATCH_HAND_0, AllZone.getComputerPlayer());
private final IVDoc hand1 = new VHand(EDocID.MATCH_HAND_1, AllZone.getHumanPlayer());
// Other instantiations

2
src/main/java/forge/gui/match/views/VAntes.java
View File

@@ -106,7 +106,7 @@ public enum VAntes implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.CARD_ANTES;
return EDocID.MATCH_ANTES;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VCombat.java
View File

@@ -75,7 +75,7 @@ public enum VCombat implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.REPORT_COMBAT;
return EDocID.MATCH_COMBAT;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VDev.java
View File

@@ -139,7 +139,7 @@ public enum VDev implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.DEV_MODE;
return EDocID.MATCH_DEV_MODE;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VDock.java
View File

@@ -108,7 +108,7 @@ public enum VDock implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.BUTTON_DOCK;
return EDocID.MATCH_DOCK;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VLog.java
View File

@@ -74,7 +74,7 @@ public enum VLog implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.REPORT_LOG;
return EDocID.MATCH_LOG;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VMessage.java
View File

@@ -105,7 +105,7 @@ public enum VMessage implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.REPORT_MESSAGE;
return EDocID.MATCH_MESSAGE;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VPlayers.java
View File

@@ -123,7 +123,7 @@ public enum VPlayers implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.REPORT_PLAYERS;
return EDocID.MATCH_PLAYERS;
}
/* (non-Javadoc)

2
src/main/java/forge/gui/match/views/VStack.java
View File

@@ -95,7 +95,7 @@ public enum VStack implements IVDoc {
*/
@Override
public EDocID getDocumentID() {
return EDocID.REPORT_STACK;
return EDocID.MATCH_STACK;
}
/* (non-Javadoc)

2
src/main/java/forge/properties/NewConstants.java
View File

@@ -799,7 +799,7 @@ public final class NewConstants {
/** The AI_LAND. */
public static final String AI_LAND = "%s/NewGame/ailand";
/** The DEV_MODE. */
/** The MATCH_DEV_MODE. */
public static final String DEV_MODE = "%s/NewGame/devmode";
/** The QUEST_MODE. */