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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-02-18 21:29:43 +00:00
parent 997a9f8170
commit c7ea22bb16
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/control/home/ControlDraft.java
View File

@@ -183,9 +183,9 @@ public class ControlDraft {
/** Updates deck list in view. */ /** Updates deck list in view. */
public void updateHumanDecks() { public void updateHumanDecks() {
List<Deck> human = new ArrayList<Deck>(); List<Deck> human = new ArrayList<Deck>();
for(DeckSet d : AllZone.getDecks().getDraft()) { for (DeckSet d : AllZone.getDecks().getDraft()) {
human.add(d.getHumanDeck()); human.add(d.getHumanDeck());
} }
view.getLstHumanDecks().setDecks(human); view.getLstHumanDecks().setDecks(human);

6
src/main/java/forge/control/home/ControlQuest.java
View File

@@ -399,9 +399,11 @@ public class ControlQuest {
/** Resets decks, then retrieves and sets current deck. */ /** Resets decks, then retrieves and sets current deck. */
public void refreshDecks() { public void refreshDecks() {
// Retrieve and set all decks // Retrieve and set all decks
List<Deck> temp = new ArrayList<Deck>(); List<Deck> temp = new ArrayList<Deck>();
if (qData != null ) temp.addAll(qData.getMyDecks().values()); if (qData != null) {
temp.addAll(qData.getMyDecks().values());
}
view.getLstDecks().setDecks(temp); view.getLstDecks().setDecks(temp);
// Look through list for preferred deck from prefs // Look through list for preferred deck from prefs

18
src/main/java/forge/control/home/ControlSealed.java
View File

@@ -174,21 +174,23 @@ public class ControlSealed {
+ ">> does not equal any of the sealedTypes."); + ">> does not equal any of the sealedTypes.");
} }
if (sd.getCardpool().isEmpty()) if (sd.getCardpool().isEmpty()) {
return; return;
}
final String sDeckName = JOptionPane.showInputDialog(null, final String sDeckName = JOptionPane.showInputDialog(null,
ForgeProps.getLocalized(NewConstants.Lang.OldGuiNewGame.NewGameText.SAVE_SEALED_MSG), ForgeProps.getLocalized(NewConstants.Lang.OldGuiNewGame.NewGameText.SAVE_SEALED_MSG),
ForgeProps.getLocalized(NewConstants.Lang.OldGuiNewGame.NewGameText.SAVE_SEALED_TTL), ForgeProps.getLocalized(NewConstants.Lang.OldGuiNewGame.NewGameText.SAVE_SEALED_TTL),
JOptionPane.QUESTION_MESSAGE); JOptionPane.QUESTION_MESSAGE);
if ( StringUtils.isBlank(sDeckName) ) if (StringUtils.isBlank(sDeckName)) {
return; return;
}
// May check for name uniqueness here // May check for name uniqueness here
final ItemPool<CardPrinted> sDeck = sd.getCardpool(); final ItemPool<CardPrinted> sDeck = sd.getCardpool();
Deck deck = new Deck(sDeckName); Deck deck = new Deck(sDeckName);
deck.getSideboard().addAll(sDeck); deck.getSideboard().addAll(sDeck);
@@ -200,11 +202,9 @@ public class ControlSealed {
sealed.setHumanDeck(deck); sealed.setHumanDeck(deck);
sealed.addAiDeck(sd.buildAIDeck(sDeck.toForgeCardList())); sealed.addAiDeck(sd.buildAIDeck(sDeck.toForgeCardList()));
AllZone.getDecks().getSealed().add(sealed); AllZone.getDecks().getSealed().add(sealed);
view.getParentView().getUtilitiesController().showDeckEditor(GameType.Sealed, sealed); view.getParentView().getUtilitiesController().showDeckEditor(GameType.Sealed, sealed);
} }
/** @return {@link forge.Command} What to do when the deck editor exits. */ /** @return {@link forge.Command} What to do when the deck editor exits. */

21
src/main/java/forge/control/home/ControlUtilities.java
View File

@@ -153,16 +153,19 @@ public class ControlUtilities {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> void showDeckEditor(GameType gt0, T d0) { public <T> void showDeckEditor(GameType gt0, T d0) {
DeckEditorBase<?, T> editor = null;
if ( gt0 == GameType.Constructed)
editor = (DeckEditorBase<?, T>) new DeckEditorConstructed();
if ( gt0 == GameType.Draft)
editor = (DeckEditorBase<?, T>) new DeckEditorLimited(AllZone.getDecks().getDraft());
if ( gt0 == GameType.Sealed)
editor = (DeckEditorBase<?, T>) new DeckEditorLimited(AllZone.getDecks().getSealed());
DeckEditorBase<?, T> editor = null;
if (gt0 == GameType.Constructed) {
editor = (DeckEditorBase<?, T>) new DeckEditorConstructed();
}
if (gt0 == GameType.Draft) {
editor = (DeckEditorBase<?, T>) new DeckEditorLimited(AllZone.getDecks().getDraft());
}
if (gt0 == GameType.Sealed) {
editor = (DeckEditorBase<?, T>) new DeckEditorLimited(AllZone.getDecks().getSealed());
}
final Command exit = new Command() { final Command exit = new Command() {
private static final long serialVersionUID = -9133358399503226853L; private static final long serialVersionUID = -9133358399503226853L;