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

[deckeditor] list view in deck and sideboard, not finished yet.

Browse source
This commit is contained in:
magenoxx 2011-06-17 04:49:43 +04:00
parent 99e368df92
commit a315f09362
4 changed files with 98 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

121
Mage.Client/src/main/java/mage/client/cards/CardsList.java
View file

@ -34,8 +34,21 @@
package mage.client.cards; package mage.client.cards;
import java.awt.Dimension; import mage.Constants.CardType;
import java.awt.Rectangle; import mage.cards.MageCard;
import mage.client.constants.Constants;
import mage.client.constants.Constants.SortBy;
import mage.client.deckeditor.table.TableModel;
import mage.client.plugins.impl.Plugins;
import mage.client.util.*;
import mage.client.util.Event;
import mage.view.CardView;
import mage.view.CardsView;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.beans.Beans; import java.beans.Beans;
@ -43,27 +56,12 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import javax.swing.DefaultComboBoxModel;
import mage.Constants.CardType;
import mage.cards.MageCard;
import mage.client.constants.Constants.SortBy;
import mage.client.plugins.impl.Plugins;
import mage.client.util.CardViewColorComparator;
import mage.client.util.CardViewCostComparator;
import mage.client.util.CardViewNameComparator;
import mage.client.util.CardViewRarityComparator;
import mage.client.util.Config;
import mage.client.util.Event;
import mage.client.util.Listener;
import mage.view.CardView;
import mage.view.CardsView;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class CardsList extends javax.swing.JPanel implements MouseListener { public class CardsList extends javax.swing.JPanel implements MouseListener, ICardGrid {
protected CardEventSource cardEventSource = new CardEventSource(); protected CardEventSource cardEventSource = new CardEventSource();
private Dimension cardDimension; private Dimension cardDimension;
@ -71,24 +69,82 @@ public class CardsList extends javax.swing.JPanel implements MouseListener {
protected BigCard bigCard; protected BigCard bigCard;
protected UUID gameId; protected UUID gameId;
private TableModel mainModel;
private JTable mainTable;
private ICardGrid currentView;
/** Creates new form Cards */ /** Creates new form Cards */
public CardsList() { public CardsList() {
initComponents(); initComponents();
makeTransparent();
//initListViewComponents();
//currentView = mainModel; // by default we have List (table) view
currentView = this;
}
public void makeTransparent() {
jScrollPane1.setOpaque(false); jScrollPane1.setOpaque(false);
cardArea.setOpaque(false); cardArea.setOpaque(false);
jScrollPane1.getViewport().setOpaque(false); jScrollPane1.getViewport().setOpaque(false);
cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values())); cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values()));
} }
public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) { public void initListViewComponents() {
//FIXME: why we remove all cards? for performance it's better to merge changes mainTable = new JTable();
cards = showCards;
this.bigCard = bigCard; mainModel = new TableModel();
this.gameId = gameId; mainModel.addListeners(mainTable);
drawCards((SortBy) cbSortBy.getSelectedItem());
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();
if (mainTable.getSelectedRowCount() > 0) {
int[] n = mainTable.getSelectedRows();
List<Integer> indexes = asList(n);
Collections.reverse(indexes);
for (Integer index : indexes) {
mainModel.doubleClick(index);
}
}
}
}
});
} }
private void drawCards(SortBy sortBy) { public List<Integer> asList(final int[] is) {
List<Integer> list = new ArrayList<Integer>();
for (int i : is) list.add(i);
return list;
}
public void loadCards(CardsView showCards, BigCard bigCard, UUID gameId) {
currentView.loadCards(showCards, null, false, bigCard, gameId);
//loadCards(showCards, null, false, bigCard, gameId);
}
public void drawCards(SortBy sortBy, boolean piles) {
int maxWidth = this.getParent().getWidth(); int maxWidth = this.getParent().getWidth();
int numColumns = maxWidth / Config.dimensions.frameWidth; int numColumns = maxWidth / Config.dimensions.frameWidth;
int curColumn = 0; int curColumn = 0;
@ -194,6 +250,20 @@ public class CardsList extends javax.swing.JPanel implements MouseListener {
public void addCardEventListener(Listener<Event> listener) { public void addCardEventListener(Listener<Event> listener) {
cardEventSource.addListener(listener); cardEventSource.addListener(listener);
//mainModel.addCardEventListener(listener);
}
public void drawCards(SortBy sortBy) {
drawCards(sortBy, false);
}
@Override
public void loadCards(CardsView showCards, SortBy sortBy, boolean piles, BigCard bigCard, UUID gameId) {
//FIXME: why we remove all cards? for performance it's better to merge changes
cards = showCards;
this.bigCard = bigCard;
this.gameId = gameId;
drawCards((SortBy) cbSortBy.getSelectedItem());
} }
public void clearCardEventListeners() { public void clearCardEventListeners() {
@ -292,7 +362,6 @@ public class CardsList extends javax.swing.JPanel implements MouseListener {
drawCards((SortBy) cbSortBy.getSelectedItem()); drawCards((SortBy) cbSortBy.getSelectedItem());
}//GEN-LAST:event_chkPilesActionPerformed }//GEN-LAST:event_chkPilesActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLayeredPane cardArea; private javax.swing.JLayeredPane cardArea;
private javax.swing.JComboBox cbSortBy; private javax.swing.JComboBox cbSortBy;

3
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -115,7 +115,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
if (e.getClickCount() == 2 && !e.isConsumed()) { if (e.getClickCount() == 2 && !e.isConsumed()) {
e.consume(); e.consume();
//TODO: jButtonAddToMainActionPerformed(null); jButtonAddToMainActionPerformed(null);
} }
} }
}); });
@ -210,6 +210,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
} }
public void removeCard(UUID cardId) { public void removeCard(UUID cardId) {
this.mainModel.removeCard(cardId);
this.cardGrid.removeCard(cardId); this.cardGrid.removeCard(cardId);
for (Card card: cards) { for (Card card: cards) {
if (card.getId().equals(cardId)) { if (card.getId().equals(cardId)) {

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

@ -169,7 +169,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) { if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) {
deck.getSideboard().remove(card); deck.getSideboard().remove(card);
cardSelector.removeCard(card.getId()); cardSelector.removeCard(card.getId());
//cardTableSelector.removeCard(card.getId());
} }
if (cardInfoPane instanceof CardInfoPane) { if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card)); ((CardInfoPane)cardInfoPane).setCard(new CardView(card));
@ -188,35 +187,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
} }
); );
} }
/*this.cardTableSelector.getCardsList().clearCardEventListeners();
this.cardTableSelector.getCardsList().addCardEventListener(
new Listener<Event> () {
@Override
public void event(Event event) {
if (event.getEventName().equals("double-click")) {
Card card = cardTableSelector.getCard((UUID) event.getSource());
if (card != null) {
deck.getCards().add(Sets.createCard(card.getClass()));
if (mode == DeckEditorMode.Sideboard || mode == DeckEditorMode.Limited) {
deck.getSideboard().remove(card);
cardSelector.removeCard(card.getId());
cardTableSelector.removeCard(card.getId());
}
if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card));
}
}
} else if (event.getEventName().equals("shift-double-click") && mode == DeckEditorMode.Constructed) {
Card card = cardTableSelector.getCard((UUID) event.getSource());
deck.getSideboard().add(Sets.createCard(card.getClass()));
if (cardInfoPane instanceof CardInfoPane) {
((CardInfoPane)cardInfoPane).setCard(new CardView(card));
}
}
refreshDeck();
}
}
);*/
this.deckArea.clearDeckEventListeners(); this.deckArea.clearDeckEventListeners();
this.deckArea.addDeckEventListener( this.deckArea.addDeckEventListener(
new Listener<Event> () { new Listener<Event> () {

19
Mage/src/mage/cards/decks/Deck.java
View file

@ -105,13 +105,6 @@ public class Deck implements Serializable {
return cards; return cards;
} }
// /**
// * @param cards the cards to set
// */
// public void setCards(List<Card> cards) {
// this.cards = cards;
// }
/** /**
* @return the sideboard * @return the sideboard
*/ */
@ -119,16 +112,4 @@ public class Deck implements Serializable {
return sideboard; return sideboard;
} }
// /**
// * @param sideboard the sideboard to set
// */
// public void setSideboard(Cards sideboard) {
// this.sideboard = sideboard;
// }
// public void setOwnerId(UUID playerId) {
// cards.setOwner(playerId);
// sideboard.setOwner(playerId);
// }
} }