Author: bleny Date: 2011-02-10 14:20:14 +0000 (Thu, 10 Feb 2011) New Revision: 1003 Log: remove use of deprecated tapestry API Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-10 12:18:02 UTC (rev 1002) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-10 14:20:14 UTC (rev 1003) @@ -57,7 +57,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.EventContext; import org.apache.tapestry5.OptionModel; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.Import; @@ -72,18 +71,17 @@ import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.internal.OptionModelImpl; -import org.apache.tapestry5.internal.SelectModelImpl; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.ioc.services.TypeCoercer; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.util.EnumSelectModel; import org.slf4j.Logger; import java.io.FileNotFoundException; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; /** @@ -123,7 +121,7 @@ private TypeCoercer typeCoercer; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; @Property private String companyId; @@ -176,7 +174,7 @@ void afterRender() { // Prototype class for UserSelect (manual usage because of specific style on options) - renderSupport.addScript("new AdminUserSelect();"); + javaScriptSupport.addScript("new AdminUserSelect();"); } /**************************** IMPORTS (ADMIN) *******************************/ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2011-02-10 12:18:02 UTC (rev 1002) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2011-02-10 14:20:14 UTC (rev 1003) @@ -31,7 +31,6 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.tapestry5.Asset2; import org.apache.tapestry5.PersistenceConstants; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Path; @@ -39,6 +38,7 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.slf4j.Logger; import java.text.DateFormat; @@ -87,11 +87,11 @@ private Asset2 fckconf; @Inject - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; public void afterRender() { // Hide news details depends on an anchor named 'details' in news.getContent() - renderSupport.addScript("newsHider = new NewsHider();\n" + + javaScriptSupport.addScript("newsHider = new NewsHider();\n" + "newsHider.hideAllNewsDetails();"); }