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

Fix so removing auto-yields works

Browse Source
This commit is contained in:
drdev
2014-08-17 00:56:49 +00:00
parent 1272b501b4
commit 66ef9b874a
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java
View File

@@ -4,6 +4,7 @@ import java.awt.Dimension;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.AbstractListModel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
@@ -21,7 +22,7 @@ import forge.view.FDialog;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class VAutoYields extends FDialog { public class VAutoYields extends FDialog {
private static final int PADDING = 10; private static final int PADDING = 10;
private static final int BUTTON_WIDTH = 140; private static final int BUTTON_WIDTH = 150;
private static final int BUTTON_HEIGHT = 26; private static final int BUTTON_HEIGHT = 26;
private final FButton btnOk; private final FButton btnOk;
@@ -29,16 +30,17 @@ public class VAutoYields extends FDialog {
private final FList<String> lstAutoYields; private final FList<String> lstAutoYields;
private final FScrollPane listScroller; private final FScrollPane listScroller;
private final FCheckBox chkDisableAll; private final FCheckBox chkDisableAll;
private final List<String> autoYields;
public VAutoYields(final Game game, final Player player) { public VAutoYields(final Game game, final Player player) {
super(true); super(true);
setTitle("Auto-Yields"); setTitle("Auto-Yields");
List<String> autoYields = new ArrayList<String>(); autoYields = new ArrayList<String>();
for (String autoYield : player.getController().getAutoYields()) { for (String autoYield : player.getController().getAutoYields()) {
autoYields.add(autoYield); autoYields.add(autoYield);
} }
lstAutoYields = new FList<String>(autoYields.toArray(new String[]{})); lstAutoYields = new FList<String>(new AutoYieldsListModel());
int x = PADDING; int x = PADDING;
int y = PADDING; int y = PADDING;
@@ -68,13 +70,20 @@ public class VAutoYields extends FDialog {
public void run() { public void run() {
String selected = lstAutoYields.getSelectedValue(); String selected = lstAutoYields.getSelectedValue();
if (selected != null) { if (selected != null) {
lstAutoYields.removeItem(selected); autoYields.remove(selected);
btnRemove.setEnabled(autoYields.size() > 0);
player.getController().setShouldAutoYield(selected, false); player.getController().setShouldAutoYield(selected, false);
VAutoYields.this.revalidate(); VAutoYields.this.revalidate();
lstAutoYields.repaint();
} }
} }
}); });
btnRemove.setEnabled(autoYields.size() > 0); if (autoYields.size() > 0) {
lstAutoYields.setSelectedIndex(0);
}
else {
btnRemove.setEnabled(false);
}
Dimension checkBoxSize = chkDisableAll.getPreferredSize(); Dimension checkBoxSize = chkDisableAll.getPreferredSize();
int listHeight = lstAutoYields.getMinimumSize().height + 2 * PADDING; int listHeight = lstAutoYields.getMinimumSize().height + 2 * PADDING;
@@ -91,6 +100,18 @@ public class VAutoYields extends FDialog {
this.setSize(width, getHeight()); this.setSize(width, getHeight());
} }
private class AutoYieldsListModel extends AbstractListModel<String> {
@Override
public int getSize() {
return autoYields.size();
}
@Override
public String getElementAt(final int index) {
return autoYields.get(index);
}
}
public void showAutoYields() { public void showAutoYields() {
if (lstAutoYields.getCount() > 0) { if (lstAutoYields.getCount() > 0) {
setVisible(true); setVisible(true);

5
forge-gui-desktop/src/main/java/forge/toolbox/FList.java
View File

@@ -97,11 +97,6 @@ public class FList<E> extends SkinnedList<E> {
return getModel().getSize(); return getModel().getSize();
} }
@SuppressWarnings("rawtypes")
public void removeItem(E item) {
((DefaultListModel)getModel()).removeElement(item);
}
private class ComplexCellRenderer<E1> implements ListCellRenderer<E1> { private class ComplexCellRenderer<E1> implements ListCellRenderer<E1> {
private DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer(); private DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer();