Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactoring out Deck Editor functions from MagicFrame.

master
Lodici 2013-12-02 09:21:33 +00:00
parent 9554ca7cbc
commit 16d4a6aad0
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/ui/DeckEditorScreen.java
View File

@ -76,7 +76,7 @@ public class DeckEditorScreen
*/
@Override
public void showOptionsMenuOverlay() {
new DeckEditorScreenOptions(frame);
new DeckEditorScreenOptions(frame, this);
}
public void createNewEmptyDeck() {

10
src/magic/ui/DeckEditorScreenOptions.java
View File

@ -21,10 +21,12 @@ public class DeckEditorScreenOptions extends TexturedPanel implements IMenuOverl
private static Color MENUPANEL_COLOR = new Color(0, 0, 0, 230);
private final MagicFrame frame;
private final DeckEditorScreen screen;
public DeckEditorScreenOptions(final MagicFrame frame0) {
public DeckEditorScreenOptions(final MagicFrame frame0, final DeckEditorScreen screen0) {
this.frame = frame0;
this.screen = screen0;
setBackground(BACKGROUND_COLOR);
setLayout(new MigLayout("insets 0, gap 10, flowx, center, center"));
@ -60,7 +62,7 @@ public class DeckEditorScreenOptions extends TexturedPanel implements IMenuOverl
menu.addMenuItem("New empty deck", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
frame.newDeck();
screen.createNewEmptyDeck();
hideOverlay();
}
});
@ -74,7 +76,7 @@ public class DeckEditorScreenOptions extends TexturedPanel implements IMenuOverl
@Override
public void actionPerformed(ActionEvent e) {
hideAllMenuPanels();
frame.loadDeck();
screen.loadDeck();
hideOverlay();
}
});
@ -82,7 +84,7 @@ public class DeckEditorScreenOptions extends TexturedPanel implements IMenuOverl
@Override
public void actionPerformed(ActionEvent e) {
hideAllMenuPanels();
frame.saveDeck();
screen.saveDeck();
hideOverlay();
}
});

16
src/magic/ui/MagicFrame.java
View File

@ -229,22 +229,6 @@ public class MagicFrame extends JFrame {
}
}
public void newDeck() {
((DeckEditorScreen)screens.peek()).createNewEmptyDeck();
}
public void loadDeck() {
((DeckEditorScreen)screens.peek()).loadDeck();
}
public void saveDeck() {
((DeckEditorScreen)screens.peek()).saveDeck();
}
public void swapDecks() {
((DuelDecksScreen)screens.peek()).swapDecks();
}
public boolean isLegalDeckAndShowErrors(final MagicDeck deck, final String playerName) {
final String brokenRulesText =
MagicDeckConstructionRule.getRulesText(MagicDeckConstructionRule.checkDeck(deck));