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 2014/08/22 14:03:37 UTC
svn commit: r1619768 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
Author: lofwyr
Date: Fri Aug 22 12:03:37 2014
New Revision: 1619768
URL: http://svn.apache.org/r1619768
Log:
Merged from trunk
TOBAGO-1417 - TabGroup: tabChangeListener is never invoked [from revision 1617310]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (contents, props changed)
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1617310
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java?rev=1619768&r1=1619767&r2=1619768&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java Fri Aug 22 12:03:37 2014
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.ComponentTypes;
import org.apache.myfaces.tobago.component.Facets;
@@ -37,6 +38,7 @@ import org.apache.myfaces.tobago.util.Cr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.component.ActionSource2;
import javax.faces.component.UIComponent;
@@ -216,12 +218,12 @@ public abstract class AbstractUITabGroup
if (facesEvent instanceof TabChangeEvent && facesEvent.getComponent() == this) {
final TabChangeEvent event = (TabChangeEvent) facesEvent;
+ final MethodExpression methodExpression = getTabChangeListenerExpression();
+ if (methodExpression != null) {
+ FacesUtilsEL.invokeMethodExpression(FacesContext.getCurrentInstance(), methodExpression, facesEvent);
+ }
+
// switched off, because this is already called in super.broadcast()
-// final TabChangeListener[] tabChangeListeners = getTabChangeListeners();
-// for (TabChangeListener listener : tabChangeListeners) {
-// listener.processTabChange(event);
-// }
-//
// final ActionListener[] actionListeners = getActionListeners();
// for (ActionListener listener : actionListeners) {
// listener.processAction(event);
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java:r1617310