Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[refactoring] Moved Sets.loadDeck to a DeckImporterImplementation

Browse source
This commit is contained in:
North 2012-04-08 16:52:21 +03:00
parent e9ac5a180b
commit 47bd74a24c
17 changed files with 218 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java
View file

@ -37,15 +37,13 @@ package mage.client.table;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import mage.client.MageFrame;
import mage.remote.Session;
import mage.cards.decks.importer.DeckImporterUtil;
import mage.client.util.Config;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.sets.Sets;
import mage.remote.Session;
/**
*
@ -79,7 +77,7 @@ public class TablePlayerPanel extends javax.swing.JPanel {
public boolean joinTable(UUID roomId, UUID tableId) throws FileNotFoundException, IOException, ClassNotFoundException {
if (!this.cbPlayerType.getSelectedItem().equals("Human")) {
return session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), (String)this.cbPlayerType.getSelectedItem(), this.newPlayerPanel.getLevel(), Sets.loadDeck(this.newPlayerPanel.getDeckFile()));
return session.joinTable(roomId, tableId, this.newPlayerPanel.getPlayerName(), (String)this.cbPlayerType.getSelectedItem(), this.newPlayerPanel.getLevel(), DeckImporterUtil.importDeck(this.newPlayerPanel.getDeckFile()));
}
return true;
}