You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/01/17 20:22:30 UTC
svn commit: r612941 - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/
trinidad-impl/src/main/java/org/apache/myfaces/trin...
Author: matzew
Date: Thu Jan 17 11:22:29 2008
New Revision: 612941
URL: http://svn.apache.org/viewvc?rev=612941&view=rev
Log:
TRINIDAD-58
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java Thu Jan 17 11:22:29 2008
@@ -110,6 +110,7 @@
/**
* Coerces an object into a resource URI, calling the view-handler.
+ * @deprecated use toResourceUri
*/
static public String toUri(Object o)
{
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java Thu Jan 17 11:22:29 2008
@@ -649,7 +649,7 @@
{
uri = toString(ret);
}
- return toUri(uri);
+ return toResourceUri(FacesContext.getCurrentInstance(), uri);
}
protected boolean isPerspective(FacesBean bean)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/FrameRenderer.java Thu Jan 17 11:22:29 2008
@@ -68,7 +68,7 @@
@Override
protected final void encodeAll(
FacesContext context,
- RenderingContext arc,
+ RenderingContext rc,
UIComponent component,
FacesBean bean) throws IOException
{
@@ -89,12 +89,12 @@
writer.startElement("a", component);
renderId(context, component);
- String source = toUri(bean.getProperty(_sourceKey));
+ String source = toResourceUri(context, bean.getProperty(_sourceKey));
String shortDesc = getShortDesc(bean);
// =-=Adam Winer: OraLink is obviously not a good style class
// here - substitute something like trh|frame in a PDA css
- renderStyleClass(context, arc, "OraLink");
+ renderStyleClass(context, rc, "OraLink");
renderEncodedActionURI(context, "href", source);
if (shortDesc != null)
writer.writeText(shortDesc, "shortDesc");
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java Thu Jan 17 11:22:29 2008
@@ -295,7 +295,7 @@
protected String getIcon(FacesBean bean)
{
- return toUri(bean.getProperty(_iconKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_iconKey));
}
/**
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameRenderer.java Thu Jan 17 11:22:29 2008
@@ -70,13 +70,13 @@
@Override
protected void renderAllAttributes(
FacesContext context,
- RenderingContext arc,
+ RenderingContext rc,
FacesBean bean) throws IOException
{
ResponseWriter writer = context.getResponseWriter();
- renderShortDescAttribute(context, arc, bean);
- renderStyleAttributes(context, arc, bean);
+ renderShortDescAttribute(context, rc, bean);
+ renderStyleAttributes(context, rc, bean);
writer.writeAttribute("frameborder", "0", null);
writer.writeAttribute("marginwidth",
@@ -87,11 +87,11 @@
"marginHeight");
writer.writeAttribute("noresize", Boolean.TRUE, null);
- String source = toUri(bean.getProperty(_sourceKey));
+ String source = toResourceUri(context, bean.getProperty(_sourceKey));
renderEncodedActionURI(context, "src", source);
- String longDesc = toUri(bean.getProperty(_longDescUrlKey));
+ String longDesc = toResourceUri(context, bean.getProperty(_longDescUrlKey));
renderEncodedActionURI(context, "longdesc", longDesc);
writer.writeAttribute("scrolling",
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java Thu Jan 17 11:22:29 2008
@@ -326,7 +326,7 @@
protected String getIcon(FacesBean bean)
{
- return toUri(bean.getProperty(_iconKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_iconKey));
}
private PropertyKey _iconKey;
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Thu Jan 17 11:22:29 2008
@@ -161,7 +161,7 @@
protected String getDestination(FacesBean bean)
{
- return toUri(bean.getProperty(_destinationKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_destinationKey));
}
protected boolean getDisabled(FacesBean bean)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java Thu Jan 17 11:22:29 2008
@@ -68,7 +68,7 @@
protected String getSource(FacesBean bean)
{
- return toUri(bean.getProperty(_sourceKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_sourceKey));
}
protected String getPlayer(FacesBean bean)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBoxRenderer.java Thu Jan 17 11:22:29 2008
@@ -424,7 +424,7 @@
{
if (_iconKey == null)
return null;
- return toUri(bean.getProperty(_iconKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_iconKey));
}
protected String getContentStyle(FacesBean bean)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java Thu Jan 17 11:22:29 2008
@@ -240,7 +240,7 @@
{
if (_iconKey == null)
return null;
- return toUri(bean.getProperty(_iconKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_iconKey));
}
protected Number getSize(FacesBean bean)
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java Thu Jan 17 11:22:29 2008
@@ -380,7 +380,7 @@
if (_iconKey == null)
return null;
- return toUri(bean.getProperty(_iconKey));
+ return toResourceUri(FacesContext.getCurrentInstance(), bean.getProperty(_iconKey));
}
@Override
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java?rev=612941&r1=612940&r2=612941&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java Thu Jan 17 11:22:29 2008
@@ -66,7 +66,7 @@
String label = CoreRenderer.toString(command.getValue());
- String imageSrc = CoreRenderer.toUri(attrs.get("image"));
+ String imageSrc = CoreRenderer.toResourceUri(context, attrs.get("image"));
writer.startElement("input", component);
String id = component.getClientId(context);
writer.writeAttribute("id", id, "id");