From 0b2267a102852c58683fdbd7fa0cc65e220b9320 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 22 Oct 2011 07:43:30 +0000 Subject: [PATCH] Proxy generator creates cardlist. Still needs work. --- src/main/java/forge/deck/DeckManager.java | 11 +++++++++-- src/main/resources/proxy-template.ftl | 11 ++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java index 9140fb48a60..8e2c61b10e7 100644 --- a/src/main/java/forge/deck/DeckManager.java +++ b/src/main/java/forge/deck/DeckManager.java @@ -658,13 +658,20 @@ public class DeckManager { root.put("title", d.getName()); List list = new ArrayList(); for (Card card : d.getMain().toForgeCardList().toArray()) { - //System.out.println(card.getSets().get(0).URL); - list.add(card.getSets().get(0).URL); + //System.out.println(card.getSets().get(card.getSets().size() - 1).URL); + list.add(card.getSets().get(card.getSets().size() - 1).URL); + } + List nameList = new ArrayList(); + for (Card card : d.getMain().toForgeCardList().toArray()) { + //System.out.println(card.getSets().get(card.getSets().size() - 1).URL); + nameList.add(card.getName()); } root.put("urls", list); root.put("cardBorder", cardBorder); root.put("height", height); root.put("width", width); + root.put("cardlistWidth", width - 11); + root.put("nameList", nameList); /* Merge data-model with template */ //StringWriter sw = new StringWriter(); diff --git a/src/main/resources/proxy-template.ftl b/src/main/resources/proxy-template.ftl index 6ea6d330867..813536fda48 100644 --- a/src/main/resources/proxy-template.ftl +++ b/src/main/resources/proxy-template.ftl @@ -18,13 +18,14 @@
- +
- -
- + + <#list nameList as name> + ${name}
+
- \ No newline at end of file +