From 33e3d92c9a32ee1a884c63f281f7ad34de29f556 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 01:49:52 +0000
Subject: [PATCH] some small tweaks for CardList operations in some source
 files

---
 src/forge/ReadBoosterPack.java      | 4 ++--
 src/forge/ReadDraftBoosterPack.java | 2 +-
 src/forge/TableModel.java           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/ReadBoosterPack.java b/src/forge/ReadBoosterPack.java
index f1aa0bc770d..3f6b97b5268 100644
--- a/src/forge/ReadBoosterPack.java
+++ b/src/forge/ReadBoosterPack.java
@@ -86,7 +86,7 @@ public class ReadBoosterPack implements NewConstants {
     public CardList getBoosterPack5() {
         CardList list = new CardList();
         for(int i = 0; i < 5; i++)
-            list.addAll(getBoosterPack().toArray());
+            list.addAll(getBoosterPack());
         
         for(int i = 0; i < 20; i++) {
             list.add(AllZone.CardFactory.getCard("Forest", AllZone.HumanPlayer));
@@ -360,7 +360,7 @@ public class ReadBoosterPack
   {
     CardList list = new CardList();
     for(int i = 0; i < 5; i++)
-      list.addAll(getBoosterPack().toArray());
+      list.addAll(getBoosterPack());
 
     for(int i = 0; i < 40; i++)
     {
diff --git a/src/forge/ReadDraftBoosterPack.java b/src/forge/ReadDraftBoosterPack.java
index 4b08317b30d..214e711af63 100644
--- a/src/forge/ReadDraftBoosterPack.java
+++ b/src/forge/ReadDraftBoosterPack.java
@@ -53,7 +53,7 @@ public class ReadDraftBoosterPack implements NewConstants {
     public CardList getBoosterPack5() {
         CardList list = new CardList();
         for(int i = 0; i < 5; i++)
-            list.addAll(getBoosterPack().toArray());
+            list.addAll(getBoosterPack());
         
         for(int i = 0; i < 20; i++) {
             list.add(AllZone.CardFactory.getCard("Forest", AllZone.HumanPlayer));
diff --git a/src/forge/TableModel.java b/src/forge/TableModel.java
index aa744618421..9529cfec649 100644
--- a/src/forge/TableModel.java
+++ b/src/forge/TableModel.java
@@ -114,8 +114,8 @@ class TableModel extends AbstractTableModel {
     
     public CardList getCards() {
         CardList all = new CardList();
-        all.addAll(dataCopies.toArray());
-        all.addAll(dataNoCopies.toArray());
+        all.addAll(dataCopies);
+        all.addAll(dataNoCopies);
         
         return all;
     }
@@ -313,8 +313,8 @@ class TableModel extends AbstractTableModel {
         recentAscending = ascending;
         
         CardList all = new CardList();
-        all.addAll(dataNoCopies.toArray());
-        all.addAll(dataCopies.toArray());
+        all.addAll(dataNoCopies);
+        all.addAll(dataCopies);
         
         TableSorter sorter = new TableSorter(all, column, ascending, true);
         Card[] array = all.toArray();