- Revision
- 794
- Author
- mauro
- Date
- 2008-08-28 06:18:00 -0500 (Thu, 28 Aug 2008)
Log Message
Added use of map list converters to freemarker example.
Modified Paths
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java
- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml
- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl
Diff
Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java (793 => 794)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java 2008-08-28 11:12:33 UTC (rev 793) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java 2008-08-28 11:18:00 UTC (rev 794) @@ -2,6 +2,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; public interface Person { @@ -41,4 +42,8 @@ String getNotes(); + Map<String,List<Integer>> getNumberLists(); + + Map<String,List<String>> getStringLists(); + }
Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java (793 => 794)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java 2008-08-28 11:12:33 UTC (rev 793) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java 2008-08-28 11:18:00 UTC (rev 794) @@ -4,7 +4,9 @@ import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; import org.codehaus.waffle.example.freemarker.model.Person; @@ -27,6 +29,8 @@ private Type type; private Person bestFriend; private List<Person> friends; + private Map<String, List<Integer>> numberLists; + private Map<String, List<String>> stringLists; public PersistablePerson() { id = new Long(0); @@ -45,6 +49,8 @@ type = Type.APPRENTICE; wizard = false; magicNumber = 0.d; + numberLists = new HashMap<String, List<Integer>>(); + stringLists = new HashMap<String, List<String>>(); } public PersistablePerson(Person person) { @@ -64,6 +70,8 @@ this.type = person.getType(); this.wizard = person.isWizard(); this.magicNumber = person.getMagicNumber(); + this.numberLists = person.getNumberLists(); + this.stringLists = person.getStringLists(); } public Long getId() { @@ -198,6 +206,22 @@ this.magicNumber = magicNumber; } + public Map<String, List<Integer>> getNumberLists() { + return numberLists; + } + + public Map<String, List<String>> getStringLists() { + return stringLists; + } + + public void setNumberLists(Map<String, List<Integer>> numberLists) { + this.numberLists = numberLists; + } + + public void setStringLists(Map<String, List<String>> stringLists) { + this.stringLists = stringLists; + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
Modified: trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml (793 => 794)
--- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml 2008-08-28 11:12:33 UTC (rev 793) +++ trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml 2008-08-28 11:18:00 UTC (rev 794) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> <display-name>Waffle Freemarker/Sitemesh Example</display-name> @@ -27,7 +26,15 @@ <param-name>register:NumberListValueConverter</param-name> <param-value>org.codehaus.waffle.bind.converters.NumberListValueConverter</param-value> </context-param> - + <context-param> + <param-name>register:StringListMapValueConverter</param-name> + <param-value>org.codehaus.waffle.bind.converters.StringListMapValueConverter</param-value> + </context-param> + <context-param> + <param-name>register:StringNumberListMapValueConverter</param-name> + <param-value>org.codehaus.waffle.bind.converters.StringNumberListMapValueConverter</param-value> + </context-param> + <!-- Waffle context listener --> <listener> <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
Modified: trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (793 => 794)
--- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-08-28 11:12:33 UTC (rev 793) +++ trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-08-28 11:18:00 UTC (rev 794) @@ -51,18 +51,18 @@ </p> <p class="fieldRow"> <label for="" Friend:</label> + <@w.selectSingle "person.bestFriend" w.asNameableValues(controller.getPeople(),"id","firstName") person.getBestFriend().getId() /> <@w.hidden "person.bestFriend" ""/> - <@w.selectSingle "person.bestFriend" w.asNameableValues(controller.getPeople(),"id","firstName") person.getBestFriend().getId() /> </p> <p class="fieldRow"> <label for="" + <@w.selectMultiple "person.friends" w.asNameableValues(controller.getPeople(),"id","firstName") w.asValues(person.getFriends(),"id") "size='5'"/> <@w.hidden "person.friends" ""/> - <@w.selectMultiple "person.friends" w.asNameableValues(controller.getPeople(),"id","firstName") w.asValues(person.getFriends(),"id") "size='5'"/> </p> <p class="fieldRow"> <label for="" + <@w.selectMultiple "person.skills" controller.getSkills() person.getSkills() "size='5'"/> <@w.hidden "person.skills" ""/> - <@w.selectMultiple "person.skills" controller.getSkills() person.getSkills() "size='5'"/> </p> <p class="fieldRow"> <label for="" @@ -88,6 +88,16 @@ <label for="" <@w.textarea "person.notes" "${person.notes}" /> </p> + <p class="fieldRow"> + <#assign numberLists = w.asProperties(person.getNumberLists()![]) /> + <label for="" Lists:</label> + <@w.textarea "person.numberLists" "${numberLists}" /> + </p> + <p class="fieldRow"> + <#assign stringLists = w.asProperties(person.getStringLists()![]) /> + <label for="" Lists:</label> + <@w.textarea "person.stringLists" "${stringLists}" /> + </p> </fieldset> <div class="controls">
To unsubscribe from this list please visit:
