Renamed TableModel to less confusing EditorTableModel.

.gitattributes

@@ -12703,14 +12703,14 @@ src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java -text
 src/main/java/forge/gui/deckeditor/controllers/CStatistics.java -text
 src/main/java/forge/gui/deckeditor/package-info.java -text
 src/main/java/forge/gui/deckeditor/tables/DeckController.java -text
+src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java svneol=native#text/plain
+src/main/java/forge/gui/deckeditor/tables/EditorTableView.java -text
 src/main/java/forge/gui/deckeditor/tables/IntegerRenderer.java -text
 src/main/java/forge/gui/deckeditor/tables/ManaCostRenderer.java -text
 src/main/java/forge/gui/deckeditor/tables/SColumnUtil.java -text
 src/main/java/forge/gui/deckeditor/tables/TableColumnInfo.java -text
-src/main/java/forge/gui/deckeditor/tables/TableModel.java svneol=native#text/plain
 src/main/java/forge/gui/deckeditor/tables/TableSorter.java svneol=native#text/plain
 src/main/java/forge/gui/deckeditor/tables/TableSorterCascade.java -text
-src/main/java/forge/gui/deckeditor/tables/TableView.java -text
 src/main/java/forge/gui/deckeditor/tables/package-info.java -text
 src/main/java/forge/gui/deckeditor/views/ITableContainer.java -text
 src/main/java/forge/gui/deckeditor/views/VAllDecks.java -text

src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java

