External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

more draft/sealed fixes

Browse source
This commit is contained in:
BetaSteward 2011-02-13 08:20:14 -05:00
parent e189543699
commit fabcc28e46
16 changed files with 171 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
View file

@ -276,7 +276,7 @@ public class NewTournamentDialog extends MageDialog {
tOptions.setTournamentType(tournamentType.getName());
tOptions.getPlayerTypes().add("Human");
for (TournamentPlayerPanel player: players) {
tOptions.getPlayerTypes().add(player.getPlayerType());
tOptions.getPlayerTypes().add((String) player.getPlayerType().getSelectedItem());
}
if (tournamentType.isDraft()) {
DraftOptions options = new DraftOptions();
@ -347,12 +347,33 @@ public class NewTournamentDialog extends MageDialog {
pack.setModel(new DefaultComboBoxModel(Sets.getInstance().values().toArray()));
pnlPacks.add(pack);
packs.add(pack);
pack.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
packActionPerformed(evt);
}
});
}
this.pack();
this.revalidate();
this.repaint();
}
private void packActionPerformed(java.awt.event.ActionEvent evt) {
boolean start = false;
int selectedIndex = 0;
for (JComboBox pack: packs) {
if (!start) {
if (evt.getSource().equals(pack)) {
start = true;
selectedIndex = pack.getSelectedIndex();
}
}
else {
pack.setSelectedIndex(selectedIndex);
}
}
}
private void createPlayers(int numPlayers) {
if (numPlayers > players.size()) {
while (players.size() != numPlayers) {
@ -373,12 +394,33 @@ public class NewTournamentDialog extends MageDialog {
this.pnlOtherPlayers.removeAll();
for (TournamentPlayerPanel panel: players) {
this.pnlOtherPlayers.add(panel);
panel.getPlayerType().addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
playerActionPerformed(evt);
}
});
}
this.pack();
this.revalidate();
this.repaint();
}
private void playerActionPerformed(java.awt.event.ActionEvent evt) {
boolean start = false;
int selectedIndex = 0;
for (TournamentPlayerPanel player: players) {
if (!start) {
if (evt.getSource().equals(player.getPlayerType())) {
start = true;
selectedIndex = player.getPlayerType().getSelectedIndex();
}
}
else {
player.getPlayerType().setSelectedIndex(selectedIndex);
}
}
}
public TableView getTable() {
return table;
}

5
Mage.Client/src/main/java/mage/client/table/TournamentPlayerPanel.java
View file

@ -36,6 +36,7 @@ package mage.client.table;
import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import mage.client.MageFrame;
import mage.client.remote.Session;
@ -59,8 +60,8 @@ public class TournamentPlayerPanel extends javax.swing.JPanel {
this.lblPlayerNum.setText("Player " + playerNum);
}
public String getPlayerType() {
return (String) this.cbPlayerType.getSelectedItem();
public JComboBox getPlayerType() {
return this.cbPlayerType;
}
public boolean joinTournamentTable(UUID roomId, UUID tableId) {