You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2006/02/17 03:06:27 UTC
svn commit: r378410 - in /myfaces:
commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java
Author: svieujot
Date: Thu Feb 16 18:06:24 2006
New Revision: 378410
URL: http://svn.apache.org/viewcvs?rev=378410&view=rev
Log:
Fix potential Cast Exception in HtmlLinkRenderer.
Modified:
myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java
Modified: myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java?rev=378410&r1=378409&r2=378410&view=diff
==============================================================================
--- myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/commons/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java Thu Feb 16 18:06:24 2006
@@ -145,7 +145,19 @@
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException
{
super.encodeEnd(facesContext, component); //check for NP
- renderLinkEnd(facesContext, component);
+
+ if (component instanceof UICommand)
+ {
+ renderCommandLinkEnd(facesContext, component);
+ }
+ else if (component instanceof UIOutput)
+ {
+ renderOutputLinkEnd(facesContext, component);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unsupported component class " + component.getClass().getName());
+ }
}
protected void renderCommandLinkStart(FacesContext facesContext, UIComponent component,
@@ -446,7 +458,7 @@
}
- protected void renderLinkEnd(FacesContext facesContext, UIComponent component)
+ protected void renderOutputLinkEnd(FacesContext facesContext, UIComponent component)
throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
@@ -455,5 +467,10 @@
writer.endElement(HTML.ANCHOR_ELEM);
}
+ protected void renderCommandLinkEnd(FacesContext facesContext, UIComponent component)
+ throws IOException
+ {
+ renderOutputLinkEnd(facesContext, component);
+ }
}
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java?rev=378410&r1=378409&r2=378410&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java Thu Feb 16 18:06:24 2006
@@ -86,13 +86,13 @@
}
}
- protected void renderLinkEnd(FacesContext facesContext, UIComponent component) throws IOException
+ protected void renderCommandLinkEnd(FacesContext facesContext, UIComponent component) throws IOException
{
//if link is disabled we render the nested components without the anchor
if (UserRoleUtils.isEnabledOnUserRole(component) &&
!((HtmlCommandLink) component).isDisabled() )
{
- super.renderLinkEnd(facesContext, component);
+ super.renderCommandLinkEnd(facesContext, component);
}
else
{