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

Merge branch 'deck-viewer' into 'master'

Browse Source 
improve "Copy to Clipboard" - merge reprinted cards

See merge request core-developers/forge!215
This commit is contained in:
Michael Kamensky
2018-02-18 07:41:49 +00:00
parent d444e8896c 4e7d338144
commit a392fc43f9
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
View File

@@ -30,6 +30,8 @@ import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FDeckViewer extends FDialog { public class FDeckViewer extends FDialog {
@@ -171,6 +173,8 @@ public class FDeckViewer extends FDialog {
final String nl = System.getProperty("line.separator"); final String nl = System.getProperty("line.separator");
final StringBuilder deckList = new StringBuilder(); final StringBuilder deckList = new StringBuilder();
final String dName = deck.getName(); final String dName = deck.getName();
String cardName;
SortedMap<String, Integer> sectionCards;
deckList.append(dName == null ? "" : dName + nl + nl); deckList.append(dName == null ? "" : dName + nl + nl);
for (DeckSection s : DeckSection.values()){ for (DeckSection s : DeckSection.values()){
@@ -179,12 +183,22 @@ public class FDeckViewer extends FDialog {
continue; continue;
} }
deckList.append(s.toString()).append(": "); deckList.append(s.toString()).append(": ");
sectionCards = new TreeMap<>();
if (s.isSingleCard()) { if (s.isSingleCard()) {
deckList.append(cp.get(0).getName()).append(nl); deckList.append(cp.get(0).getName()).append(nl);
} }
else { else {
deckList.append(nl); deckList.append(nl);
for (final Entry<PaperCard, Integer> ev : cp) { for (final Entry<PaperCard, Integer> 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<String, Integer> ev: sectionCards.entrySet()) {
deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl); deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl);
} }
} }