You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/19 16:28:37 UTC
svn commit: r882176 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
Author: lofwyr
Date: Thu Nov 19 15:28:36 2009
New Revision: 882176
URL: http://svn.apache.org/viewvc?rev=882176&view=rev
Log:
TOBAGO-810: Call of on component populated must be a little different in case of JSP
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java?rev=882176&r1=882175&r2=882176&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java Thu Nov 19 15:28:36 2009
@@ -41,15 +41,13 @@
@Override
public int doEndTag() throws JspException {
- int result = super.doEndTag();
-
UIComponent component = getComponentInstance();
+ int result = super.doEndTag();
if (component instanceof OnComponentPopulated
&& component.getAttributes().get(OnComponentPopulated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
((OnComponentPopulated) component).onComponentPopulated(getFacesContext());
}
-
return result;
}
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java?rev=882176&r1=882175&r2=882176&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java Thu Nov 19 15:28:36 2009
@@ -45,18 +45,16 @@
@Override
public int doEndTag() throws JspException {
- int result = super.doEndTag();
-
UIComponent component = getComponentInstance();
+ int result = super.doEndTag();
if (component instanceof OnComponentPopulated
&& component.getAttributes().get(OnComponentCreated.MARKER) == null) {
component.getAttributes().put(OnComponentPopulated.MARKER, Boolean.TRUE);
((OnComponentPopulated) component).onComponentPopulated(getFacesContext());
}
-
return result;
}
-
+
public String[] splitList(String renderers) {
return StringUtils.split(renderers, ", ");
}