Author: bbrossaud Date: 2010-07-02 14:52:43 +0200 (Fri, 02 Jul 2010) New Revision: 178 Url: http://nuiton.org/repositories/revision/wikitty/178 Log: addition encoding Modified: trunk/wikitty-ui-zk/pom.xml trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java trunk/wikitty-ui-zk/src/main/webapp/index.zul trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-01 13:16:31 UTC (rev 177) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-02 12:52:43 UTC (rev 178) @@ -29,20 +29,17 @@ <version>${project.version}</version> </dependency> - <!-- TEST --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <!-- TEST --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> - <!-- COMPILE --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java =================================================================== --- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-07-01 13:16:31 UTC (rev 177) +++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java 2010-07-02 12:52:43 UTC (rev 178) @@ -55,9 +55,8 @@ } public List<Wikitty> retrieveWikittiesByKeyword(String search) { - List<Wikitty> wikitties = new ArrayList<Wikitty>(); Criteria criteria = Search.query().keyword(search).criteria(); - wikitties = _service.findAllByCriteria(null, criteria).cast(null, _service).getAll(); + List<Wikitty> wikitties = _service.findAllByCriteria(null, criteria).cast(null, _service).getAll(); return wikitties; } Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-07-01 13:16:31 UTC (rev 177) +++ trunk/wikitty-ui-zk/src/main/webapp/index.zul 2010-07-02 12:52:43 UTC (rev 178) @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?page title="log" contentType="text/html;charset=UTF-8"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> <window id="win" title="Win" width="800px" border="normal" apply="org.nuiton.wikitty.ui.LoginController"> Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul =================================================================== --- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-07-01 13:16:31 UTC (rev 177) +++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul 2010-07-02 12:52:43 UTC (rev 178) @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?page title="wikitties" contentType="text/html;charset=UTF-8"?> <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit"?> <window id="win" title="wikitty" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController">