[myfaces-tobago] branch master updated: TOBAGO-1832: Remove support for attic MethodBinding * fixing usage of TabChangeSource2 - has made the unusable

[lo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 0dd0bbd  TOBAGO-1832: Remove support for attic MethodBinding * fixing usage of TabChangeSource2 - has made the <tc:tabChangeListener> unusable
0dd0bbd is described below

commit 0dd0bbda30342d5ed7279ca5adea2d3ac1e104d6
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Mon Dec 4 13:20:46 2017 +0100

    TOBAGO-1832: Remove support for attic MethodBinding
    * fixing usage of TabChangeSource2 - has made the <tc:tabChangeListener> unusable
---
 .../apache/myfaces/tobago/facelets/TabChangeListenerHandler.java    | 6 +++---
 .../org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
index 0c43a32..2f5d566 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
@@ -20,7 +20,7 @@
 package org.apache.myfaces.tobago.facelets;
 
 import org.apache.myfaces.tobago.event.TabChangeListener;
-import org.apache.myfaces.tobago.event.TabChangeSource2;
+import org.apache.myfaces.tobago.event.TabChangeSource;
 import org.apache.myfaces.tobago.event.ValueExpressionTabChangeListener;
 
 import javax.el.ValueExpression;
@@ -60,10 +60,10 @@ public class TabChangeListenerHandler extends TagHandler {
 
   @Override
   public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
-    if (parent instanceof TabChangeSource2) {
+    if (parent instanceof TabChangeSource) {
       // only process if parent was just created
       if (parent.getParent() == null) {
-        final TabChangeSource2 changeSource = (TabChangeSource2) parent;
+        final TabChangeSource changeSource = (TabChangeSource) parent;
         TabChangeListener listener = null;
         ValueExpression valueExpression = null;
         if (binding != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
index 81f44a8..fa1c86c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
@@ -20,7 +20,7 @@
 package org.apache.myfaces.tobago.facelets;
 
 import org.apache.myfaces.tobago.event.TabChangeEvent;
-import org.apache.myfaces.tobago.event.TabChangeSource2;
+import org.apache.myfaces.tobago.event.TabChangeSource;
 
 import javax.faces.view.facelets.FaceletContext;
 import javax.faces.view.facelets.MetaRule;
@@ -34,7 +34,7 @@ public class TabChangeSourceRule extends MetaRule {
 
   @Override
   public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
-    if (metadataTarget.isTargetInstanceOf(TabChangeSource2.class)) {
+    if (metadataTarget.isTargetInstanceOf(TabChangeSource.class)) {
       if ("tabChangeListener".equals(name)) {
         return new TabChangeListenerMapper(attribute);
       }
@@ -52,7 +52,7 @@ public class TabChangeSourceRule extends MetaRule {
 
     @Override
     public void applyMetadata(final FaceletContext ctx, final Object instance) {
-      ((TabChangeSource2) instance).setTabChangeListenerExpression(
+      ((TabChangeSource) instance).setTabChangeListenerExpression(
           attribute.getMethodExpression(ctx, null, TabChangeSourceRule.ACTION_LISTENER));
     }
   }

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].