external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved infiniteSupply flag into table model, since remove (that should not remove cards when supply is endless) method belongs to model layer.

Browse Source
This commit is contained in:
Maxmtg
2013-02-08 00:16:30 +00:00
parent 41b78e7313
commit 7b23e9d868
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
View File

@@ -104,8 +104,7 @@ public enum CDeckEditorUI implements CardContainer {
void move(InventoryItem item, int qty);
}
private void moveSelectedCards(
EditorTableView<InventoryItem> table, _MoveAction moveAction, int maxQty) {
private void moveSelectedCards(EditorTableView<InventoryItem> table, _MoveAction moveAction, int maxQty) {
List<InventoryItem> items = table.getSelectedCards();
if (items.isEmpty()) {

23
src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java
View File

@@ -68,6 +68,17 @@ public final class EditorTableModel<T extends InventoryItem> extends AbstractTab
private final JTable table;
private final CascadeManager cascadeManager = new CascadeManager();
private final int maxSortDepth = 3;
private boolean infiniteSupply;
/**
* @return the infiniteSupply
*/
public boolean isInfinite() {
return infiniteSupply;
}
/**
* Instantiates a new table model, using a JTable,
@@ -140,6 +151,9 @@ public final class EditorTableModel<T extends InventoryItem> extends AbstractTab
* @param card0 &emsp; {@link forge.Card} object
*/
public void removeCard(final T card0, int qty) {
if ( isInfinite() )
return;
final boolean wasThere = this.data.count(card0) > 0;
if (wasThere) {
this.data.remove(card0, qty);
@@ -392,4 +406,13 @@ public final class EditorTableModel<T extends InventoryItem> extends AbstractTab
(Entry<InventoryItem, Integer>) o1, (Entry<InventoryItem, Integer>) o2);
}
}
/**
* TODO: Write javadoc for this method.
* @param infinite
*/
public void setInfinite(boolean infinite) {
// TODO Auto-generated method stub
this.infiniteSupply = infinite;
}
} // CardTableModel

16
src/main/java/forge/gui/deckeditor/tables/EditorTableView.java
View File

@@ -67,7 +67,6 @@ public final class EditorTableView<T extends InventoryItem> {
private boolean alwaysNonUnique = false;
private final Class<T> genericType;
private boolean infiniteSupply;
/**
*
@@ -279,8 +278,7 @@ public final class EditorTableView<T extends InventoryItem> {
* an Iterable<InventoryITem>
*/
public void setDeck(final Iterable<InventoryItem> cards) {
this.setDeckImpl(ItemPool.createFrom(cards, this.genericType));
this.infiniteSupply = false;
this.setDeckImpl(ItemPool.createFrom(cards, this.genericType), false);
}
/**
@@ -290,8 +288,8 @@ public final class EditorTableView<T extends InventoryItem> {
* an ItemPoolView
*/
public void setDeck(final ItemPoolView<T> poolView, boolean infinite) {
this.setDeckImpl(ItemPool.createFrom(poolView, this.genericType));
this.infiniteSupply = infinite;
this.setDeckImpl(ItemPool.createFrom(poolView, this.genericType), infinite);
}
public void setDeck(final ItemPoolView<T> poolView) {
this.setDeck(poolView, false);
@@ -303,8 +301,7 @@ public final class EditorTableView<T extends InventoryItem> {
* the new deck
*/
public void setDeck(final ItemPool<T> pool) {
this.setDeckImpl(pool);
this.infiniteSupply = false;
this.setDeckImpl(pool, false);
}
/**
@@ -314,10 +311,11 @@ public final class EditorTableView<T extends InventoryItem> {
* @param thePool
* an ItemPool
*/
protected void setDeckImpl(final ItemPool<T> thePool) {
protected void setDeckImpl(final ItemPool<T> thePool, boolean infinite) {
this.model.clear();
this.pool = thePool;
this.model.addCards(this.pool);
this.model.setInfinite(infinite);
this.updateView(true);
}
@@ -432,7 +430,7 @@ public final class EditorTableView<T extends InventoryItem> {
}
public int getCardCount(final T card) {
return infiniteSupply ? Integer.MAX_VALUE : this.pool.count(card);
return model.isInfinite() ? Integer.MAX_VALUE : this.pool.count(card);
}
public Predicate<T> getFilter() {