@@ -19,7 +19,7 @@ package forge.gui.deckeditor.controllers;
 
 import forge.deck.DeckBase;
 import forge.gui.deckeditor.tables.DeckController;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.item.InventoryItem;
 
 /**
@@ -39,8 +39,8 @@ import forge.item.InventoryItem;
  */
 public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends DeckBase> {
 
-    private TableView<TItem> tblCatalog;
+    private EditorTableView<TItem> tblCatalog;
-    private TableView<TItem> tblDeck;
+    private EditorTableView<TItem> tblDeck;
     /** 
      * Operation to add one of selected card to current deck.
      */
@@ -77,38 +77,38 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
     public abstract void init();
 
     /**
-     * Gets the TableView holding the cards in the current deck.
+     * Gets the EditorTableView holding the cards in the current deck.
      * 
-     * @return {@link forge.gui.deckeditor.tables.TableView}
+     * @return {@link forge.gui.deckeditor.tables.EditorTableView}
      */
-    public TableView<TItem> getTableDeck() {
+    public EditorTableView<TItem> getTableDeck() {
         return this.tblDeck;
     }
 
     /**
-     * Sets the TableView holding the cards in the current deck.
+     * Sets the EditorTableView holding the cards in the current deck.
      * 
-     * @param table0 &emsp; {@link forge.gui.deckeditor.tables.TableView}
+     * @param table0 &emsp; {@link forge.gui.deckeditor.tables.EditorTableView}
      */
-    public void setTableDeck(final TableView<TItem> table0) {
+    public void setTableDeck(final EditorTableView<TItem> table0) {
         this.tblDeck = table0;
     }
 
     /**
-     * Gets the TableView holding the cards in the current catalog.
+     * Gets the EditorTableView holding the cards in the current catalog.
      * 
-     * @return {@link forge.gui.deckeditor.tables.TableView}
+     * @return {@link forge.gui.deckeditor.tables.EditorTableView}
      */
-    public TableView<TItem> getTableCatalog() {
+    public EditorTableView<TItem> getTableCatalog() {
         return this.tblCatalog;
     }
 
     /**
-     * Sets the TableView holding the cards in the current catalog.
+     * Sets the EditorTableView holding the cards in the current catalog.
      * 
-     * @param table0 &emsp; {@link forge.gui.deckeditor.tables.TableView}
+     * @param table0 &emsp; {@link forge.gui.deckeditor.tables.EditorTableView}
      */
-    public void setTableCatalog(final TableView<TItem> table0) {
+    public void setTableCatalog(final EditorTableView<TItem> table0) {
         this.tblCatalog = table0;
     }
 

src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java

@@ -29,7 +29,7 @@ import forge.gui.deckeditor.tables.DeckController;
 import forge.gui.deckeditor.tables.SColumnUtil;
 import forge.gui.deckeditor.tables.SColumnUtil.ColumnName;
 import forge.gui.deckeditor.tables.TableColumnInfo;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.framework.EDocID;
@@ -61,8 +61,8 @@ public final class CEditorConstructed extends ACEditorBase<CardPrinted, Deck> {
     public CEditorConstructed() {
         super();
 
-        final TableView<CardPrinted> tblCatalog = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblCatalog = new EditorTableView<CardPrinted>(true, CardPrinted.class);
-        final TableView<CardPrinted> tblDeck = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblDeck = new EditorTableView<CardPrinted>(true, CardPrinted.class);
 
         VCardCatalog.SINGLETON_INSTANCE.setTableView(tblCatalog.getTable());
         VCurrentDeck.SINGLETON_INSTANCE.setTableView(tblDeck.getTable());

src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java

@@ -28,7 +28,7 @@ import forge.game.limited.BoosterDraft;
 import forge.game.limited.IBoosterDraft;
 import forge.gui.deckeditor.tables.DeckController;
 import forge.gui.deckeditor.tables.SColumnUtil;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.gui.deckeditor.views.VAllDecks;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
@@ -65,8 +65,8 @@ public class CEditorDraftingProcess extends ACEditorBase<CardPrinted, DeckGroup>
      * Updates the deck editor UI as necessary draft selection mode.
      */
     public CEditorDraftingProcess() {
-        final TableView<CardPrinted> tblCatalog = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblCatalog = new EditorTableView<CardPrinted>(true, CardPrinted.class);
-        final TableView<CardPrinted> tblDeck = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblDeck = new EditorTableView<CardPrinted>(true, CardPrinted.class);
 
         VCardCatalog.SINGLETON_INSTANCE.setTableView(tblCatalog.getTable());
         VCurrentDeck.SINGLETON_INSTANCE.setTableView(tblDeck.getTable());

src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java

@@ -25,7 +25,7 @@ import forge.gui.deckeditor.SEditorIO;
 import forge.gui.deckeditor.SEditorUtil;
 import forge.gui.deckeditor.tables.DeckController;
 import forge.gui.deckeditor.tables.SColumnUtil;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.home.sanctioned.CSubmenuDraft;
@@ -54,8 +54,8 @@ public final class CEditorLimited extends ACEditorBase<CardPrinted, DeckGroup> {
      * @param deckMap0 &emsp; {@link forge.deck.DeckGroup}<{@link forge.util.IStorage}>
      */
     public CEditorLimited(final IStorage<DeckGroup> deckMap0) {
-        final TableView<CardPrinted> tblCatalog = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblCatalog = new EditorTableView<CardPrinted>(true, CardPrinted.class);
-        final TableView<CardPrinted> tblDeck = new TableView<CardPrinted>(true, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblDeck = new EditorTableView<CardPrinted>(true, CardPrinted.class);
 
         VCardCatalog.SINGLETON_INSTANCE.setTableView(tblCatalog.getTable());
         VCurrentDeck.SINGLETON_INSTANCE.setTableView(tblDeck.getTable());

src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java

@@ -34,7 +34,7 @@ import forge.gui.deckeditor.tables.DeckController;
 import forge.gui.deckeditor.tables.SColumnUtil;
 import forge.gui.deckeditor.tables.SColumnUtil.ColumnName;
 import forge.gui.deckeditor.tables.TableColumnInfo;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.home.quest.CSubmenuQuestDecks;
@@ -88,8 +88,8 @@ public final class CEditorQuest extends ACEditorBase<CardPrinted, Deck> {
     public CEditorQuest(final QuestController questData0) {
         this.questData = questData0;
 
-        final TableView<CardPrinted> tblCatalog = new TableView<CardPrinted>(false, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblCatalog = new EditorTableView<CardPrinted>(false, CardPrinted.class);
-        final TableView<CardPrinted> tblDeck = new TableView<CardPrinted>(false, CardPrinted.class);
+        final EditorTableView<CardPrinted> tblDeck = new EditorTableView<CardPrinted>(false, CardPrinted.class);
 
         VCardCatalog.SINGLETON_INSTANCE.setTableView(tblCatalog.getTable());
         VCurrentDeck.SINGLETON_INSTANCE.setTableView(tblDeck.getTable());

src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java

@@ -38,7 +38,7 @@ import forge.gui.deckeditor.tables.DeckController;
 import forge.gui.deckeditor.tables.SColumnUtil;
 import forge.gui.deckeditor.tables.SColumnUtil.ColumnName;
 import forge.gui.deckeditor.tables.TableColumnInfo;
-import forge.gui.deckeditor.tables.TableView;
+import forge.gui.deckeditor.tables.EditorTableView;
 import forge.gui.deckeditor.views.VCardCatalog;
 import forge.gui.deckeditor.views.VCurrentDeck;
 import forge.gui.home.quest.CSubmenuQuestDecks;
@@ -96,8 +96,8 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
     public CEditorQuestCardShop(final QuestController qd) {
         this.questData = qd;
 
-        final TableView<InventoryItem> tblCatalog = new TableView<InventoryItem>(false, InventoryItem.class);
+        final EditorTableView<InventoryItem> tblCatalog = new EditorTableView<InventoryItem>(false, InventoryItem.class);
-        final TableView<InventoryItem> tblDeck = new TableView<InventoryItem>(false, InventoryItem.class);
+        final EditorTableView<InventoryItem> tblDeck = new EditorTableView<InventoryItem>(false, InventoryItem.class);
 
         VCardCatalog.SINGLETON_INSTANCE.setTableView(tblCatalog.getTable());
         VCurrentDeck.SINGLETON_INSTANCE.setTableView(tblDeck.getTable());

src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java

@@ -52,7 +52,7 @@ import forge.item.ItemPoolView;
 
 /**
  * <p>
- * TableModel class.
+ * EditorTableModel class.
  * </p>
  * 
  * @param <T>
@@ -61,7 +61,7 @@ import forge.item.ItemPoolView;
  * @version $Id$
  */
 @SuppressWarnings("serial")
-public final class TableModel<T extends InventoryItem> extends AbstractTableModel {
+public final class EditorTableModel<T extends InventoryItem> extends AbstractTableModel {
     private final ItemPool<T> data;
     private final JTable table;
     private final CascadeManager cascadeManager = new CascadeManager();
@@ -74,7 +74,7 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
      * @param table0 &emsp; {@link javax.swing.JTable}
      * @param class0 &emsp; Generic type <T>
      */
-    public TableModel(final JTable table0, final Class<T> class0) {
+    public EditorTableModel(final JTable table0, final Class<T> class0) {
         this.table = table0;
         this.data = new ItemPool<T>(class0);
     }
@@ -213,7 +213,7 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
 
             @Override
             public void valueChanged(final ListSelectionEvent arg0) {
-                TableModel.this.showSelectedCard(table);
+                EditorTableModel.this.showSelectedCard(table);
             }
         });
         table.addFocusListener(new FocusListener() {
@@ -224,7 +224,7 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
 
             @Override
             public void focusGained(final FocusEvent e) {
-                TableModel.this.showSelectedCard(table);
+                EditorTableModel.this.showSelectedCard(table);
             }
         });
 
@@ -252,7 +252,7 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
 
     @SuppressWarnings("unchecked")
     private void headerClicked(final MouseEvent e) {
-        final TableColumnModel colModel = TableModel.this.table.getColumnModel();
+        final TableColumnModel colModel = EditorTableModel.this.table.getColumnModel();
         final int columnModelIndex = colModel.getColumnIndexAtX(e.getX());
         final int modelIndex = colModel.getColumn(columnModelIndex).getModelIndex();
 
@@ -263,11 +263,11 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
         // This will invert if needed
         // 2012/07/21 - Changed from modelIndex to ColumnModelIndex due to a crash
         // Crash was: Hide 2 columns, then search by last column.
-        TableModel.this.cascadeManager.add((TableColumnInfo<T>) this.table.getColumnModel().getColumn(columnModelIndex));
+        EditorTableModel.this.cascadeManager.add((TableColumnInfo<T>) this.table.getColumnModel().getColumn(columnModelIndex));
-        TableModel.this.refreshSort();
+        EditorTableModel.this.refreshSort();
-        TableModel.this.table.tableChanged(new TableModelEvent(TableModel.this));
+        EditorTableModel.this.table.tableChanged(new TableModelEvent(EditorTableModel.this));
-        TableModel.this.table.repaint();
+        EditorTableModel.this.table.repaint();
-        TableModel.this.table.setRowSelectionInterval(0, 0);
+        EditorTableModel.this.table.setRowSelectionInterval(0, 0);
         SEditorIO.savePreferences();
     }
 
@@ -384,7 +384,7 @@ public final class TableModel<T extends InventoryItem> extends AbstractTableMode
         @SuppressWarnings("unchecked")
         @Override
         public int compare(Entry<T, Integer> o1, Entry<T, Integer> o2) {
-            return TableModel.this.cascadeManager.getSorter().compare(
+            return EditorTableModel.this.cascadeManager.getSorter().compare(
                     (Entry<InventoryItem, Integer>) o1, (Entry<InventoryItem, Integer>) o2);
         }
     }

src/main/java/forge/gui/deckeditor/tables/EditorTableView.java

@@ -46,9 +46,9 @@ import forge.util.Aggregates;
  * @param <T>
  *            the generic type
  */
-public final class TableView<T extends InventoryItem> {
+public final class EditorTableView<T extends InventoryItem> {
     private ItemPool<T> pool;
-    private TableModel<T> model;
+    private EditorTableModel<T> model;
     private final JTable table = new JTable();
     private Predicate<T> filter = null;
     private boolean wantUnique = false;
@@ -71,7 +71,7 @@ public final class TableView<T extends InventoryItem> {
      * @param cls
      *            the cls
      */
-    public TableView(final Class<T> cls) {
+    public EditorTableView(final Class<T> cls) {
         this(false, cls);
     }
 
@@ -82,7 +82,7 @@ public final class TableView<T extends InventoryItem> {
      *            a boolean
      * @param type0 the cls
      */
-    public TableView(final boolean forceUnique, final Class<T> type0) {
+    public EditorTableView(final boolean forceUnique, final Class<T> type0) {
         this.genericType = type0;
         this.wantUnique = forceUnique;
 
@@ -93,7 +93,7 @@ public final class TableView<T extends InventoryItem> {
     }
 
     /**
-     * Applies a TableModel and a model listener to this instance's JTable.
+     * Applies a EditorTableModel and a model listener to this instance's JTable.
      * 
      * @param view0 &emsp; the {@link javax.gui.deckeditor.views.ITableCOntainer}
      * @param cols0 &emsp; List<TableColumnInfo<InventoryItem>> of additional columns for this
@@ -107,7 +107,7 @@ public final class TableView<T extends InventoryItem> {
             if (item.isShowing()) { colmodel.addColumn(item); }
         }
 
-        this.model = new TableModel<T>(this.table, this.genericType);
+        this.model = new EditorTableModel<T>(this.table, this.genericType);
         this.model.addListeners();
         this.table.setModel(this.model);
         this.table.setColumnModel(colmodel);
@@ -121,7 +121,7 @@ public final class TableView<T extends InventoryItem> {
         this.model.addTableModelListener(new TableModelListener() {
             @Override
             public void tableChanged(final TableModelEvent ev) {
-                final List<T> deck = TableView.this.model.getCards().toFlatList();
+                final List<T> deck = EditorTableView.this.model.getCards().toFlatList();
                 final ItemPool<T> filteredDeck = new ItemPool<T>((Class<T>) CardPrinted.class);
 
                 // Filter out non-card items (booster packs, etc.)

src/main/java/forge/gui/deckeditor/tables/SColumnUtil.java

@@ -278,7 +278,7 @@ public final class SColumnUtil {
 
     /**
      * Convenience method to get a column's index in the model (that is,
-     * in the TableModel, NOT the TableColumnModel).
+     * in the EditorTableModel, NOT the TableColumnModel).
      * 
      * @param id0   {@link forge.gui.deckeditor.SEditorUtil.CatalogColumnName}
      * @return int

src/main/java/forge/gui/deckeditor/tables/TableColumnInfo.java

@@ -26,7 +26,7 @@ import com.google.common.base.Function;
 import forge.gui.deckeditor.tables.SColumnUtil.SortState;
 
 /**
- * A column object in a TableModel in the card editor.
+ * A column object in a EditorTableModel in the card editor.
  * Requires a sorting function and a display function
  * (to extract information as appropriate for table row data).
  * 
@@ -84,7 +84,7 @@ public class TableColumnInfo<T> extends TableColumn {
         this.sortPriority = position0;
     }
 
-    /** @return {@link forge.gui.deckeditor.tables.TableModel.SortState} */
+    /** @return {@link forge.gui.deckeditor.tables.EditorTableModel.SortState} */
     public SortState getSortState() {
         return this.sortstate;
     }

src/main/java/forge/gui/deckeditor/views/ITableContainer.java

@@ -5,7 +5,7 @@ import javax.swing.JTable;
 
 /** 
  * Dictates methods needed for a class to act as a container for
- * a TableView deck editing component.
+ * a EditorTableView deck editing component.
  * 
  * <br><br><i>(I at beginning of class name denotes an interface.)</i>
  * 
@@ -15,7 +15,7 @@ public interface ITableContainer {
      * Sets the table used for displaying cards in this
      * deck editor container.
      * 
-     * @param tbl0 &emsp; {@link forge.gui.deckeditor.tables.TableView}
+     * @param tbl0 &emsp; {@link forge.gui.deckeditor.tables.EditorTableView}
      */
      void setTableView(JTable tbl0);