change SealedBoosterModel in Generic

src/main/java/org/magic/gui/abstracts/GenericTableModel.java

@@ -48,8 +48,6 @@ public void addHiddenColumns(int i) {
 	}
 
 
-
-
 	public int[] defaultHiddenColumns()
 	{
 		return hiddenColumns;

src/main/java/org/magic/gui/components/deck/SealedDeckBuildPanel.java

@@ -338,14 +338,14 @@ private void analyseDeck(boolean b) {
 
 	private void addBooster() {
 		model.add((MTGEdition) cboEditions.getSelectedItem(), EnumExtra.DRAFT, 6);
-		btnOpen.setEnabled(!model.getSealedPack().isEmpty());
+		btnOpen.setEnabled(!model.isEmpty());
 	}
 
 	protected void open() {
 		deck = new MTGDeck();
 
-		deck.setDescription("Sealed from " + model.getSealedPack());
-		deck.setName("sealed from " + model.getSealedPack().size() + " boosters");
+		deck.setDescription("Sealed from " + model.getItems());
+		deck.setName("sealed from " + model.getRowCount() + " boosters");
 
 		panelOpenedBooster.clear();
 		panelDeck.removeAll();
@@ -381,7 +381,7 @@ protected void done() {
 			@Override
 			protected Void doInBackground() throws Exception {
 				column=0;
-				for (var entry : model.getSealedPack()) {
+				for (var entry : model.getItems()) {
 					try {
 							var b = getEnabledPlugin(MTGCardsProvider.class).generateBooster(entry.getLeft(),entry.getMiddle(), entry.getRight());
 							for(var booster : b)

src/main/java/org/magic/gui/models/SealedBoosterTableModel.java

@@ -2,30 +2,23 @@
 
 import static org.magic.services.tools.MTG.capitalize;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.table.DefaultTableModel;
-
 import org.apache.commons.lang3.tuple.MutableTriple;
 import org.magic.api.beans.MTGEdition;
 import org.magic.api.beans.enums.EnumExtra;
-public class SealedBoosterTableModel extends DefaultTableModel {
+import org.magic.gui.abstracts.GenericTableModel;
+public class SealedBoosterTableModel extends GenericTableModel<MutableTriple<MTGEdition, EnumExtra, Integer>> {
 	/**
 	 *
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private List<MutableTriple<MTGEdition, EnumExtra, Integer>> pack;
-
 	private static final String[] COLUMNS = { "EDITION","TYPE","QTY" };
 
-	public List<MutableTriple<MTGEdition, EnumExtra, Integer>> getSealedPack() {
-		return pack;
-	}
 
 	public void add(MTGEdition ed, EnumExtra extra, Integer qty) {
-		pack.add(MutableTriple.of(ed, extra,qty));
+		items.add(MutableTriple.of(ed, extra,qty));
 		fireTableDataChanged();
 	}
 
@@ -47,11 +40,11 @@ public Class<?> getColumnClass(int columnIndex) {
 	public Object getValueAt(int row, int column) {
 		switch (column) {
 		case 0:
-			return pack.get(row).getLeft();
+			return items.get(row).getLeft();
 		case 1:
-			return pack.get(row).getMiddle();
+			return items.get(row).getMiddle();
 		case 2:
-			return pack.get(row).getRight();
+			return items.get(row).getRight();
 		default:
 			return "";
 		}
@@ -60,36 +53,27 @@ public Object getValueAt(int row, int column) {
 	@Override
 	public void setValueAt(Object aValue, int row, int column) {
 		if (column == 0)
-			pack.get(row).setLeft((MTGEdition) aValue);
+			items.get(row).setLeft((MTGEdition) aValue);
 		else if (column == 1)
-			pack.get(row).setMiddle(EnumExtra.valueOf(aValue.toString().toUpperCase()));
+			items.get(row).setMiddle(EnumExtra.valueOf(aValue.toString().toUpperCase()));
 		else if (column == 2) {
 			if (Integer.parseInt(aValue.toString()) > 0) {
-				pack.get(row).setRight(Integer.parseInt(aValue.toString()));
+				items.get(row).setRight(Integer.parseInt(aValue.toString()));
 			} else {
-				pack.remove(row);
+				items.remove(row);
 			}
 		}
 
 		fireTableDataChanged();
 	}
 
-	public void clear() {
-		pack.clear();
-
-	}
-
 	@Override
 	public String getColumnName(int column) {
 		return capitalize(COLUMNS[column]);
 	}
 
-	public SealedBoosterTableModel() {
-		pack = new ArrayList<>();
-	}
-
 	public void init(List<MutableTriple<MTGEdition, EnumExtra, Integer>> lines) {
-		this.pack = lines;
+		items = lines;
 		fireTableDataChanged();
 	}
 
@@ -103,12 +87,5 @@ public int getColumnCount() {
 		return COLUMNS.length;
 	}
 
-	@Override
-	public int getRowCount() {
-		if (pack == null)
-			return 0;
-		else
-			return pack.size();
-	}
 
 }