github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-02-18 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted wrong formated code

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-17 05:22:59 +04:00
parent 486c0d7c2c
commit f0df880b17
1 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -57,48 +57,12 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private final Map<UUID, Card> temporaryCards = new HashMap<>(); // Cards dragged out of one part of the view into another private final Map<UUID, Card> temporaryCards = new HashMap<>(); // Cards dragged out of one part of the view into another
private final String LAST_DECK_FOLDER = "lastDeckFolder"; private final String LAST_DECK_FOLDER = "lastDeckFolder";
private Deck deck = new Deck(); private Deck deck = new Deck();
private boolean isShowCardInfo = false;
private UUID tableId; private UUID tableId;
private DeckEditorMode mode; private DeckEditorMode mode;
private int timeout; private int timeout;
private javax.swing.Timer countdown; private javax.swing.Timer countdown;
private UpdateDeckTask updateDeckTask; private UpdateDeckTask updateDeckTask;
private int timeToSubmit = -1; private int timeToSubmit = -1;
// Variables declaration - do not modify//GEN-BEGIN:variables
private mage.client.cards.BigCard bigCard;
private javax.swing.JButton btnAddLand;
private javax.swing.JButton btnExit;
private javax.swing.JButton btnExport;
private javax.swing.JButton btnGenDeck;
private javax.swing.JButton btnImport;
private javax.swing.JButton btnLegality;
private javax.swing.JButton btnLoad;
private javax.swing.JButton btnNew;
private javax.swing.JButton btnSave;
private javax.swing.JButton btnSubmit;
private javax.swing.JButton btnSubmitTimer;
private JComponent cardInfoPane;
/*
private org.mage.plugins.card.info.CardInfoPaneImpl cardInfoPane;
*/
private mage.client.deckeditor.CardSelector cardSelector;
private mage.client.deckeditor.DeckArea deckArea;
private mage.client.deckeditor.DeckLegalityPanel deckLegalityDisplay;
private javax.swing.JLabel lblDeckName;
private javax.swing.JPanel panelDeck;
private javax.swing.JPanel panelDeckCreate;
private javax.swing.JPanel panelDeckDraft;
private javax.swing.JPanel panelDeckExit;
private javax.swing.JPanel panelDeckLands;
private javax.swing.JPanel panelDeckLoad;
private javax.swing.JPanel panelDeckName;
private javax.swing.JPanel panelDeckSave;
private javax.swing.JPanel panelInfo;
private javax.swing.JPanel panelLeft;
private javax.swing.JSplitPane panelRight;
private javax.swing.JScrollPane scrollPaneInfo;
private javax.swing.JTextField txtDeckName;
private javax.swing.JTextField txtTimeRemaining;
public DeckEditorPanel() { public DeckEditorPanel() {
initComponents(); initComponents();
@ -925,7 +889,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (cardInfoPane != null && System.getProperty("testCardInfo") != null) { if (cardInfoPane != null && System.getProperty("testCardInfo") != null) {
cardInfoPane.setPreferredSize(new Dimension(170, 150)); cardInfoPane.setPreferredSize(new Dimension(170, 150));
cardInfoPane.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(200, 0, 0))); cardInfoPane.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(200, 0, 0)));
isShowCardInfo = true;
} else { } else {
cardInfoPane = new JLabel(); cardInfoPane = new JLabel();
cardInfoPane.setVisible(false); cardInfoPane.setVisible(false);
@ -1517,6 +1480,42 @@ public class DeckEditorPanel extends javax.swing.JPanel {
this.deckLegalityDisplay.setVisible(true); this.deckLegalityDisplay.setVisible(true);
this.deckLegalityDisplay.validateDeck(deck); this.deckLegalityDisplay.validateDeck(deck);
}//GEN-LAST:event_btnLegalityActionPerformed }//GEN-LAST:event_btnLegalityActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private mage.client.cards.BigCard bigCard;
private javax.swing.JButton btnAddLand;
private javax.swing.JButton btnExit;
private javax.swing.JButton btnExport;
private javax.swing.JButton btnGenDeck;
private javax.swing.JButton btnImport;
private javax.swing.JButton btnLegality;
private javax.swing.JButton btnLoad;
private javax.swing.JButton btnNew;
private javax.swing.JButton btnSave;
private javax.swing.JButton btnSubmit;
private javax.swing.JButton btnSubmitTimer;
private JComponent cardInfoPane;
/*
private org.mage.plugins.card.info.CardInfoPaneImpl cardInfoPane;
*/
private mage.client.deckeditor.CardSelector cardSelector;
private mage.client.deckeditor.DeckArea deckArea;
private mage.client.deckeditor.DeckLegalityPanel deckLegalityDisplay;
private javax.swing.JLabel lblDeckName;
private javax.swing.JPanel panelDeck;
private javax.swing.JPanel panelDeckCreate;
private javax.swing.JPanel panelDeckDraft;
private javax.swing.JPanel panelDeckExit;
private javax.swing.JPanel panelDeckLands;
private javax.swing.JPanel panelDeckLoad;
private javax.swing.JPanel panelDeckName;
private javax.swing.JPanel panelDeckSave;
private javax.swing.JPanel panelInfo;
private javax.swing.JPanel panelLeft;
private javax.swing.JSplitPane panelRight;
private javax.swing.JScrollPane scrollPaneInfo;
private javax.swing.JTextField txtDeckName;
private javax.swing.JTextField txtTimeRemaining;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }