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

minor - wrote more specific generics for CDeckEditorUI.childController

Browse Source 
changed boolean parameter (add 1 or 4 cards) into exact number - that's clearer.
This commit is contained in:
Maxmtg
2013-02-09 23:01:09 +00:00
parent 071979b0bb
commit 17c3d7f64e
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ public enum CDeckEditorUI implements CardContainer {
/** */ /** */
SINGLETON_INSTANCE; SINGLETON_INSTANCE;
private ACEditorBase<?, ?> childController; private ACEditorBase<? extends InventoryItem, ? extends DeckBase> childController;
private CDeckEditorUI() { private CDeckEditorUI() {
} }
@@ -87,7 +87,7 @@ public enum CDeckEditorUI implements CardContainer {
* *
* @param editor0 &emsp; {@link forge.gui.deckeditor.controllers.ACEditorBase}<?, ?> * @param editor0 &emsp; {@link forge.gui.deckeditor.controllers.ACEditorBase}<?, ?>
*/ */
public void setCurrentEditorController(ACEditorBase<?, ?> editor0) { public void setCurrentEditorController(ACEditorBase<? extends InventoryItem, ? extends DeckBase> editor0) {
this.childController = editor0; this.childController = editor0;
updateController(); updateController();
if (childController != null) { if (childController != null) {
@@ -106,13 +106,13 @@ public enum CDeckEditorUI implements CardContainer {
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(); List<InventoryItem> items = table.getSelectedCards();
if (items.isEmpty()) { if (items.isEmpty()) {
return; return;
} }
for (InventoryItem item : items) { for (InventoryItem item : items) {
moveAction.move(item, Math.min(maxQty, table.getCardCount(item))); int toMove = Math.min(maxQty, table.getCardCount(item));
moveAction.move(item, toMove);
} }
CStatistics.SINGLETON_INSTANCE.update(); CStatistics.SINGLETON_INSTANCE.update();
@@ -120,25 +120,26 @@ public enum CDeckEditorUI implements CardContainer {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void addSelectedCards(boolean addFour) { public void addSelectedCards(int number) {
moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableCatalog(), moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableCatalog(),
new _MoveAction() { new _MoveAction() {
@Override @Override
public void move(InventoryItem item, int qty) { public void move(InventoryItem item, int qty) {
childController.addCard(item, qty); childController.addCard(item, qty);
} }
}, addFour ? 4 : 1); }, number);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void removeSelectedCards(boolean removeFour) { public void removeSelectedCards(int number) {
moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableDeck(), moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableDeck(),
new _MoveAction() { new _MoveAction() {
@Override @Override
public void move(InventoryItem item, int qty) { public void move(InventoryItem item, int qty) {
childController.removeCard(item, qty); childController.removeCard(item, qty);
} }
}, removeFour ? 4 : 1); }, number);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -160,28 +161,28 @@ public enum CDeckEditorUI implements CardContainer {
childController.getTableCatalog().getTable().addKeyListener(new KeyAdapter() { childController.getTableCatalog().getTable().addKeyListener(new KeyAdapter() {
@Override @Override
public void keyPressed(final KeyEvent e) { public void keyPressed(final KeyEvent e) {
if (e.getKeyChar() == ' ') { addSelectedCards(false); } if (e.getKeyChar() == ' ') { addSelectedCards(1); }
} }
}); });
childController.getTableDeck().getTable().addKeyListener(new KeyAdapter() { childController.getTableDeck().getTable().addKeyListener(new KeyAdapter() {
@Override @Override
public void keyPressed(final KeyEvent e) { public void keyPressed(final KeyEvent e) {
if (e.getKeyChar() == ' ') { removeSelectedCards(false); } if (e.getKeyChar() == ' ') { removeSelectedCards(1); }
} }
}); });
childController.getTableCatalog().getTable().addMouseListener(new MouseAdapter() { childController.getTableCatalog().getTable().addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(final MouseEvent e) { public void mouseClicked(final MouseEvent e) {
if (e.getClickCount() == 2) { addSelectedCards(false); } if (e.getClickCount() == 2) { addSelectedCards(1); }
} }
}); });
childController.getTableDeck().getTable().addMouseListener(new MouseAdapter() { childController.getTableDeck().getTable().addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(final MouseEvent e) { public void mouseClicked(final MouseEvent e) {
if (e.getClickCount() == 2) { removeSelectedCards(false); } if (e.getClickCount() == 2) { removeSelectedCards(1); }
} }
}); });

4
src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
View File

@@ -86,13 +86,13 @@ public enum CCardCatalog implements ICDoc {
VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setCommand(new Command() { VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setCommand(new Command() {
@Override @Override
public void execute() { public void execute() {
CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(false); CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(1);
} }
}); });
VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setCommand(new Command() { VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setCommand(new Command() {
@Override @Override
public void execute() { public void execute() {
CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(true); CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(4);
} }
}); });

4
src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
View File

@@ -103,12 +103,12 @@ public enum CCurrentDeck implements ICDoc {
((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove()).setCommand(new Command() { ((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove()).setCommand(new Command() {
@Override public void execute() { @Override public void execute() {
CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(false); CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(1);
} }); } });
((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove4()).setCommand(new Command() { ((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove4()).setCommand(new Command() {
@Override public void execute() { @Override public void execute() {
CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(true); CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(4);
} }
}); });
} }

3
src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
View File

@@ -30,6 +30,7 @@ import forge.gui.deckeditor.controllers.ACEditorBase;
import forge.gui.deckeditor.controllers.CEditorLimited; import forge.gui.deckeditor.controllers.CEditorLimited;
import forge.gui.framework.ICDoc; import forge.gui.framework.ICDoc;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.item.InventoryItem;
import forge.item.ItemPool; import forge.item.ItemPool;
import forge.util.IStorage; import forge.util.IStorage;
import forge.util.TextUtil; import forge.util.TextUtil;
@@ -222,7 +223,7 @@ public enum CSubmenuSealed implements ICDoc {
Singletons.getModel().getDecks().getSealed().add(sealed); Singletons.getModel().getDecks().getSealed().add(sealed);
final ACEditorBase<?, T> editor = (ACEditorBase<?, T>) new CEditorLimited( final ACEditorBase<? extends InventoryItem, T> editor = (ACEditorBase<? extends InventoryItem, T>) new CEditorLimited(
Singletons.getModel().getDecks().getSealed()); Singletons.getModel().getDecks().getSealed());
CDeckEditorUI.SINGLETON_INSTANCE.setCurrentEditorController(editor); CDeckEditorUI.SINGLETON_INSTANCE.setCurrentEditorController(editor);