Merge branch 'master' of woodyfolsom.net:/opt/git/cs8803p4

This commit is contained in:
Marshall
2012-04-30 19:11:48 -04:00

View File

@@ -31,8 +31,10 @@ public class UserChooserFrame extends JFrame {
private final Player comPlayer; private final Player comPlayer;
private final JButton playButton = new JButton("Play!"); private final JButton playButton = new JButton("Play!");
private final JComboBox<String> userNameBox = new JComboBox<String>(); private final JComboBox<String> userNameBox = new JComboBox<String>();
private ArrayList<String> users; private ArrayList<String> users;
private boolean gameLaunched = false;
public UserChooserFrame(ParsedArgs parsedArgs) { public UserChooserFrame(ParsedArgs parsedArgs) {
this.comPlayer = parsedArgs.getComPlayer(); this.comPlayer = parsedArgs.getComPlayer();
initLayout(); initLayout();
@@ -143,6 +145,10 @@ public class UserChooserFrame extends JFrame {
} }
void launchSelectedPlayer() { void launchSelectedPlayer() {
if (gameLaunched) {
return;
}
String name = ((String) userNameBox.getSelectedItem()); String name = ((String) userNameBox.getSelectedItem());
name = name == null ? name : name.trim().toLowerCase(); name = name == null ? name : name.trim().toLowerCase();
@@ -162,6 +168,7 @@ public class UserChooserFrame extends JFrame {
saveUserList(); saveUserList();
new MainFrame(name, comPlayer); new MainFrame(name, comPlayer);
gameLaunched = true;
} }
} }
} }