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

Fix how net deck categories appear in select list

Browse Source
This commit is contained in:
drdev
2015-01-25 05:12:54 +00:00
parent 30fbe55ac3
commit 6d5416c175
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
View File

@@ -224,7 +224,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
private void updateNetDecks() { private void updateNetDecks() {
if (netDeckCategory != null) { if (netDeckCategory != null) {
decksComboBox.setText(netDeckCategory.toString()); decksComboBox.setText(netDeckCategory.getDeckType());
} }
lstDecks.setAllowMultipleSelections(false); lstDecks.setAllowMultipleSelections(false);
@@ -309,7 +309,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
if (category == null) { if (category == null) {
decksComboBox.setDeckType(selectedDeckType); //restore old selection if user cancels decksComboBox.setDeckType(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == DeckType.NET_DECK && netDeckCategory != null) { if (selectedDeckType == DeckType.NET_DECK && netDeckCategory != null) {
decksComboBox.setText(netDeckCategory.toString()); decksComboBox.setText(netDeckCategory.getDeckType());
} }
return; return;
} }

4
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -292,7 +292,7 @@ public class FDeckChooser extends FScreen {
if (category == null) { if (category == null) {
cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == DeckType.NET_DECK && netDeckCategory != null) { if (selectedDeckType == DeckType.NET_DECK && netDeckCategory != null) {
cmbDeckTypes.setText(netDeckCategory.toString()); cmbDeckTypes.setText(netDeckCategory.getDeckType());
} }
return; return;
} }
@@ -528,7 +528,7 @@ public class FDeckChooser extends FScreen {
private void updateNetDecks() { private void updateNetDecks() {
if (netDeckCategory != null) { if (netDeckCategory != null) {
cmbDeckTypes.setText(netDeckCategory.toString()); cmbDeckTypes.setText(netDeckCategory.getDeckType());
} }
lstDecks.setSelectionSupport(1, 1); lstDecks.setSelectionSupport(1, 1);

8
forge-gui/src/main/java/forge/deck/NetDeckCategory.java
View File

@@ -120,8 +120,12 @@ public class NetDeckCategory extends StorageBase<Deck> {
return url; return url;
} }
@Override public String getDeckType() {
public String toString() {
return "Net Decks - " + name; return "Net Decks - " + name;
} }
@Override
public String toString() {
return name;
}
} }