From 50b60c0c196d5b36631d798bcb12a64ad7604ea2 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Wed, 11 May 2011 20:30:03 +0400
Subject: [PATCH] [deck.editor] fixes.

---
 .../deckeditor/table/CardTableSelector.java   | 33 ++++++++++++++-----
 .../client/dialog/NewTournamentDialog.java    |  1 +
 Mage/src/mage/filter/FilterCard.java          |  2 ++
 3 files changed, 28 insertions(+), 8 deletions(-)

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 20351d5c673..074853c6ccf 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
@@ -39,6 +39,7 @@ import mage.client.constants.Constants.SortBy;
 import mage.filter.Filter.ComparisonScope;
 import mage.filter.FilterCard;
 import mage.sets.Sets;
+import mage.sets.worldwake.Explore;
 import mage.view.CardsView;
 
 import javax.swing.*;
@@ -68,6 +69,8 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi
 	    jScrollPane1.setOpaque(false);
 	    jScrollPane1.getViewport().setOpaque(false);
 		cbSortBy.setModel(new DefaultComboBoxModel(SortBy.values()));
+	    cbSortBy.setVisible(false);
+	    chkPiles.setVisible(false);
     }
 
 	public void loadCards(List<Card> sideboard, BigCard bigCard, boolean construct) {
@@ -622,11 +625,13 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi
 	}//GEN-LAST:event_btnClearActionPerformed
 
 	private void btnBoosterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnBoosterActionPerformed
-		List<Card> booster = ((ExpansionSet)this.cbExpansionSet.getSelectedItem()).createBooster();
-		for (Card card: booster) {
-			cards.add(card);
+		if (this.cbExpansionSet.getSelectedItem() instanceof ExpansionSet) {
+			List<Card> booster = ((ExpansionSet)this.cbExpansionSet.getSelectedItem()).createBooster();
+			for (Card card: booster) {
+				cards.add(card);
+			}
+			filterCards();
 		}
-		filterCards();
 	}//GEN-LAST:event_btnBoosterActionPerformed
 
 	private void cbSortByActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbSortByActionPerformed
@@ -642,21 +647,33 @@ public class CardTableSelector extends javax.swing.JPanel implements ComponentLi
 	private void jButtonAddToMainActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
 		if (mainTable.getSelectedRowCount() > 0) {
 			int[] n = mainTable.getSelectedRows();
-			for (int i : n) {
-				mainModel.doubleClick(i);
+			List<Integer> indexes = asList(n);
+			Collections.reverse(indexes);
+			for (Integer index : indexes) {
+				mainModel.doubleClick(index);
 			}
+			mainModel.fireTableDataChanged();
 		}
 	}//GEN-LAST:event_jButton3ActionPerformed
 
 	private void jButtonAddToSideboardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed
 		if (mainTable.getSelectedRowCount() > 0) {
 			int[] n = mainTable.getSelectedRows();
-			for (int i : n) {
-				mainModel.shiftDoubleClick(i);
+			List<Integer> indexes = asList(n);
+			Collections.reverse(indexes);
+			for (Integer index : indexes) {
+				mainModel.shiftDoubleClick(index);
 			}
+			mainModel.fireTableDataChanged();
 		}
 	}//GEN-LAST:event_jButton4ActionPerformed
 
+	public List<Integer> asList(final int[] is) {
+        List<Integer> list = new ArrayList<Integer>();
+		for (int i : is) list.add(i);
+		return list;
+    }
+
 	private void jButtonSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 		String name = jTextFieldSearch.getText().trim();
 		filter.setText(name);
diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
index 4c02217d497..aa6f1623baf 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
@@ -75,6 +75,7 @@ public class NewTournamentDialog extends MageDialog {
 	/** Creates new form NewTournamentDialog */
     public NewTournamentDialog() {
         initComponents();
+	    txtName.setText("Tournament");
     }
 
 	public void showDialog(UUID roomId) {
diff --git a/Mage/src/mage/filter/FilterCard.java b/Mage/src/mage/filter/FilterCard.java
index 45a745a650c..aa4398aa75c 100644
--- a/Mage/src/mage/filter/FilterCard.java
+++ b/Mage/src/mage/filter/FilterCard.java
@@ -41,6 +41,8 @@ import mage.cards.Card;
  */
 public class FilterCard<T extends FilterCard<T>> extends FilterObject<Card, FilterCard<T>> {
 
+	private static final long serialVersionUID = 1L;
+
 	protected List<UUID> ownerId = new ArrayList<UUID>();
 	protected boolean notOwner;
 	protected List<String> expansionSetCode = new ArrayList<String>();