Author: awiner
Date: Mon Apr 30 15:01:17 2007
New Revision: 533862
URL: http://svn.apache.org/viewvc?view=rev&rev=533862
Log:
Tweak renderkit test framework to handle encodeActionURL() and
encodeResourceURL() better
for null URLs.
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java?view=diff&rev=533862&r1=533861&r2=533862
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
Mon Apr 30 15:01:17 2007
@@ -252,11 +252,22 @@
@Override
public String encodeNamespace(String in) { return in; }
+
@Override
- public String encodeResourceURL(String url) { return
"encoded-resource-url:" + url; }
+ public String encodeResourceURL(String url)
+ {
+ if (url == null)
+ return null;
+ return "encoded-resource-url:" + url;
+ }
@Override
- public String encodeActionURL(String url) { return "encoded-action-url:" +
url; }
+ public String encodeActionURL(String url)
+ {
+ if (url == null)
+ return null;
+ return "encoded-action-url:" + url;
+ }
@SuppressWarnings("unchecked")
@Override