incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r489217 - in /incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib: ForEachTag.java listener/ReturnActionListenerTag.java
Date Wed, 20 Dec 2006 22:52:32 GMT
Author: awiner
Date: Wed Dec 20 14:52:32 2006
New Revision: 489217

URL: http://svn.apache.org/viewvc?view=rev&rev=489217
Log:
Fix af:returnActionListener for JSF 1.2 compatibility
Fix some unnecessary imports in ForEachTag

Modified:
    incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
    incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java

Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java?view=diff&rev=489217&r1=489216&r2=489217
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
(original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ForEachTag.java
Wed Dec 20 14:52:32 2006
@@ -29,7 +29,6 @@
 import javax.el.VariableMapper;
 
 import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentTag;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
@@ -37,9 +36,6 @@
 import javax.servlet.jsp.jstl.core.IndexedValueExpression;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidad.webapp.ELContextTag;
-import org.apache.myfaces.trinidadinternal.el.Tokenizer;
-import org.apache.myfaces.trinidadinternal.el.Tokenizer.Token;
 
 //JSTL Core Library - <c:forEach> Tag
 //===================================

Modified: incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java?view=diff&rev=489217&r1=489216&r2=489217
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
(original)
+++ incubator/adffaces/branches/faces-1_2-061214/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListenerTag.java
Wed Dec 20 14:52:32 2006
@@ -26,7 +26,7 @@
 import javax.faces.component.ActionSource;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentTag;
+import javax.faces.webapp.UIComponentClassicTagBase;
 
 import org.apache.myfaces.trinidad.webapp.ELContextTag;
 
@@ -45,7 +45,8 @@
   @Override
   public int doStartTag() throws JspException
   {
-    UIComponentTag tag = UIComponentTag.getParentUIComponentTag(pageContext);
+    UIComponentClassicTagBase tag =
+      UIComponentClassicTagBase.getParentUIComponentClassicTagBase(pageContext);
     if (tag == null)
     {
       throw new JspException(



Mime
View raw message