You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ni...@apache.org on 2006/11/10 13:59:22 UTC
svn commit: r473327 -
/struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java
Author: niallp
Date: Fri Nov 10 04:59:22 2006
New Revision: 473327
URL: http://svn.apache.org/viewvc?view=rev&rev=473327
Log:
Fix STR-2966 - s:commandLink doesn't work with Apache Trinidad or Oracle's ADF Faces - patch from Matthias Wessendorf
Modified:
struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java
Modified: struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java?view=diff&rev=473327&r1=473326&r2=473327
==============================================================================
--- struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java (original)
+++ struts/struts1/trunk/faces/src/main/java/org/apache/struts/faces/renderer/CommandLinkRenderer.java Fri Nov 10 04:59:22 2006
@@ -215,11 +215,13 @@
}
// Set up variables we will need
- UIForm form = null;
+ UIComponent form = null;
UIComponent parent = component.getParent();
while (parent != null) {
- if (parent instanceof UIForm) {
- form = (UIForm) parent;
+ if (parent instanceof UIForm ||
+ "org.apache.myfaces.trinidad.Form".equals(parent.getFamily()) ||
+ "oracle.adf.Form".equals(parent.getFamily())) {
+ form = parent;
break;
}
parent = parent.getParent();