You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/29 11:28:47 UTC
svn commit: r1194849 [3/3] - in /myfaces/core/trunk:
impl/src/main/java/org/apache/myfaces/renderkit/
impl/src/main/java/org/apache/myfaces/renderkit/html/
impl/src/main/java/org/apache/myfaces/resource/
impl/src/main/java/org/apache/myfaces/shared_imp...
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=1194849&r1=1194848&r2=1194849&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 Sat Oct 29 09:28:45 2011
@@ -99,7 +99,8 @@ public abstract class AttachedObjectTarg
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException
{
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
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=1194849&r1=1194848&r2=1194849&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 Sat Oct 29 09:28:45 2011
@@ -236,7 +236,8 @@ public class AttributeHandler extends Ta
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException
{
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
@@ -363,7 +364,8 @@ public class AttributeHandler extends Ta
}
if (_methodSignature != null)
{
- attributeDescriptor.setValue("method-signature", _methodSignature.getValueExpression(ctx, String.class));
+ attributeDescriptor.setValue("method-signature",
+ _methodSignature.getValueExpression(ctx, String.class));
}
if (_type != null)
{
@@ -371,7 +373,8 @@ public class AttributeHandler extends Ta
}
if (_targetAttributeName != null)
{
- attributeDescriptor.setValue("targetAttributeName", _targetAttributeName.getValueExpression(ctx, String.class));
+ attributeDescriptor.setValue("targetAttributeName",
+ _targetAttributeName.getValueExpression(ctx, String.class));
}
// If ProjectStage is Development, The "displayName", "shortDescription",
@@ -408,10 +411,4 @@ public class AttributeHandler extends Ta
{
_cacheable = cacheable;
}
-
- //@Override
- //public FaceletHandler getNextHandler()
- //{
- // return nextHandler;
- //}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorHandler.java Sat Oct 29 09:28:45 2011
@@ -126,7 +126,8 @@ public class ClientBehaviorHandler exten
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException
{
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentDefinitionTagHandler.java Sat Oct 29 09:28:45 2011
@@ -164,7 +164,8 @@ public final class CompositeComponentDef
{
declaredDefaultValues = Collections.emptyList();
}
- _cachedBeanInfo.getBeanDescriptor().setValue(UIComponent.ATTRS_WITH_DECLARED_DEFAULT_VALUES, declaredDefaultValues);
+ _cachedBeanInfo.getBeanDescriptor().
+ setValue(UIComponent.ATTRS_WITH_DECLARED_DEFAULT_VALUES, declaredDefaultValues);
}
finally
{
@@ -208,7 +209,8 @@ public final class CompositeComponentDef
{
declaredDefaultValues = Collections.emptyList();
}
- tempBeanInfo.getBeanDescriptor().setValue(UIComponent.ATTRS_WITH_DECLARED_DEFAULT_VALUES, declaredDefaultValues);
+ tempBeanInfo.getBeanDescriptor().
+ setValue(UIComponent.ATTRS_WITH_DECLARED_DEFAULT_VALUES, declaredDefaultValues);
}
finally
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java Sat Oct 29 09:28:45 2011
@@ -97,9 +97,12 @@ public class CompositeComponentResourceT
{
super(config);
_resource = resource;
- _facetHandlers = TagHandlerUtils.findNextByType(nextHandler, javax.faces.view.facelets.FacetHandler.class, InsertFacetHandler.class);
- _componentHandlers = TagHandlerUtils.findNextByType(nextHandler, javax.faces.view.facelets.ComponentHandler.class,
- InsertChildrenHandler.class, InsertHandler.class, DecorateHandler.class, IncludeHandler.class, TextHandler.class);
+ _facetHandlers = TagHandlerUtils.findNextByType(nextHandler, javax.faces.view.facelets.FacetHandler.class,
+ InsertFacetHandler.class);
+ _componentHandlers = TagHandlerUtils.findNextByType(nextHandler,
+ javax.faces.view.facelets.ComponentHandler.class,
+ InsertChildrenHandler.class, InsertHandler.class,
+ DecorateHandler.class, IncludeHandler.class, TextHandler.class);
}
public UIComponent createComponent(FaceletContext ctx)
@@ -136,7 +139,8 @@ public class CompositeComponentResourceT
if (attrValue == null)
{
- throw new TagException(this.tag, "Attribute '" + propertyDescriptor.getName() + "' is required");
+ throw new TagException(this.tag, "Attribute '" + propertyDescriptor.getName()
+ + "' is required");
}
}
}
@@ -207,14 +211,16 @@ public class CompositeComponentResourceT
{
if (handler instanceof javax.faces.view.facelets.FacetHandler)
{
- if (insertFacetList == null || !insertFacetList.contains( ((javax.faces.view.facelets.FacetHandler)handler).getFacetName(ctx)))
+ if (insertFacetList == null ||
+ !insertFacetList.contains(((javax.faces.view.facelets.FacetHandler)handler).getFacetName(ctx)))
{
handler.apply(ctx, c);
}
}
else if (handler instanceof InsertFacetHandler)
{
- if (insertFacetList == null || !insertFacetList.contains( ((InsertFacetHandler)handler).getFacetName(ctx)))
+ if (insertFacetList == null ||
+ !insertFacetList.contains( ((InsertFacetHandler)handler).getFacetName(ctx)))
{
handler.apply(ctx, c);
}
@@ -241,14 +247,16 @@ public class CompositeComponentResourceT
{
if (nextHandler instanceof javax.faces.view.facelets.FacetHandler)
{
- if (insertFacetList == null || !insertFacetList.contains( ((javax.faces.view.facelets.FacetHandler)nextHandler).getFacetName(ctx)) )
+ if (insertFacetList == null ||
+ !insertFacetList.contains(((javax.faces.view.facelets.FacetHandler)nextHandler).getFacetName(ctx)))
{
nextHandler.apply(ctx, c);
}
}
else if (nextHandler instanceof InsertFacetHandler)
{
- if (insertFacetList == null || !insertFacetList.contains( ((InsertFacetHandler)nextHandler).getFacetName(ctx)) )
+ if (insertFacetList == null ||
+ !insertFacetList.contains( ((InsertFacetHandler)nextHandler).getFacetName(ctx)) )
{
nextHandler.apply(ctx, c);
}
@@ -301,7 +309,8 @@ public class CompositeComponentResourceT
}
if (facetsRequiredNotFound != null && !facetsRequiredNotFound.isEmpty())
{
- throw new TagException(getTag(), "The following facets are required by the component: "+facetsRequiredNotFound);
+ throw new TagException(getTag(), "The following facets are required by the component: "
+ + facetsRequiredNotFound);
}
}
}
@@ -311,7 +320,8 @@ public class CompositeComponentResourceT
{
FaceletCompositionContext mctx = FaceletCompositionContext.getCurrentInstance(faceletContext);
AbstractFaceletContext actx = (AbstractFaceletContext) faceletContext;
- UIPanel compositeFacetPanel = (UIPanel) compositeComponentBase.getFacets().get(UIComponent.COMPOSITE_FACET_NAME);
+ UIPanel compositeFacetPanel
+ = (UIPanel) compositeComponentBase.getFacets().get(UIComponent.COMPOSITE_FACET_NAME);
if (compositeFacetPanel == null)
{
compositeFacetPanel = (UIPanel)
@@ -526,9 +536,11 @@ public class CompositeComponentResourceT
if (insertFacetPropertyDescriptorMap != null && insertFacetPropertyDescriptorMap.containsKey(name))
{
- ValueExpression requiredExpr = (ValueExpression) insertFacetPropertyDescriptorMap.get(name).getValue("required");
+ ValueExpression requiredExpr
+ = (ValueExpression) insertFacetPropertyDescriptorMap.get(name).getValue("required");
- if (requiredExpr != null && Boolean.TRUE.equals(requiredExpr.getValue(ctx.getFacesContext().getELContext())))
+ if (requiredExpr != null &&
+ Boolean.TRUE.equals(requiredExpr.getValue(ctx.getFacesContext().getELContext())))
{
//Insert facet associated is required, but it was not applied.
throw new TagException(this.tag, "Cannot find facet with name '"+name+"' in composite component");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java Sat Oct 29 09:28:45 2011
@@ -52,8 +52,6 @@ final class CompositeComponentRule exten
public void applyMetadata(FaceletContext ctx, Object instance)
{
((UIComponent) instance).getAttributes().put(_name, _value);
- //((UIComponent) instance).setValueExpression(_name,
- // ctx.getFacesContext().getApplication().getExpressionFactory().createValueExpression(_value, Object.class));
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java Sat Oct 29 09:28:45 2011
@@ -251,17 +251,17 @@ public class CompositeResourceLibrary im
String resourceName = localName + defaultSuffix;
if (handles(resourceName))
{
- Resource compositeComponentResourceWrapped = resourceHandler.createResource(resourceName, libraryName);
+ Resource compositeComponentResourceWrapped
+ = resourceHandler.createResource(resourceName, libraryName);
if (compositeComponentResourceWrapped != null)
{
- Resource compositeComponentResource = new CompositeResouceWrapper(compositeComponentResourceWrapped);
- if (compositeComponentResource != null)
- {
- ComponentConfig componentConfig = new ComponentConfigWrapper(tag,
- "javax.faces.NamingContainer", null);
-
- return new CompositeComponentResourceTagHandler(componentConfig, compositeComponentResource);
- }
+ Resource compositeComponentResource
+ = new CompositeResouceWrapper(compositeComponentResourceWrapped);
+ ComponentConfig componentConfig = new ComponentConfigWrapper(tag,
+ "javax.faces.NamingContainer", null);
+
+ return new CompositeComponentResourceTagHandler(componentConfig,
+ compositeComponentResource);
}
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceLoader.java Sat Oct 29 09:28:45 2011
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.shared.resource;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Comparator;