diff --git a/Mage.Client/src/main/java/mage/client/cards/ICardGrid.java b/Mage.Client/src/main/java/mage/client/cards/ICardGrid.java index c2bf1087250..16de6df0f3f 100644 --- a/Mage.Client/src/main/java/mage/client/cards/ICardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/ICardGrid.java @@ -28,8 +28,12 @@ package mage.client.cards; +import mage.client.constants.Constants; import mage.client.util.Event; import mage.client.util.Listener; +import mage.view.CardsView; + +import java.util.UUID; /** * Interface for card container. @@ -38,6 +42,8 @@ import mage.client.util.Listener; * */ public interface ICardGrid { - void clearCardEventListeners(); - void addCardEventListener(Listener listener); + void clearCardEventListeners(); + void addCardEventListener(Listener listener); + void drawCards(Constants.SortBy sortBy, boolean piles); + void loadCards(CardsView showCards, Constants.SortBy sortBy, boolean piles, BigCard bigCard, UUID gameId); } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form index 64253dc5842..edce6f56fa6 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form @@ -18,6 +18,11 @@ + + + + + @@ -27,8 +32,10 @@ - - + + + + @@ -281,6 +288,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index cc2be1ce4d2..2e03db16d90 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -40,22 +40,28 @@ import mage.cards.ExpansionSet; import mage.client.cards.BigCard; import mage.client.cards.CardGrid; import mage.client.cards.CardsStorage; +import mage.client.cards.ICardGrid; +import mage.client.constants.Constants; import mage.client.constants.Constants.SortBy; +import mage.client.deckeditor.table.TableModel; import mage.filter.Filter.ComparisonScope; import mage.filter.FilterCard; import mage.sets.Sets; import mage.view.CardsView; import javax.swing.*; +import javax.swing.table.DefaultTableCellRenderer; import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.*; import java.util.List; /** * - * @author BetaSteward_at_googlemail.com + * @author BetaSteward_at_googlemail.com, nantuko */ public class CardSelector extends javax.swing.JPanel implements ComponentListener { @@ -66,15 +72,56 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene /** Creates new form CardSelector */ public CardSelector() { initComponents(); + makeTransparent(); + initListViewComponents(); + currentView = mainModel; // by default we have List (table) view + } + + public void makeTransparent() { this.addComponentListener(this); setOpaque(false); cardGrid.setOpaque(false); jScrollPane1.setOpaque(false); jScrollPane1.getViewport().setOpaque(false); cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values())); - + } + + public void initListViewComponents() { + mainTable = new JTable(); + + mainModel = new TableModel(); + mainModel.addListeners(mainTable); + + mainTable.setModel(mainModel); + mainTable.setForeground(Color.white); + DefaultTableCellRenderer myRenderer = (DefaultTableCellRenderer) mainTable.getDefaultRenderer(String.class); + myRenderer.setBackground(new Color(0, 0, 0, 100)); + mainTable.getColumnModel().getColumn(0).setMaxWidth(0); + mainTable.getColumnModel().getColumn(0).setPreferredWidth(10); + mainTable.getColumnModel().getColumn(1).setPreferredWidth(110); + mainTable.getColumnModel().getColumn(2).setPreferredWidth(90); + mainTable.getColumnModel().getColumn(3).setPreferredWidth(50); + mainTable.getColumnModel().getColumn(4).setPreferredWidth(170); + mainTable.getColumnModel().getColumn(5).setPreferredWidth(30); + mainTable.getColumnModel().getColumn(6).setPreferredWidth(15); + mainTable.getColumnModel().getColumn(7).setPreferredWidth(15); + + jScrollPane1.setViewportView(mainTable); + mainTable.setOpaque(false); - } + + cbSortBy.setEnabled(false); + chkPiles.setEnabled(false); + + mainTable.addMouseListener(new MouseAdapter() { + public void mousePressed(MouseEvent e) { + if (e.getClickCount() == 2 && !e.isConsumed()) { + e.consume(); + //TODO: jButtonAddToMainActionPerformed(null); + } + } + }); + } public void loadCards(List sideboard, BigCard bigCard, boolean construct) { this.bigCard = bigCard; @@ -146,7 +193,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene filteredCards.add(card); } } - this.cardGrid.loadCards(new CardsView(filteredCards), (SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected(), bigCard, null); + this.currentView.loadCards(new CardsView(filteredCards), (SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected(), bigCard, null); } finally { setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); @@ -214,6 +261,15 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene rdoPlaneswalkers = new javax.swing.JRadioButton(); chkPiles = new javax.swing.JCheckBox(); cbSortBy = new javax.swing.JComboBox(); + jToggleListView = new javax.swing.JToggleButton(); + jToggleCardView = new javax.swing.JToggleButton(); + jPanel1 = new javax.swing.JPanel(); + jButtonAddToMain = new javax.swing.JButton(); + jButtonAddToSideboard = new javax.swing.JButton(); + jLabel1 = new javax.swing.JLabel(); + jTextFieldSearch = new javax.swing.JTextField(); + jButtonSearch = new javax.swing.JButton(); + jButtonClean = new javax.swing.JButton(); tbColor.setFloatable(false); tbColor.setRollover(true); @@ -428,12 +484,101 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene }); tbTypes.add(cbSortBy); + jToggleListView.setSelected(true); + jToggleListView.setText("ListView"); + jToggleListView.setFocusable(false); + jToggleListView.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleListView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleListView.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleListViewActionPerformed(evt); + } + }); + tbTypes.add(jToggleListView); + + jToggleCardView.setText("CardView"); + jToggleCardView.setFocusable(false); + jToggleCardView.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleCardView.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleCardView.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleCardViewActionPerformed(evt); + } + }); + tbTypes.add(jToggleCardView); + + jPanel1.setOpaque(false); + jPanel1.setPreferredSize(new java.awt.Dimension(897, 35)); + + jButtonAddToMain.setText("Add to Main"); + jButtonAddToMain.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButtonAddToMainActionPerformed(evt); + } + }); + + jButtonAddToSideboard.setText("Add to Sideboard"); + jButtonAddToSideboard.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButtonAddToSideboardActionPerformed(evt); + } + }); + + jLabel1.setText("Search (by name,in rules):"); + + jButtonSearch.setText("Search"); + jButtonSearch.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButtonSearchActionPerformed(evt); + } + }); + + jButtonClean.setText("Clear"); + jButtonClean.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButtonCleanActionPerformed(evt); + } + }); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addComponent(jButtonAddToMain) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButtonAddToSideboard) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, 112, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButtonSearch) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jButtonClean) + .addContainerGap(294, Short.MAX_VALUE)) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jButtonAddToMain) + .addComponent(jButtonAddToSideboard) + .addComponent(jLabel1) + .addComponent(jTextFieldSearch, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jButtonSearch) + .addComponent(jButtonClean)) + ); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(tbColor, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE) .addComponent(tbTypes, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap() + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap()) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 917, Short.MAX_VALUE) ); layout.setVerticalGroup( @@ -442,8 +587,10 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene .addComponent(tbColor, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, 0) .addComponent(tbTypes, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 316, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) ); }// //GEN-END:initComponents @@ -556,16 +703,84 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene private void cbSortByActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbSortByActionPerformed if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); }//GEN-LAST:event_cbSortByActionPerformed private void chkPilesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkPilesActionPerformed if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); }//GEN-LAST:event_chkPilesActionPerformed - private JTable mainTable = new JTable(); - + private void jToggleListViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleListViewActionPerformed + jToggleCardView.setSelected(false); + currentView = mainModel; + jScrollPane1.setViewportView(mainTable); + cbSortBy.setEnabled(false); + chkPiles.setEnabled(false); + jButtonAddToMain.setEnabled(true); + jButtonAddToSideboard.setEnabled(true); + filterCards(); + }//GEN-LAST:event_jToggleListViewActionPerformed + + private void jToggleCardViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleCardViewActionPerformed + jToggleListView.setSelected(false); + currentView = cardGrid; + jScrollPane1.setViewportView(cardGrid); + cbSortBy.setEnabled(true); + chkPiles.setEnabled(true); + jButtonAddToMain.setEnabled(false); + jButtonAddToSideboard.setEnabled(false); + filterCards(); + }//GEN-LAST:event_jToggleCardViewActionPerformed + + private void jButtonAddToMainActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonAddToMainActionPerformed + if (mainTable.getSelectedRowCount() > 0) { + int[] n = mainTable.getSelectedRows(); + List indexes = asList(n); + Collections.reverse(indexes); + for (Integer index : indexes) { + mainModel.doubleClick(index); + } + //if (!mode.equals(Constants.DeckEditorMode.Constructed)) + //mainModel.fireTableDataChanged(); + } + }//GEN-LAST:event_jButtonAddToMainActionPerformed + + private void jButtonAddToSideboardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonAddToSideboardActionPerformed + if (mainTable.getSelectedRowCount() > 0) { + int[] n = mainTable.getSelectedRows(); + List indexes = asList(n); + Collections.reverse(indexes); + for (Integer index : indexes) { + mainModel.shiftDoubleClick(index); + } + //if (!mode.equals(Constants.DeckEditorMode.Constructed)) + //mainModel.fireTableDataChanged(); + } + }//GEN-LAST:event_jButtonAddToSideboardActionPerformed + + private void jButtonSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonSearchActionPerformed + String name = jTextFieldSearch.getText().trim(); + filter.setText(name); + filterCards(); + }//GEN-LAST:event_jButtonSearchActionPerformed + + private void jButtonCleanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonCleanActionPerformed + jTextFieldSearch.setText(""); + filter.setText(""); + filterCards(); + }//GEN-LAST:event_jButtonCleanActionPerformed + + public List asList(final int[] is) { + List list = new ArrayList(); + for (int i : is) list.add(i); + return list; + } + + private TableModel mainModel; + private JTable mainTable; + private ICardGrid currentView; + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnBooster; private javax.swing.JButton btnClear; @@ -573,7 +788,16 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene private javax.swing.JComboBox cbExpansionSet; private javax.swing.JComboBox cbSortBy; private javax.swing.JCheckBox chkPiles; + private javax.swing.JButton jButtonAddToMain; + private javax.swing.JButton jButtonAddToSideboard; + private javax.swing.JButton jButtonClean; + private javax.swing.JButton jButtonSearch; + private javax.swing.JLabel jLabel1; + private javax.swing.JPanel jPanel1; private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTextField jTextFieldSearch; + private javax.swing.JToggleButton jToggleCardView; + private javax.swing.JToggleButton jToggleListView; private javax.swing.JRadioButton rdoArtifacts; private javax.swing.JRadioButton rdoBlack; private javax.swing.JRadioButton rdoBlue; @@ -594,25 +818,25 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene @Override public void componentResized(ComponentEvent e) { if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); } @Override public void componentMoved(ComponentEvent e) { if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); } @Override public void componentShown(ComponentEvent e) { if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); } @Override public void componentHidden(ComponentEvent e) { if (cbSortBy.getSelectedItem() instanceof SortBy) - this.cardGrid.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); + this.currentView.drawCards((SortBy) cbSortBy.getSelectedItem(), chkPiles.isSelected()); } } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index c46ad00828f..6ca6c674fb8 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -112,7 +112,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { this.tableId = tableId; this.mode = mode; this.btnAddLand.setVisible(false); - this.cardTableSelector.setMode(mode); + //this.cardTableSelector.setMode(mode); switch (mode) { case Limited: this.btnAddLand.setVisible(true); @@ -120,7 +120,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { case Sideboard: this.btnSubmit.setVisible(true); this.cardSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); - this.cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); + //this.cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); this.btnExit.setVisible(false); this.btnImport.setVisible(false); if (!MageFrame.getSession().isTestMode()) @@ -136,7 +136,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { case Constructed: this.btnSubmit.setVisible(false); this.cardSelector.loadCards(this.bigCard); - this.cardTableSelector.loadCards(this.bigCard); + //this.cardTableSelector.loadCards(this.bigCard); this.btnExit.setVisible(true); this.btnImport.setVisible(true); if (!MageFrame.getSession().isTestMode()) @@ -150,9 +150,9 @@ public class DeckEditorPanel extends javax.swing.JPanel { private void init() { this.cardSelector.setVisible(true); - this.cardTableSelector.setVisible(false); - this.jRadioButtonFullCards.setSelected(true); - this.jRadioButtonListTable.setSelected(false); + //this.cardTableSelector.setVisible(false); + //this.jRadioButtonFullCards.setSelected(true); + //this.jRadioButtonListTable.setSelected(false); this.jPanel1.setVisible(true); this.cardSelector.getCardsList().clearCardEventListeners(); this.cardSelector.getCardsList().addCardEventListener( @@ -166,7 +166,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) { deck.getSideboard().remove(card); cardSelector.removeCard(card.getId()); - cardTableSelector.removeCard(card.getId()); + //cardTableSelector.removeCard(card.getId()); } if (cardInfoPane instanceof CardInfoPane) { ((CardInfoPane)cardInfoPane).setCard(new CardView(card)); @@ -177,7 +177,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { } } ); - this.cardTableSelector.getCardsList().clearCardEventListeners(); + /*this.cardTableSelector.getCardsList().clearCardEventListeners(); this.cardTableSelector.getCardsList().addCardEventListener( new Listener () { @Override @@ -205,7 +205,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { refreshDeck(); } } - ); + );*/ this.deckArea.clearDeckEventListeners(); this.deckArea.addDeckEventListener( new Listener () { @@ -218,7 +218,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { if (mode == DeckEditorMode.Limited || mode == DeckEditorMode.Sideboard) { deck.getSideboard().add(card); cardSelector.loadCards(new ArrayList(deck.getSideboard()), getBigCard(), mode == DeckEditorMode.Limited); - cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), getBigCard(), mode == DeckEditorMode.Limited); + //cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), getBigCard(), mode == DeckEditorMode.Limited); } break; } @@ -292,7 +292,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { jSplitPane1 = new javax.swing.JSplitPane(); cardSelector = new mage.client.deckeditor.CardSelector(); - cardTableSelector = new mage.client.deckeditor.table.CardTableSelector(); + //cardTableSelector = new mage.client.deckeditor.table.CardTableSelector(); deckArea = new mage.client.deckeditor.DeckArea(); jPanel1 = new javax.swing.JPanel(); bigCard = new mage.client.cards.BigCard(); @@ -307,6 +307,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { btnAddLand = new javax.swing.JButton(); txtTimeRemaining = new javax.swing.JTextField(); + /* jLayeredPane1 = new javax.swing.JLayeredPane(); jRadioButtonFullCards = new javax.swing.JRadioButton(); jRadioButtonListTable = new javax.swing.JRadioButton(); @@ -322,7 +323,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { public void actionPerformed(ActionEvent e) { if (jRadioButtonListTable.isSelected()) { jRadioButtonListTable.setSelected(false); - cardTableSelector.setVisible(false); + //cardTableSelector.setVisible(false); cardSelector.setVisible(true); jSplitPane1.setTopComponent(cardSelector); jSplitPane1.setDividerLocation(0.6); @@ -349,7 +350,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { jSplitPane1.repaint(); } } - }); + });*/ jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); jSplitPane1.setResizeWeight(0.5); @@ -441,9 +442,9 @@ public class DeckEditorPanel extends javax.swing.JPanel { jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel1Layout.createSequentialGroup() + /*.addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel1Layout.createSequentialGroup() .addContainerGap() - .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE)) + .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE))*/ .addGroup(jPanel1Layout.createSequentialGroup() .addGap(6, 6, 6) .addComponent(lblDeckName) @@ -494,7 +495,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(txtTimeRemaining)) - .addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE) + //.addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, isShowCardInfo ? 30 : 159, Short.MAX_VALUE) .addComponent(cardInfoPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 104, Short.MAX_VALUE) @@ -576,7 +577,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { } deck.getCards().clear(); cardSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); - cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); + //cardTableSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); } else { deck = new Deck(); @@ -648,16 +649,16 @@ public class DeckEditorPanel extends javax.swing.JPanel { private javax.swing.JButton btnLoad; private javax.swing.JButton btnNew; private javax.swing.JButton btnSave; - private mage.client.deckeditor.table.CardTableSelector cardTableSelector; + //private mage.client.deckeditor.table.CardTableSelector cardTableSelector; private mage.client.deckeditor.CardSelector cardSelector; private mage.client.deckeditor.DeckArea deckArea; private javax.swing.JPanel jPanel1; private javax.swing.JSplitPane jSplitPane1; private javax.swing.JLabel lblDeckName; private javax.swing.JTextField txtDeckName; - private javax.swing.JRadioButton jRadioButtonFullCards; - private javax.swing.JRadioButton jRadioButtonListTable; - private javax.swing.JLayeredPane jLayeredPane1; + //private javax.swing.JRadioButton jRadioButtonFullCards; + //private javax.swing.JRadioButton jRadioButtonListTable; + //private javax.swing.JLayeredPane jLayeredPane1; // End of variables declaration//GEN-END:variables private JComponent cardInfoPane; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java index c9d187ca432..ee48b4848b1 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardTableSelector.java @@ -710,7 +710,7 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi }//GEN-LAST:event_jButton2ActionPerformed private TableModel mainModel; - + private javax.swing.JButton btnBooster; private javax.swing.JButton btnClear; private JTable mainTable = new JTable(); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java index 2e7c6496f52..f130dc5dfe9 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java @@ -75,8 +75,7 @@ public class TableModel extends AbstractTableModel implements ICardGrid { private int recentSortedColumn; private boolean recentAscending; - public void loadCards(CardsView showCards, SortBy sortBy, boolean piles, - BigCard bigCard, UUID gameId) { + public void loadCards(CardsView showCards, SortBy sortBy, boolean piles, BigCard bigCard, UUID gameId) { this.bigCard = bigCard; this.gameId = gameId; for (CardView card : showCards.values()) {