# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1252158039 -7200
# Node ID 74d333da17254fe9435fc8db035f0ff5abb26fc6
# Parent  fd7e8e705b753fc1b213090aad70a77c9066b533
Displaying list of moves

diff -r fd7e8e705b75 -r 74d333da1725 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Fri Sep 04 23:02:23 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Sat Sep 05 15:40:39 2009 +0200
@@ -10,6 +10,7 @@
 
       <p>
       <a href="/games/${doc.game.id.@id}">${bundle.RELOAD}</a>
+      <a href="/">${bundle.ROOT}</a>
       </p>
       
       <#if message?? >
@@ -18,6 +19,7 @@
         </p>
       </#if>
 
+      ${bundle.MOVE_WHO} ${doc.game.@currentPlayer}
       <#if user = doc.game.@currentPlayer >
           <form action="/games/${doc.game.id.@id}/move">
               <input type="hidden" name="type" value="fence" readonly="readonly"/>
@@ -66,5 +68,26 @@
           </form>
       </#if>
       <pre>${doc.game.board}</pre>
+
+      <h3>${bundle.MOVES}</h3>
+
+      <table border="0">
+          <thead>
+              <tr>
+                  <th>${bundle.MOVENUMBER}</th>
+                  <th>${doc.game.id.@white}</th>
+                  <th>${doc.game.id.@black}</th>
+              </tr>
+          </thead>
+          <tbody>
+              <#list doc.game.moves.* as item>
+                <#if item.@index?number % 2 = 1>
+                    <tr><td>${item.@index}</td><td>${item.@move}</td>
+                <#else>
+                    <td>${item.@move}</td></tr>
+                </#if>
+              </#list>
+          </tbody>
+      </table>
   </body>
 </html>
\ No newline at end of file
diff -r fd7e8e705b75 -r 74d333da1725 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties	Fri Sep 04 23:02:23 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.properties	Sat Sep 05 15:40:39 2009 +0200
@@ -5,3 +5,7 @@
 V=Vertical
 RELOAD=Reload
 GAME=Game
+MOVENUMBER=#
+MOVES=Moves
+ROOT=Home
+MOVE_WHO=Who's turn
diff -r fd7e8e705b75 -r 74d333da1725 freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties	Fri Sep 04 23:02:23 2009 +0200
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game_cs.properties	Sat Sep 05 15:40:39 2009 +0200
@@ -5,3 +5,7 @@
 V=Vertik\u00E1ln\u011B
 RELOAD=Obnovit
 GAME=Hra
+MOVENUMBER=Tah
+MOVES=Z\u00E1pis
+ROOT=Dom\u016F
+MOVE_WHO=Na tahu je 
\ No newline at end of file
diff -r fd7e8e705b75 -r 74d333da1725 webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java
--- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Fri Sep 04 23:02:23 2009 +0200
+++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/Game.java	Sat Sep 05 15:40:39 2009 +0200
@@ -36,6 +36,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -114,27 +115,44 @@
         return moves;
     }
 
-    private static final class MoveAdapter extends XmlAdapter<String[],List<Move>> {
+    @XmlAccessorType(XmlAccessType.FIELD)
+    private static final class MoveTmp {
+        @XmlAttribute
+        String move;
+        @XmlAttribute
+        int index;
+
+        private MoveTmp() {
+        }
+
+        public MoveTmp(String move, int index) {
+            this.move = move;
+            this.index = index;
+        }
+    }
+
+    private static final class MoveAdapter extends XmlAdapter<MoveTmp[],List<Move>> {
         @Override
-        public List<Move> unmarshal(String[] arr) throws Exception {
+        public List<Move> unmarshal(MoveTmp[] arr) throws Exception {
             List<Move> res = new ArrayList<Move>();
             if (arr != null) {
-                for (String v : arr) {
-                    res.add(Move.valueOf(v));
+                for (MoveTmp v : arr) {
+                    res.add(Move.valueOf(v.move));
                 }
             }
             return res;
         }
 
         @Override
-        public String[] marshal(List<Move> arr) throws Exception {
-            List<String> res = new ArrayList<String>();
+        public MoveTmp[] marshal(List<Move> arr) throws Exception {
+            List<MoveTmp> res = new ArrayList<MoveTmp>();
             if (arr != null) {
+                int index = 0;
                 for (Move m : arr) {
-                    res.add(m.toString());
+                    res.add(new MoveTmp(m.toString(), ++index));
                 }
             }
-            return res.toArray(new String[0]);
+            return res.toArray(new MoveTmp[0]);
         }
     } // end of MoveAdapter