Phase stops - done.

This commit is contained in:
magenoxx 2010-12-12 17:02:24 +03:00
parent 8a454d38a7
commit b26db98817
10 changed files with 706 additions and 85 deletions

View file

@ -40,14 +40,9 @@ import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JDesktopPane;
import javax.swing.JLayeredPane;
import mage.cards.decks.DeckCardLists;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.components.MageComponents;
import mage.client.dialog.PhasesDialog;
import mage.view.PlayerView;
/**
@ -58,7 +53,6 @@ public class PlayAreaPanel extends javax.swing.JPanel {
UUID playerId;
UUID gameId;
PhasesDialog phasesDialog;
/** Creates new form PlayAreaPanel */
public PlayAreaPanel() {
@ -111,7 +105,6 @@ public class PlayAreaPanel extends javax.swing.JPanel {
playerPanel = new mage.client.game.PlayerPanel();
manaPool = new mage.client.game.ManaPool();
btnCheat = new javax.swing.JButton();
btnPhases = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
battlefieldPanel = new mage.client.game.BattlefieldPanel(jScrollPane1);
@ -123,13 +116,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
btnCheatActionPerformed(evt);
}
});
btnPhases.setText("Phases");
btnPhases.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnPhasesActionPerformed(evt);
}
});
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
@ -138,7 +125,6 @@ public class PlayAreaPanel extends javax.swing.JPanel {
.addComponent(manaPool, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
.addComponent(playerPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnCheat, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
.addComponent(btnPhases, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@ -147,9 +133,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
.addGap(0, 0, 0)
.addComponent(manaPool, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 17, Short.MAX_VALUE)
.addComponent(btnCheat)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 17, Short.MAX_VALUE)
.addComponent(btnPhases))
.addComponent(btnCheat))
);
jScrollPane1.setViewportView(battlefieldPanel);
@ -182,17 +166,6 @@ public class PlayAreaPanel extends javax.swing.JPanel {
}
}//GEN-LAST:event_btnCheatActionPerformed
private void btnPhasesActionPerformed(java.awt.event.ActionEvent evt) {
if (phasesDialog == null) {
synchronized (this) {
if (phasesDialog == null) {
phasesDialog = new PhasesDialog(null);
}
}
}
phasesDialog.showDialog();
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private mage.client.game.BattlefieldPanel battlefieldPanel;
private javax.swing.JButton btnCheat;
@ -200,7 +173,6 @@ public class PlayAreaPanel extends javax.swing.JPanel {
private javax.swing.JScrollPane jScrollPane1;
private mage.client.game.ManaPool manaPool;
private mage.client.game.PlayerPanel playerPanel;
private javax.swing.JButton btnPhases;
// End of variables declaration//GEN-END:variables
}