diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java index e97535ff489..a28f4a94202 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java @@ -184,23 +184,18 @@ public class FDeckViewer extends FDialog { } deckList.append(s.toString()).append(": "); sectionCards = new TreeMap<>(); - if (s.isSingleCard()) { - deckList.append(cp.get(0).getName()).append(nl); + deckList.append(nl); + for (final Entry ev : cp) { + cardName = ev.getKey().toString(); + if (sectionCards.containsKey(cardName)) { + sectionCards.put(cardName, (int)sectionCards.get(cardName) + ev.getValue()); + } + else { + sectionCards.put(cardName, ev.getValue()); + } } - else { - deckList.append(nl); - for (final Entry ev : cp) { - cardName = ev.getKey().toString(); - if (sectionCards.containsKey(cardName)) { - sectionCards.put(cardName, (int)sectionCards.get(cardName) + ev.getValue()); - } - else { - sectionCards.put(cardName, ev.getValue()); - } - } - for (final Entry ev: sectionCards.entrySet()) { - deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); - } + for (final Entry ev: sectionCards.entrySet()) { + deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); } deckList.append(nl); } diff --git a/forge-gui-mobile/src/forge/deck/FDeckViewer.java b/forge-gui-mobile/src/forge/deck/FDeckViewer.java index ea38152df37..33d8fdc0895 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckViewer.java +++ b/forge-gui-mobile/src/forge/deck/FDeckViewer.java @@ -93,14 +93,9 @@ public class FDeckViewer extends FScreen { continue; } deckList.append(s.toString()).append(": "); - if (s.isSingleCard()) { - deckList.append(cp.get(0).getName()).append(nl); - } - else { - deckList.append(nl); - for (final Entry ev : cp) { - deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); - } + deckList.append(nl); + for (final Entry ev : cp) { + deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); } deckList.append(nl); }