You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/12/21 17:13:28 UTC
svn commit: r892857 - in
/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets:
PopupReferenceHandler.java TabChangeListenerHandler.java
Author: bommel
Date: Mon Dec 21 16:13:28 2009
New Revision: 892857
URL: http://svn.apache.org/viewvc?rev=892857&view=rev
Log:
fix jsf 1.1 build
Modified:
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java?rev=892857&r1=892856&r2=892857&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java Mon Dec 21 16:13:28 2009
@@ -18,15 +18,19 @@
*/
import com.sun.facelets.FaceletContext;
+import com.sun.facelets.el.LegacyValueBinding;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.tag.TagException;
import com.sun.facelets.tag.TagHandler;
import com.sun.facelets.tag.jsf.ComponentSupport;
+import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.event.PopupActionListener;
+import org.apache.myfaces.tobago.util.FacesVersion;
import javax.el.ELException;
+import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
@@ -51,7 +55,17 @@
if (parent instanceof ActionSource) {
if (ComponentSupport.isNew(parent)) {
ActionSource actionSource = (ActionSource) parent;
- actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
+ if (forComponent.isLiteral()) {
+ actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
+ } else {
+ ValueExpression forValueExpression = forComponent.getValueExpression(faceletContext, String.class);
+ if (FacesVersion.supports12()) {
+ FacesUtils.addBindingOrExpressionPopupActionListener(actionSource, forValueExpression);
+ } else {
+ FacesUtils.addBindingOrExpressionPopupActionListener(actionSource,
+ new LegacyValueBinding(forValueExpression));
+ }
+ }
}
} else {
throw new TagException(tag, "Parent is not of type ActionSource, type is: " + parent);
Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java?rev=892857&r1=892856&r2=892857&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java Mon Dec 21 16:13:28 2009
@@ -18,6 +18,7 @@
*/
import com.sun.facelets.FaceletContext;
+import com.sun.facelets.el.LegacyValueBinding;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagAttributeException;
import com.sun.facelets.tag.TagConfig;
@@ -26,6 +27,7 @@
import org.apache.myfaces.tobago.compat.FacesUtils;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.util.FacesVersion;
import javax.el.ELException;
import javax.el.ValueExpression;
@@ -85,8 +87,12 @@
}
}
if (valueExpression != null) {
- FacesUtils.addBindingOrExpressionTabChangeListener(
- changeSource, type.getValue(), valueExpression);
+ if (FacesVersion.supports12()) {
+ FacesUtils.addBindingOrExpressionTabChangeListener(changeSource, type.getValue(), valueExpression);
+ } else {
+ FacesUtils.addBindingOrExpressionTabChangeListener(changeSource, type.getValue(),
+ new LegacyValueBinding(valueExpression));
+ }
} else {
changeSource.addTabChangeListener(listener);
}