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

Proxies will be sorted alphabetically

Browse Source
This commit is contained in:
jendave
2011-10-23 07:09:41 +00:00
parent 1b3445f325
commit bf66922158
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/deck/DeckManager.java
View File

@@ -17,6 +17,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.TreeMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -661,23 +662,24 @@ public class DeckManager {
//System.out.println(card.getSets().get(card.getSets().size() - 1).URL); //System.out.println(card.getSets().get(card.getSets().size() - 1).URL);
list.add(card.getSets().get(card.getSets().size() - 1).URL); list.add(card.getSets().get(card.getSets().size() - 1).URL);
} }
List<String> nameList = new ArrayList<String>(); /* List<String> nameList = new ArrayList<String>();
for (Card card : d.getMain().toForgeCardList().toArray()) { for (Card card : d.getMain().toForgeCardList().toArray()) {
//System.out.println(card.getSets().get(card.getSets().size() - 1).URL); //System.out.println(card.getSets().get(card.getSets().size() - 1).URL);
nameList.add(card.getName()); nameList.add(card.getName());
} }*/
Map<String, Integer> map = new HashMap<String, Integer>(); TreeMap<String, Integer> map = new TreeMap<String, Integer>();
for (Entry<CardPrinted, Integer> entry : d.getMain().getOrderedList()) { for (Entry<CardPrinted, Integer> entry : d.getMain().getOrderedList()) {
map.put(entry.getKey().getName(), entry.getValue()); map.put(entry.getKey().getName(), entry.getValue());
System.out.println(entry.getValue() + " " + entry.getKey().getName()); //System.out.println(entry.getValue() + " " + entry.getKey().getName());
} }
root.put("urls", list); root.put("urls", list);
root.put("cardBorder", cardBorder); root.put("cardBorder", cardBorder);
root.put("height", height); root.put("height", height);
root.put("width", width); root.put("width", width);
root.put("cardlistWidth", width - 11); root.put("cardlistWidth", width - 11);
root.put("nameList", nameList); //root.put("nameList", nameList);
root.put("cardList", map); root.put("cardList", map);
/* Merge data-model with template */ /* Merge data-model with template */