You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/08/28 03:46:23 UTC
svn commit: r808728 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite:
AttachedObjectTargetHandler.java AttributeHandler.java FacetHandler.java
InterfaceDescriptorCreator.java InterfaceHandler.java
Author: lu4242
Date: Fri Aug 28 01:46:23 2009
New Revision: 808728
URL: http://svn.apache.org/viewvc?rev=808728&view=rev
Log:
MYFACES-2340 Get "basic-ezcomp" 2.0 sample working (nested attributes should not be taken into account)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceDescriptorCreator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java?rev=808728&r1=808727&r2=808728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetHandler.java Fri Aug 28 01:46:23 2009
@@ -26,7 +26,6 @@
import javax.faces.component.UIComponent;
import javax.faces.view.AttachedObjectTarget;
import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.FaceletHandler;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
@@ -153,11 +152,11 @@
_cacheable = cacheable;
}
- @Override
- public FaceletHandler getNextHandler()
- {
- return nextHandler;
- }
+ //@Override
+ //public FaceletHandler getNextHandler()
+ //{
+ // return nextHandler;
+ //}
/**
* Create a new AttachedObjectTarget instance to be added on the
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java?rev=808728&r1=808727&r2=808728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttributeHandler.java Fri Aug 28 01:46:23 2009
@@ -25,7 +25,6 @@
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.FaceletHandler;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagException;
@@ -293,9 +292,9 @@
_cacheable = cacheable;
}
- @Override
- public FaceletHandler getNextHandler()
- {
- return nextHandler;
- }
+ //@Override
+ //public FaceletHandler getNextHandler()
+ //{
+ // return nextHandler;
+ //}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java?rev=808728&r1=808727&r2=808728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/FacetHandler.java Fri Aug 28 01:46:23 2009
@@ -27,7 +27,6 @@
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.FaceletHandler;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagException;
@@ -300,9 +299,9 @@
_cacheable = cacheable;
}
- @Override
- public FaceletHandler getNextHandler()
- {
- return nextHandler;
- }
+ //@Override
+ //public FaceletHandler getNextHandler()
+ //{
+ // return nextHandler;
+ //}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceDescriptorCreator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceDescriptorCreator.java?rev=808728&r1=808727&r2=808728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceDescriptorCreator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceDescriptorCreator.java Fri Aug 28 01:46:23 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.view.facelets.tag.composite;
-import javax.faces.view.facelets.FaceletHandler;
/**
* Used to identify tag handlers used on composite:interface for
@@ -33,5 +32,5 @@
void setCacheable(boolean cacheable);
- FaceletHandler getNextHandler();
+ //FaceletHandler getNextHandler();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java?rev=808728&r1=808727&r2=808728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java Fri Aug 28 01:46:23 2009
@@ -21,14 +21,11 @@
import java.beans.BeanDescriptor;
import java.beans.BeanInfo;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import javax.faces.application.Resource;
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.FaceletHandler;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
@@ -36,6 +33,7 @@
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletAttribute;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
import org.apache.myfaces.view.facelets.FaceletViewDeclarationLanguage;
+import org.apache.myfaces.view.facelets.tag.TagHandlerUtils;
/**
* @author Leonardo Uribe (latest modification by $Author$)
@@ -129,7 +127,8 @@
_cacheable = true;
// Check if all attributes are cacheable. If that so, we can cache this
// instance, otherwise not.
- Collection<InterfaceDescriptorCreator> attrHandlerList = findNextByType(nextHandler);
+ Collection<InterfaceDescriptorCreator> attrHandlerList =
+ TagHandlerUtils.findNextByType( nextHandler, InterfaceDescriptorCreator.class);
for (InterfaceDescriptorCreator handler : attrHandlerList)
{
if (!handler.isCacheable())
@@ -257,6 +256,7 @@
return beanInfo;
}
+ /*
private static Collection<InterfaceDescriptorCreator> findNextByType(FaceletHandler nextHandler)
{
List<InterfaceDescriptorCreator> found = new ArrayList<InterfaceDescriptorCreator>();
@@ -282,4 +282,5 @@
return found;
}
+ */
}