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 12:02:36 UTC
svn commit: r1194861 [1/2] - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: resource/ view/
view/facelets/ view/facelets/impl/ view/facelets/tag/
view/facelets/tag/composite/ view/facelets/tag/jsf/
view/facelets/tag/jsf/core/ view/facele...
Author: struberg
Date: Sat Oct 29 10:02:34 2011
New Revision: 1194861
URL: http://svn.apache.org/viewvc?rev=1194861&view=rev
Log:
MYFACES-3368 fix lines > 120 chars
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java Sat Oct 29 10:02:34 2011
@@ -53,7 +53,8 @@ public class InternalClassLoaderResource
* Define the mode used for jsf.js file:
* <ul>
* <li>normal : contains everything, including jsf-i18n.js, jsf-experimental.js and jsf-legacy.js</li>
- * <li>minimal-modern : is the core jsf with a baseline of ie9+, without jsf-i18n.js, jsf-experimental.js and jsf-legacy.js</li>
+ * <li>minimal-modern : is the core jsf with a baseline of ie9+,
+ * without jsf-i18n.js, jsf-experimental.js and jsf-legacy.js</li>
* <li>minimal: which is the same with a baseline of ie6, without jsf-i18n.js, jsf-experimental.js</li>
* </ul>
* <p>If org.apache.myfaces.USE_MULTIPLE_JS_FILES_FOR_JSF_UNCOMPRESSED_JS param is set to true and project stage
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Sat Oct 29 10:02:34 2011
@@ -141,15 +141,16 @@ public class ViewDeclarationLanguageFact
*/
private void logWarningIfLegacyFaceletViewHandlerIsPresent(FacesContext context)
{
- boolean facelets1ViewHandlerPresent = context.getApplication().getViewHandler().getClass().getName().equals(FACELETS_1_VIEW_HANDLER);
+ boolean facelets1ViewHandlerPresent
+ = context.getApplication().getViewHandler().getClass().getName().equals(FACELETS_1_VIEW_HANDLER);
if (facelets1ViewHandlerPresent)
{
if (LOGGER.isLoggable(Level.WARNING))
{
- LOGGER.log(Level.WARNING, "Your faces-config.xml contains the " + FACELETS_1_VIEW_HANDLER + " class." +
- "\nYou need to remove it since you have not disabled the \"new\" Facelets-2 version with the " + PARAM_DISABLE_JSF_FACELET +
- " context parameter");
+ LOGGER.log(Level.WARNING, "Your faces-config.xml contains the " + FACELETS_1_VIEW_HANDLER + " class."
+ + "\nYou need to remove it since you have not disabled the \"new\" Facelets-2 version with the "
+ + PARAM_DISABLE_JSF_FACELET + " context parameter");
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementStrategy.java Sat Oct 29 10:02:34 2011
@@ -643,7 +643,8 @@ public class DefaultFaceletsStateManagem
{
if (_saveStateWithVisitTreeOnPSS == null)
{
- _saveStateWithVisitTreeOnPSS = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
+ _saveStateWithVisitTreeOnPSS
+ = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
SAVE_STATE_WITH_VISIT_TREE_ON_PSS, Boolean.TRUE);
}
return Boolean.TRUE.equals(_saveStateWithVisitTreeOnPSS);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/TemplateContext.java Sat Oct 29 10:02:34 2011
@@ -56,15 +56,17 @@ public abstract class TemplateContext
* @param client
* @see TemplateClient
*/
- public abstract void pushClient(final AbstractFaceletContext actx, final AbstractFacelet owner, final TemplateClient client);
+ public abstract void pushClient(final AbstractFaceletContext actx, final AbstractFacelet owner,
+ final TemplateClient client);
/**
* Pop the last added extended TemplateClient
- * @param client
+ * @param actx
*/
public abstract TemplateManager popExtendedClient(final AbstractFaceletContext actx);
- public abstract void extendClient(final AbstractFaceletContext actx, final AbstractFacelet owner, final TemplateClient client);
+ public abstract void extendClient(final AbstractFaceletContext actx, final AbstractFacelet owner,
+ final TemplateClient client);
/**
* This method will walk through the TemplateClient stack to resolve and
@@ -114,7 +116,6 @@ public abstract class TemplateContext
* Check if no parameters are set.
*
* @since 2.0.8
- * @param key
* @return
*/
public abstract boolean isParameterEmpty();
@@ -122,7 +123,6 @@ public abstract class TemplateContext
/**
*
* @since 2.0.8
- * @param key
* @return
*/
public abstract Map<String, ValueExpression> getParameterMap();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java Sat Oct 29 10:02:34 2011
@@ -460,7 +460,8 @@ public final class DefaultFaceletFactory
f = this._createCompositeComponentMetadataFacelet(url);
if (_refreshPeriod != NO_CACHE_DELAY)
{
- Map<String, DefaultFacelet> newLoc = new HashMap<String, DefaultFacelet>(_compositeComponentMetadataFacelets);
+ Map<String, DefaultFacelet> newLoc
+ = new HashMap<String, DefaultFacelet>(_compositeComponentMetadataFacelets);
newLoc.put(key, f);
_compositeComponentMetadataFacelets = newLoc;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagAttributeImpl.java Sat Oct 29 10:02:34 2011
@@ -207,7 +207,8 @@ public final class TagAttributeImpl exte
//volatile reads are atomic, so take the tuple to later comparison.
Object[] localCachedExpression = cachedExpression;
- if (actx.isAllowCacheELExpressions() && localCachedExpression != null && (localCachedExpression.length % 3 == 0))
+ if (actx.isAllowCacheELExpressions() && localCachedExpression != null &&
+ (localCachedExpression.length % 3 == 0))
{
//If the expected type and paramTypes are the same return the cached one
for (int i = 0; i < (localCachedExpression.length/3); i++)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java Sat Oct 29 10:02:34 2011
@@ -28,7 +28,7 @@ import javax.faces.view.facelets.Facelet
* This class was created to gather some code from latest Facelets not existing in latest JSF 2.0 spec.
* Also, since it was created on the fly while converting, it's highly possible that methods in this class
* should be moved in a more logical location and/or removed.
- *
+ *
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
*
@@ -36,10 +36,10 @@ import javax.faces.view.facelets.Facelet
*/
public final class TagHandlerUtils
{
-
+
/**
* Find the first occurence of a tag handler that is instanceof T
- *
+ *
* @since 2.0.1
* @param <T>
* @param nextHandler
@@ -54,7 +54,8 @@ public final class TagHandlerUtils
}
else if (nextHandler instanceof javax.faces.view.facelets.CompositeFaceletHandler)
{
- for (FaceletHandler handler : ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
+ for (FaceletHandler handler :
+ ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
{
if (type.isAssignableFrom(handler.getClass()))
{
@@ -63,12 +64,12 @@ public final class TagHandlerUtils
}
}
return null;
- }
+ }
/**
- * From TagHandler:
+ * From TagHandler:
* protected final <T> Iterator<T> findNextByType(Class<T> type)
- *
+ *
* @param type
* @return
*/
@@ -82,7 +83,8 @@ public final class TagHandlerUtils
}
else if (nextHandler instanceof javax.faces.view.facelets.CompositeFaceletHandler)
{
- for (FaceletHandler handler : ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
+ for (FaceletHandler handler :
+ ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
{
if (type.isAssignableFrom(handler.getClass()))
{
@@ -90,13 +92,13 @@ public final class TagHandlerUtils
}
}
}
-
+
return found;
}
private TagHandlerUtils()
{
-
+
}
public static Collection<FaceletHandler> findNextByType(FaceletHandler nextHandler, Class<?> ... type1)
@@ -105,20 +107,21 @@ public final class TagHandlerUtils
boolean isAssignable = false;
for (int i = 0; i < type1.length && !isAssignable; i++)
{
- isAssignable = type1[i].isAssignableFrom(nextHandler.getClass());
+ isAssignable = type1[i].isAssignableFrom(nextHandler.getClass());
}
if (isAssignable)
{
found.add((FaceletHandler)nextHandler);
}
else if (nextHandler instanceof javax.faces.view.facelets.CompositeFaceletHandler)
- {
- for (FaceletHandler handler : ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
+ {
+ for (FaceletHandler handler :
+ ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
{
isAssignable = false;
for (int i = 0; i < type1.length && !isAssignable; i++)
{
- isAssignable = type1[i].isAssignableFrom(handler.getClass());
+ isAssignable = type1[i].isAssignableFrom(handler.getClass());
}
if (isAssignable)
{
@@ -126,7 +129,7 @@ public final class TagHandlerUtils
}
}
}
-
+
return found;
}
@@ -139,7 +142,8 @@ public final class TagHandlerUtils
}
else if (nextHandler instanceof javax.faces.view.facelets.CompositeFaceletHandler)
{
- for (FaceletHandler handler : ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
+ for (FaceletHandler handler :
+ ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
{
if (type1.isAssignableFrom(handler.getClass()) || type2.isAssignableFrom(handler.getClass()))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java Sat Oct 29 10:02:34 2011
@@ -88,24 +88,12 @@ final class UserTagHandler extends TagHa
*
* @see TagAttribute#getValueExpression(FaceletContext, Class)
* @see javax.el.VariableMapper
- * @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
+ * @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
+ * javax.faces.component.UIComponent)
*/
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
- //VariableMapper orig = ctx.getVariableMapper();
-
- // setup a variable map
- //if (this._vars.length > 0)
- //{
- //VariableMapper varMapper = new VariableMapperWrapper(orig);
- //for (int i = 0; i < this._vars.length; i++)
- //{
- // varMapper.setVariable(this._vars[i].getLocalName(), this._vars[i].getValueExpression(ctx, Object.class));
- //}
- //ctx.setVariableMapper(varMapper);
- //}
-
AbstractFaceletContext actx = (AbstractFaceletContext) ctx;
// eval include
try
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java Sat Oct 29 10:02:34 2011
@@ -79,13 +79,16 @@ public class ClientBehaviorAttachedObjec
if (innerComponent != null)
{
- if (innerComponent instanceof ClientBehaviorHolder || UIComponent.isCompositeComponent(innerComponent))
+ if (innerComponent instanceof ClientBehaviorHolder ||
+ UIComponent.isCompositeComponent(innerComponent))
{
- targetsList.add(new ClientBehaviorRedirectEventComponentWrapper(innerComponent, getName(), getEvent()));
+ targetsList.add(
+ new ClientBehaviorRedirectEventComponentWrapper(innerComponent, getName(), getEvent()));
}
else
{
- throw new FacesException("Component with clientId "+innerComponent.getClientId()+ "should be instance of ClientBehaviorHolder");
+ throw new FacesException("Component with clientId " + innerComponent.getClientId()
+ + "should be instance of ClientBehaviorHolder");
}
}
}
@@ -103,15 +106,18 @@ public class ClientBehaviorAttachedObjec
UIComponent innerComponent = topLevelComponent.findComponent(getName());
if (innerComponent != null)
{
- if (innerComponent instanceof ClientBehaviorHolder || UIComponent.isCompositeComponent(innerComponent))
+ if (innerComponent instanceof ClientBehaviorHolder ||
+ UIComponent.isCompositeComponent(innerComponent))
{
List<UIComponent> targetsList = new ArrayList<UIComponent>(1);
- targetsList.add(new ClientBehaviorRedirectEventComponentWrapper(innerComponent, getName(), getEvent()));
+ targetsList.add(
+ new ClientBehaviorRedirectEventComponentWrapper(innerComponent, getName(), getEvent()));
return targetsList;
}
else
{
- throw new FacesException("Component with clientId "+innerComponent.getClientId()+ "should be instance of ClientBehaviorHolder");
+ throw new FacesException("Component with clientId "+ innerComponent.getClientId()
+ + "should be instance of ClientBehaviorHolder");
}
}
}
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=1194861&r1=1194860&r2=1194861&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 10:02:34 2011
@@ -207,7 +207,8 @@ public class CompositeComponentResourceT
if (nextHandler instanceof javax.faces.view.facelets.CompositeFaceletHandler)
{
- for (FaceletHandler handler : ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
+ for (FaceletHandler handler :
+ ((javax.faces.view.facelets.CompositeFaceletHandler)nextHandler).getHandlers())
{
if (handler instanceof javax.faces.view.facelets.FacetHandler)
{
@@ -384,7 +385,7 @@ public class CompositeComponentResourceT
if (_mapper == null || !_lastType.equals(type))
{
_lastType = type;
- BeanInfo beanInfo = (BeanInfo)((UIComponent) component).getAttributes().get(UIComponent.BEANINFO_KEY);
+ BeanInfo beanInfo = (BeanInfo)component.getAttributes().get(UIComponent.BEANINFO_KEY);
_mapper = createMetaRuleset(type , beanInfo).finish();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ImplementationHandler.java Sat Oct 29 10:02:34 2011
@@ -68,7 +68,8 @@ public class ImplementationHandler exten
}
else
{
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
// Register the facet UIComponent.COMPOSITE_FACET_NAME
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java Sat Oct 29 10:02:34 2011
@@ -38,10 +38,6 @@ import org.apache.myfaces.view.facelets.
@JSFFaceletTag(name="composite:insertChildren")
public class InsertChildrenHandler extends TagHandler
{
- //public static String USES_INSERT_CHILDREN = "org.apache.myfaces.USES_INSERT_CHILDREN";
- //public static String INSERT_CHILDREN_TARGET_ID = "org.apache.myfaces.INSERT_CHILDREN_TARGET_ID";
- //public static String INSERT_CHILDREN_ORDERING = "org.apache.myfaces.INSERT_CHILDREN_ORDERING";
-
public static final String INSERT_CHILDREN_USED = "org.apache.myfaces.INSERT_CHILDREN_USED";
private static final Logger log = Logger.getLogger(InsertChildrenHandler.class.getName());
@@ -54,7 +50,8 @@ public class InsertChildrenHandler exten
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException
{
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent parentCompositeComponent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
AbstractFaceletContext actx = (AbstractFaceletContext) ctx;
@@ -78,244 +75,7 @@ public class InsertChildrenHandler exten
else
{
actx.includeCompositeComponentDefinition(parent, null);
-
- //parentCompositeComponent.getAttributes().put(INSERT_CHILDREN_USED, Boolean.TRUE);
}
}
- /*
- public void apply(FaceletContext ctx, UIComponent parent)
- throws IOException
- {
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
-
- if (!ComponentHandler.isNew(parentCompositeComponent))
- {
- //Prevent deletion of components present on parentCompositeComponent. This components will not be changed.
- List<UIComponent> childList = new ArrayList<UIComponent>(parent.getChildren());
-
- boolean oldProcessingEvents = ctx.getFacesContext().isProcessingEvents();
-
- for (UIComponent tcChild : childList)
- {
- if (tcChild.getAttributes().remove(USES_INSERT_CHILDREN) != null)
- {
- ComponentSupport.finalizeForDeletion(tcChild);
- ctx.getFacesContext().setProcessingEvents(false);
- try
- {
- parent.getChildren().remove(tcChild);
- parent.getChildren().add(tcChild);
- }
- finally
- {
- ctx.getFacesContext().setProcessingEvents(oldProcessingEvents);
- }
- }
- }
- return;
- }
-
- parentCompositeComponent.subscribeToEvent(PostAddToViewEvent.class,
- new RelocateAllChildrenListener(parent, parent.getChildCount()));
- parentCompositeComponent.subscribeToEvent(PostBuildComponentTreeOnRestoreViewEvent.class,
- new RelocateAllChildrenListener(parent, parent.getChildCount()));
- */
- /*
- if (ctx.getFacesContext().getAttributes().containsKey(
- FaceletViewDeclarationLanguage.MARK_INITIAL_STATE_KEY))
- {
- parentCompositeComponent.subscribeToEvent(PostBuildComponentTreeOnRestoreViewEvent.class,
- new RelocateAllChildrenListener(parent, parent.getChildCount()));
- }*/
- /*
- }
- */
-
- /*
- public static final class RelocateAllChildrenListener
- implements ComponentSystemEventListener, StateHolder
- {
- private UIComponent _targetComponent;
- private String _targetClientId;
- private int _childIndex;
-
-
- public RelocateAllChildrenListener()
- {
- }
-
- public RelocateAllChildrenListener(UIComponent targetComponent, int childIndex)
- {
- _targetComponent = targetComponent;
- _childIndex = childIndex;
- }
-
- public void processEvent(ComponentSystemEvent event)
- {
- UIComponent parentCompositeComponent = event.getComponent();
-
- if (_targetComponent == null)
- {
- //All composite components are NamingContainer and the target is inside it, so we can remove the prefix.
- _targetComponent = parentCompositeComponent.findComponent(_targetClientId.substring(parentCompositeComponent.getClientId().length()+1));
-
- if (_targetComponent == null)
- {
- //Could happen in no org.apache.myfaces.REFRESH_TRANSIENT_BUILD_ON_PSS_PRESERVE_STATE
- //In this case we cannot relocate, just return;
- return;
- }
- }
-
- if (parentCompositeComponent.getChildCount() <= 0)
- {
- return;
- }
-
- List<UIComponent> childList = new ArrayList<UIComponent>(parentCompositeComponent.getChildren());
-
- List<UIComponent> targetChildrenList = _targetComponent.getChildren();
-
- Map<String, Object> ccAttributes = parentCompositeComponent.getAttributes();
- if (!ccAttributes.containsKey(INSERT_CHILDREN_TARGET_ID))
- {
- //Save the target and the ordering of ids inserted
- ccAttributes.put(INSERT_CHILDREN_TARGET_ID, _targetComponent.getClientId());
-
- targetChildrenList.addAll(_childIndex, childList);
- }
- else
- {
- //Add one to one based on the ordering set at first time
- List<String> ids = (List<String>) ccAttributes.get(INSERT_CHILDREN_ORDERING);
- if (ids != null && _childIndex < targetChildrenList.size())
- {
- int i = 0;
- int j = _childIndex;
- int k = 0;
- while (i < ids.size() && j < targetChildrenList.size() && k < childList.size())
- {
- if (ids.get(i) != null)
- {
- if (ids.get(i).equals(childList.get(k).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- if (!ids.get(i).equals(targetChildrenList.get(j).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- targetChildrenList.add(j, childList.get(k));
- k++;
- }
- j++;
- }
- else if (ids.get(i).equals(targetChildrenList.get(j).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- j++;
- }
- }
- i++;
- }
- while (k < childList.size())
- {
- targetChildrenList.add(j, childList.get(k));
- k++;
- j++;
- }
- }
- else
- {
- targetChildrenList.addAll(_childIndex, childList);
- }
- }*/
-
- // After check, the commented code is not necessary because at this
- // point there is no any call to getClientId() yet. But it is better
- // let this code commented, because some day could be useful.
- //
- /*
- UIComponent uniqueIdVendor = (UIComponent) findParentUniqueIdVendor(_targetComponent);
-
- if (uniqueIdVendor != null && !uniqueIdVendor.getClientId().equals(parentCompositeComponent.getClientId()))
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
-
- for (UIComponent child : childList)
- {
- regenerateUniqueIds(facesContext, (UniqueIdVendor) uniqueIdVendor, child);
- }
- }*/
- /*
- }
-
- public Object saveState(FacesContext context)
- {
- return new Object[]{_targetComponent != null ? _targetComponent.getClientId() : _targetClientId , _childIndex};
- }
-
- public void restoreState(FacesContext context, Object state)
- {
- Object[] values = (Object[])state;
- _targetClientId = (String) values[0];
- _childIndex = (Integer) values[1];
- }
-
- public boolean isTransient()
- {
- return false;
- }
-
- public void setTransient(boolean newTransientValue)
- {
- // no-op as listener is transient
- }
- */
- /*
- private void regenerateUniqueIds(FacesContext facesContext, UniqueIdVendor uniqueIdVendor, UIComponent comp)
- {
- if (comp.getId() != null && comp.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- {
- //Assign a new generated id according to the new UniqueIdVendor parent
- comp.setId(((UniqueIdVendor)uniqueIdVendor).createUniqueId(facesContext, null));
- }
-
- if (comp instanceof UniqueIdVendor)
- {
- uniqueIdVendor = (UniqueIdVendor) comp;
- }
-
- if (comp.getChildCount() > 0)
- {
- for (UIComponent child : comp.getChildren())
- {
- regenerateUniqueIds(facesContext, uniqueIdVendor, child);
- }
- }
- if (comp.getFacetCount() > 0)
- {
- for (UIComponent child : comp.getFacets().values())
- {
- regenerateUniqueIds(facesContext, uniqueIdVendor, child);
- }
- }
- }
- */
- /*
- }
- */
-
- /*
- private static UniqueIdVendor findParentUniqueIdVendor(UIComponent component)
- {
- UIComponent parent = component.getParent();
-
- while (parent != null)
- {
- if (parent instanceof UniqueIdVendor)
- {
- return (UniqueIdVendor) parent;
- }
- parent = parent.getParent();
- }
- return null;
- }
- */
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java Sat Oct 29 10:02:34 2011
@@ -102,7 +102,8 @@ public class InsertFacetHandler extends
{
String facetName = _name.getValue(ctx);
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
@@ -150,11 +151,10 @@ public class InsertFacetHandler extends
AbstractFaceletContext actx = (AbstractFaceletContext) ctx;
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
-
+ UIComponent parentCompositeComponent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+
actx.includeCompositeComponentDefinition(parent, facetName);
-
- //parentCompositeComponent.getAttributes().put(INSERT_FACET_USED+facetName, Boolean.TRUE);
}
}
@@ -183,178 +183,5 @@ public class InsertFacetHandler extends
throw new TagException(tag,e);
}
}
-
- /*
- public void apply(FaceletContext ctx, UIComponent parent)
- throws IOException
- {
- String facetName = _name.getValue(ctx);
-
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
-
- if (_required != null && _required.getBoolean(ctx) && parentCompositeComponent.getFacet(facetName) == null)
- {
- throw new TagException(this.tag, "Cannot find facet with name "+facetName+" in composite component "
- +parentCompositeComponent.getClientId(ctx.getFacesContext()));
- }
-
- if (!ComponentHandler.isNew(parentCompositeComponent))
- {
- UIComponent facet = parent.getFacet(facetName);
- if (facet != null)
- {
- if (facet.getAttributes().containsKey(ComponentSupport.FACET_CREATED_UIPANEL_MARKER))
- {
- ComponentSupport.markForDeletion(facet);
- for (UIComponent child : facet.getChildren())
- {
- if (child.getAttributes().remove(USES_INSERT_FACET) != null)
- {
- ComponentSupport.finalizeForDeletion(child);
- }
- }
- }
- ComponentSupport.finalizeForDeletion(facet);
- }
- return;
- }
-
- parentCompositeComponent.subscribeToEvent(PostAddToViewEvent.class,
- new RelocateFacetListener(parent, facetName));
- parentCompositeComponent.subscribeToEvent(PostBuildComponentTreeOnRestoreViewEvent.class,
- new RelocateFacetListener(parent, facetName));
- */
- /*
- if (ctx.getFacesContext().getAttributes().containsKey(
- FaceletViewDeclarationLanguage.MARK_INITIAL_STATE_KEY))
- {
- parentCompositeComponent.subscribeToEvent(PostBuildComponentTreeOnRestoreViewEvent.class,
- new RelocateFacetListener(parent, facetName));
- }*/
- /*
- }
- */
- /*
- public static final class RelocateFacetListener
- implements ComponentSystemEventListener, StateHolder
- {
- private UIComponent _targetComponent;
- private String _targetClientId;
- private String _facetName;
-
- public RelocateFacetListener()
- {
- }
-
- public RelocateFacetListener(UIComponent targetComponent, String facetName)
- {
- _targetComponent = targetComponent;
- _facetName = facetName;
- }
-
- public void processEvent(ComponentSystemEvent event)
- {
- UIComponent parentCompositeComponent = event.getComponent();
-
- UIComponent facetComponent = parentCompositeComponent.getFacet(_facetName);
-
- if (_targetComponent == null)
- {
- //All composite components are NamingContainer and the target is inside it, so we can remove the prefix.
- _targetComponent = parentCompositeComponent.findComponent(_targetClientId.substring(parentCompositeComponent.getClientId().length()+1));
-
- if (_targetComponent == null)
- {
- //Could happen in no org.apache.myfaces.REFRESH_TRANSIENT_BUILD_ON_PSS_PRESERVE_STATE
- //In this case we cannot relocate, just return;
- return;
- }
- }
-
- if (facetComponent != null)
- {
- Map<String, Object> ccAttributes = parentCompositeComponent.getAttributes();
- UIComponent oldFacet = _targetComponent.getFacets().get(_facetName);
- String insertFacetKey = INSERT_FACET_TARGET_ID+_facetName;
-
- if (!ccAttributes.containsKey(insertFacetKey))
- {
- ccAttributes.put(insertFacetKey, _targetComponent.getClientId());
- }
-
- if (oldFacet != null && Boolean.TRUE.equals(oldFacet.getAttributes().get(ComponentSupport.FACET_CREATED_UIPANEL_MARKER)))
- {
- List<UIComponent> childList = new ArrayList<UIComponent>(facetComponent.getChildren());
-
- List<UIComponent> targetChildrenList = oldFacet.getChildren();
-
- List<String> ids = (List<String>) ccAttributes.get(INSERT_FACET_ORDERING+_facetName);
- if (ids != null && targetChildrenList.size() > 0)
- {
- int i = 0;
- int j = 0;
- int k = 0;
- while (i < ids.size() && j < targetChildrenList.size() && k < childList.size())
- {
- if (ids.get(i) != null)
- {
- if (ids.get(i).equals(childList.get(k).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- if (!ids.get(i).equals(targetChildrenList.get(j).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- targetChildrenList.add(j, childList.get(k));
- k++;
- }
- j++;
- }
- else if (ids.get(i).equals(targetChildrenList.get(j).getAttributes().get(ComponentSupport.MARK_CREATED)))
- {
- j++;
- }
- }
- i++;
- }
- while (k < childList.size())
- {
- targetChildrenList.add(j, childList.get(k));
- k++;
- j++;
- }
- }
- else
- {
- _targetComponent.getFacets().put(_facetName, facetComponent);
- }
- }
- else
- {
- _targetComponent.getFacets().put(_facetName, facetComponent);
- }
-
- }
- }
-
- public Object saveState(FacesContext context)
- {
- return new Object[]{_targetComponent != null ? _targetComponent.getClientId() : _targetClientId , _facetName};
- }
-
- public void restoreState(FacesContext context, Object state)
- {
- Object[] values = (Object[])state;
- _targetClientId = (String) values[0];
- _facetName = (String) values[1];
- }
-
- public boolean isTransient()
- {
- return false;
- }
- public void setTransient(boolean newTransientValue)
- {
- // no-op as listener is transient
- }
- }
- */
}
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=1194861&r1=1194860&r2=1194861&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 Sat Oct 29 10:02:34 2011
@@ -200,7 +200,8 @@ public class InterfaceHandler extends Ta
// in other words we are calling ViewDeclarationLanguage.getComponentMetadata
if ( ((AbstractFaceletContext)ctx).isBuildingCompositeComponentMetadata() )
{
- 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/RenderFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java Sat Oct 29 10:02:34 2011
@@ -84,7 +84,8 @@ public class RenderFacetHandler extends
{
String facetName = _name.getValue(ctx);
- UIComponent compositeBaseParent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent compositeBaseParent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
CompositeComponentBeanInfo beanInfo =
(CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
@@ -123,7 +124,8 @@ public class RenderFacetHandler extends
{
if (!((AbstractFaceletContext)ctx).isBuildingCompositeComponentMetadata())
{
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent parentCompositeComponent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
String facetName = _name.getValue(ctx);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java Sat Oct 29 10:02:34 2011
@@ -113,8 +113,10 @@ public final class ActionSourceRule exte
// This is a problem when using facelets and <ui:decorate/> with EL params (see MYFACES-2541 for details).
// So we must create two MethodExpressions here - both are created from the current
// facelets context and thus varibale mapping will work.
- final MethodExpression methodExpressionOneArg = _attr.getMethodExpression(ctx, null, ActionSourceRule.ACTION_LISTENER_SIG);
- final MethodExpression methodExpressionZeroArg = _attr.getMethodExpression(ctx, null, ActionSourceRule.ACTION_SIG);
+ final MethodExpression methodExpressionOneArg
+ = _attr.getMethodExpression(ctx, null, ActionSourceRule.ACTION_LISTENER_SIG);
+ final MethodExpression methodExpressionZeroArg
+ = _attr.getMethodExpression(ctx, null, ActionSourceRule.ACTION_SIG);
if (FaceletCompositionContext.getCurrentInstance(ctx).isUsingPSSOnThisView())
{
((ActionSource2) instance).addActionListener(
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/BehaviorTagHandlerDelegate.java Sat Oct 29 10:02:34 2011
@@ -85,7 +85,8 @@ public class BehaviorTagHandlerDelegate
}
else
{
- throw new TagException(_delegate.getTag(), "Parent not composite component or an instance of ClientBehaviorHolder: " + parent);
+ throw new TagException(_delegate.getTag(),
+ "Parent not composite component or an instance of ClientBehaviorHolder: " + parent);
}
}
@@ -163,11 +164,13 @@ public class BehaviorTagHandlerDelegate
}
if (eventName == null)
{
- throw new TagAttributeException(_delegate.getEvent(), "eventName could not be defined for client behavior "+ behavior.toString());
+ throw new TagAttributeException(_delegate.getEvent(),
+ "eventName could not be defined for client behavior "+ behavior.toString());
}
else if (!cvh.getEventNames().contains(eventName))
{
- throw new TagAttributeException(_delegate.getEvent(), "eventName "+eventName+" not found on component instance");
+ throw new TagAttributeException(_delegate.getEvent(),
+ "eventName "+eventName+" not found on component instance");
}
else
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentSupport.java Sat Oct 29 10:02:34 2011
@@ -431,7 +431,8 @@ public final class ComponentSupport
{
if (MyfacesConfig.getCurrentInstance(context.getExternalContext()).isRefreshTransientBuildOnPSSPreserveState())
{
- component.getAttributes().put(DefaultFaceletsStateManagementStrategy.COMPONENT_ADDED_AFTER_BUILD_VIEW, ComponentState.REMOVE_ADD);
+ component.getAttributes().put(DefaultFaceletsStateManagementStrategy.COMPONENT_ADDED_AFTER_BUILD_VIEW,
+ ComponentState.REMOVE_ADD);
}
//component.subscribeToEvent(PostAddToViewEvent.class, new RestoreComponentFullyListener());
if (FaceletViewDeclarationLanguage.isRefreshTransientBuildOnPSSAuto(context))
@@ -538,12 +539,14 @@ public final class ComponentSupport
return sb.toString();
}
- public static Object restoreInitialTagState(FaceletContext ctx, FaceletCompositionContext fcc, UIComponent parent, String uniqueId)
+ public static Object restoreInitialTagState(FaceletContext ctx, FaceletCompositionContext fcc,
+ UIComponent parent, String uniqueId)
{
Object value = null;
if (fcc.isUsingPSSOnThisView() &&
- PhaseId.RESTORE_VIEW.equals(ctx.getFacesContext().getCurrentPhaseId()) &&
- !MyfacesConfig.getCurrentInstance(ctx.getFacesContext().getExternalContext()).isRefreshTransientBuildOnPSSPreserveState())
+ PhaseId.RESTORE_VIEW.equals(ctx.getFacesContext().getCurrentPhaseId()) &&
+ !MyfacesConfig.getCurrentInstance(
+ ctx.getFacesContext().getExternalContext()).isRefreshTransientBuildOnPSSPreserveState())
{
UIViewRoot root = getViewRoot(ctx, parent);
FaceletState map = (FaceletState) root.getAttributes().get(FACELET_STATE_INSTANCE);
@@ -559,7 +562,8 @@ public final class ComponentSupport
return value;
}
- public static void saveInitialTagState(FaceletContext ctx, FaceletCompositionContext fcc, UIComponent parent, String uniqueId, Object value)
+ public static void saveInitialTagState(FaceletContext ctx, FaceletCompositionContext fcc,
+ UIComponent parent, String uniqueId, Object value)
{
if (fcc.isUsingPSSOnThisView())
{
@@ -567,7 +571,8 @@ public final class ComponentSupport
// work correctly. If preserve state is enabled, just ignore it, because this tag will
// force full restore over the parent
if (!fcc.isRefreshingTransientBuild() && !ctx.getFacesContext().isPostback()
- && !MyfacesConfig.getCurrentInstance(ctx.getFacesContext().getExternalContext()).isRefreshTransientBuildOnPSSPreserveState())
+ && !MyfacesConfig.getCurrentInstance(
+ ctx.getFacesContext().getExternalContext()).isRefreshTransientBuildOnPSSPreserveState())
{
UIViewRoot root = getViewRoot(ctx, parent);
FaceletState map = (FaceletState) root.getAttributes().get(FACELET_STATE_INSTANCE);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java Sat Oct 29 10:02:34 2011
@@ -65,7 +65,6 @@ import org.apache.myfaces.view.facelets.
*/
public class ComponentTagHandlerDelegate extends TagHandlerDelegate
{
- //private final static Logger log = Logger.getLogger("facelets.tag.component");
private final static Logger log = Logger.getLogger(ComponentTagHandlerDelegate.class.getName());
private final ComponentHandler _delegate;
@@ -153,7 +152,7 @@ public class ComponentTagHandlerDelegate
* <li>If <i>not</i> found, call {@link #createComponent(FaceletContext) createComponent}.
* <ol>
* <li>Only here do we apply
- * {@link TagHandler#setAttributes(FaceletCompositionContext, Object) attributes}</li>
+ * {@link javax.faces.view.facelets.TagHandler#setAttributes(FaceletCompositionContext, Object) attributes}</li>
* <li>Set the UIComponent's id</li>
* <li>Set the RendererType of this instance</li>
* </ol>
@@ -165,7 +164,8 @@ public class ComponentTagHandlerDelegate
* for deletion.</li>
* </ol>
*
- * @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
+ * @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
+ * javax.faces.component.UIComponent)
*
* @throws TagException
* if the UIComponent parent is null
@@ -211,48 +211,6 @@ public class ComponentTagHandlerDelegate
{
c = ComponentSupport.findChildByTagId(parent, id);
}
-
- // Check if the component was relocated using
- // composite:insertChildren or composite:insertFacet
- /*
- if (c == null && UIComponent.isCompositeComponent(parent))
- {
- if (facetName == null)
- {
- String targetClientId = (String) parent.getAttributes().get(InsertChildrenHandler.INSERT_CHILDREN_TARGET_ID);
- if (targetClientId != null)
- {
- UIComponent targetComponent = parent.findComponent(targetClientId.substring(parent.getClientId().length()+1));
- if (targetComponent != null)
- {
- c = ComponentSupport.findChildByTagId(targetComponent, id);
- }
- }
- if (c != null)
- {
- c.getAttributes().put(InsertChildrenHandler.USES_INSERT_CHILDREN, Boolean.TRUE);
- componentFoundInserted = true;
- }
- }
- else
- {
- String targetClientId = (String) parent.getAttributes().get(InsertFacetHandler.INSERT_FACET_TARGET_ID+facetName);
- if (targetClientId != null)
- {
- UIComponent targetComponent = parent.findComponent(targetClientId.substring(parent.getClientId().length()+1));
- if (targetComponent != null)
- {
- c = ComponentSupport.findChildByTagId(targetComponent, id);
- if (c != null)
- {
- c.getAttributes().put(InsertFacetHandler.USES_INSERT_FACET, Boolean.TRUE);
- componentFoundInserted = true;
- }
- }
- }
- }
- }
- */
}
boolean componentFound = false;
if (c != null)
@@ -362,46 +320,7 @@ public class ComponentTagHandlerDelegate
}
//}
}
-
- /*
- if (mctx.isRefreshingTransientBuild() &&
- UIComponent.isCompositeComponent(parent))
- {
- // Save the child structure behind this component, so it can be
- // used later by InsertChildrenHandler and InsertFacetHandler
- // to update components correctly.
- if (facetName != null)
- {
- if (parent.getAttributes().containsKey(InsertFacetHandler.INSERT_FACET_TARGET_ID+facetName))
- {
- List<String> ordering = (List<String>) parent.getAttributes().get(
- InsertFacetHandler.INSERT_FACET_ORDERING+facetName);
- if (ordering == null)
- {
- ordering = new ArrayList<String>();
- parent.getAttributes().put(InsertFacetHandler.INSERT_FACET_ORDERING+facetName, ordering);
- }
- ordering.remove(id);
- ordering.add(id);
- }
- }
- else
- {
- if (parent.getAttributes().containsKey(InsertChildrenHandler.INSERT_CHILDREN_TARGET_ID))
- {
- List<String> ordering = (List<String>) parent.getAttributes().get(
- InsertChildrenHandler.INSERT_CHILDREN_ORDERING);
- if (ordering == null)
- {
- ordering = new ArrayList<String>();
- parent.getAttributes().put(InsertChildrenHandler.INSERT_CHILDREN_ORDERING, ordering);
- }
- ordering.remove(id);
- ordering.add(id);
- }
- }
- }
- */
+
if (!componentFound)
{
@@ -427,44 +346,23 @@ public class ComponentTagHandlerDelegate
_delegate.onComponentPopulated(ctx, c, oldParent);
- //if (!componentFoundInserted)
- //{
- // add to the tree afterwards
- // this allows children to determine if it's
- // been part of the tree or not yet
- if (componentFound && mctx.isRefreshingTransientBuild())
- {
- facesContext.setProcessingEvents(false);
- }
- if (facetName == null)
- {
- parent.getChildren().add(c);
- }
- else
- {
- ComponentSupport.addFacet(ctx, parent, c, facetName);
- }
- if (componentFound && mctx.isRefreshingTransientBuild())
- {
- facesContext.setProcessingEvents(oldProcessingEvents);
- }
- //}
- /*
+ if (componentFound && mctx.isRefreshingTransientBuild())
+ {
+ facesContext.setProcessingEvents(false);
+ }
+ if (facetName == null)
+ {
+ parent.getChildren().add(c);
+ }
else
{
- if (facetName != null)
- {
- if (UIComponent.isCompositeComponent(parent))
- {
- UIComponent facet = parent.getFacet(facetName);
- if (Boolean.TRUE.equals(facet.getAttributes().get(ComponentSupport.FACET_CREATED_UIPANEL_MARKER)))
- {
- facet.getAttributes().put(InsertFacetHandler.USES_INSERT_FACET, Boolean.TRUE);
- }
- }
- }
- }*/
-
+ ComponentSupport.addFacet(ctx, parent, c, facetName);
+ }
+ if (componentFound && mctx.isRefreshingTransientBuild())
+ {
+ facesContext.setProcessingEvents(oldProcessingEvents);
+ }
+
if (c instanceof UniqueIdVendor)
{
mctx.popUniqueIdVendorToStack();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java Sat Oct 29 10:02:34 2011
@@ -97,7 +97,8 @@ public class ConverterTagHandlerDelegate
}
else
{
- throw new TagException(_delegate.getTag(), "Parent not composite component or an instance of ValueHolder: " + parent);
+ throw new TagException(_delegate.getTag(),
+ "Parent not composite component or an instance of ValueHolder: " + parent);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java Sat Oct 29 10:02:34 2011
@@ -80,7 +80,7 @@ public final class EditableValueHolderRu
if (FaceletCompositionContext.getCurrentInstance(ctx).isUsingPSSOnThisView())
{
((EditableValueHolder) instance).addValueChangeListener(
- new PartialMethodExpressionValueChangeListener(methodExpressionOneArg, methodExpressionZeroArg));
+ new PartialMethodExpressionValueChangeListener(methodExpressionOneArg, methodExpressionZeroArg));
}
else
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidatorTagHandlerDelegate.java Sat Oct 29 10:02:34 2011
@@ -61,7 +61,8 @@ public class ValidatorTagHandlerDelegate
* its validatorId will be added to the exclusion list stored under
* this key on the parent UIComponent.
*/
- public final static String VALIDATOR_ID_EXCLUSION_LIST_KEY = "org.apache.myfaces.validator.VALIDATOR_ID_EXCLUSION_LIST";
+ public final static String VALIDATOR_ID_EXCLUSION_LIST_KEY
+ = "org.apache.myfaces.validator.VALIDATOR_ID_EXCLUSION_LIST";
private ValidatorHandler _delegate;
@@ -187,7 +188,8 @@ public class ValidatorTagHandlerDelegate
}
else
{
- throw new TagException(_delegate.getTag(), "Parent not composite component or an instance of EditableValueHolder: " + parent);
+ throw new TagException(_delegate.getTag(),
+ "Parent not composite component or an instance of EditableValueHolder: " + parent);
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ActionListenerHandler.java Sat Oct 29 10:02:34 2011
@@ -179,7 +179,8 @@ public final class ActionListenerHandler
}
else
{
- throw new TagException(this.tag, "Parent is not composite component or of type ActionSource, type is: " + parent);
+ throw new TagException(this.tag,
+ "Parent is not composite component or of type ActionSource, type is: " + parent);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java Sat Oct 29 10:02:34 2011
@@ -94,55 +94,64 @@ public class AjaxHandler extends TagHand
* library. It is necessary to remove this key from facesContext attribute map after build, to keep
* working this code for next views to be built.
*/
- public final static String STANDARD_JSF_AJAX_LIBRARY_LOADED = "org.apache.myfaces.STANDARD_JSF_AJAX_LIBRARY_LOADED";
+ public final static String STANDARD_JSF_AJAX_LIBRARY_LOADED
+ = "org.apache.myfaces.STANDARD_JSF_AJAX_LIBRARY_LOADED";
/**
*
*/
- @JSFFaceletAttribute(name = "disabled", className = "javax.el.ValueExpression", deferredValueType = "java.lang.Boolean")
+ @JSFFaceletAttribute(name = "disabled", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.Boolean")
private final TagAttribute _disabled;
/**
*
*/
- @JSFFaceletAttribute(name = "event", className = "javax.el.ValueExpression", deferredValueType = "java.lang.String")
+ @JSFFaceletAttribute(name = "event", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.String")
private final TagAttribute _event;
/**
*
*/
- @JSFFaceletAttribute(name = "execute", className = "javax.el.ValueExpression", deferredValueType = "java.lang.Object")
+ @JSFFaceletAttribute(name = "execute", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.Object")
private final TagAttribute _execute;
/**
*
*/
- @JSFFaceletAttribute(name = "immediate", className = "javax.el.ValueExpression", deferredValueType = "java.lang.Boolean")
+ @JSFFaceletAttribute(name = "immediate", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.Boolean")
private final TagAttribute _immediate;
/**
*
*/
@JSFFaceletAttribute(name = "listener", className = "javax.el.MethodExpression",
- deferredMethodSignature = "public void m(javax.faces.event.AjaxBehaviorEvent evt) throws javax.faces.event.AbortProcessingException")
+ deferredMethodSignature = "public void m(javax.faces.event.AjaxBehaviorEvent evt) "
+ + "throws javax.faces.event.AbortProcessingException")
private final TagAttribute _listener;
/**
*
*/
- @JSFFaceletAttribute(name = "onevent", className = "javax.el.ValueExpression", deferredValueType = "java.lang.String")
+ @JSFFaceletAttribute(name = "onevent", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.String")
private final TagAttribute _onevent;
/**
*
*/
- @JSFFaceletAttribute(name = "onerror", className = "javax.el.ValueExpression", deferredValueType = "java.lang.String")
+ @JSFFaceletAttribute(name = "onerror", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.String")
private final TagAttribute _onerror;
/**
*
*/
- @JSFFaceletAttribute(name = "render", className = "javax.el.ValueExpression", deferredValueType = "java.lang.Object")
+ @JSFFaceletAttribute(name = "render", className = "javax.el.ValueExpression",
+ deferredValueType = "java.lang.Object")
private final TagAttribute _render;
private final boolean _wrapMode;
@@ -334,7 +343,8 @@ public class AjaxHandler extends TagHand
}
else
{
- throw new TagAttributeException(_event, "eventName could not be defined for f:ajax tag with no wrap mode.");
+ throw new TagAttributeException(_event,
+ "eventName could not be defined for f:ajax tag with no wrap mode.");
}
}
}
@@ -350,7 +360,8 @@ public class AjaxHandler extends TagHand
}
else
{
- throw new TagAttributeException(_event, "event it is not a valid eventName defined for this component");
+ throw new TagAttributeException(_event,
+ "event it is not a valid eventName defined for this component");
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ConvertDateTimeHandler.java Sat Oct 29 10:02:34 2011
@@ -138,8 +138,8 @@ public final class ConvertDateTimeHandle
else
{
throw new TagAttributeException(this.tag, this.timeZone,
- "Illegal TimeZone, must evaluate to either a java.util.TimeZone or String, is type: "
- + t.getClass());
+ "Illegal TimeZone, must evaluate to either a java.util.TimeZone or String, is type: "
+ + t.getClass());
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java Sat Oct 29 10:02:34 2011
@@ -68,7 +68,8 @@ public final class EventHandler extends
@JSFFaceletAttribute(name="listener",
className="javax.el.MethodExpression",
deferredMethodSignature=
- "public void listener(javax.faces.event.ComponentSystemEvent evt) throws javax.faces.event.AbortProcessingException")
+ "public void listener(javax.faces.event.ComponentSystemEvent evt) "
+ + "throws javax.faces.event.AbortProcessingException")
private TagAttribute listener;
@JSFFaceletAttribute(name="type",
@@ -85,7 +86,8 @@ public final class EventHandler extends
listener = getRequiredAttribute("listener");
if (!listener.isLiteral())
{
- listenerIsCompositeComponentME = CompositeComponentELUtils.isCompositeComponentExpression(listener.getValue());
+ listenerIsCompositeComponentME
+ = CompositeComponentELUtils.isCompositeComponentExpression(listener.getValue());
}
else
{
@@ -94,7 +96,8 @@ public final class EventHandler extends
type = getRequiredAttribute("type");
}
- public void apply (FaceletContext ctx, UIComponent parent) throws ELException, FacesException, FaceletException, IOException
+ public void apply (FaceletContext ctx, UIComponent parent)
+ throws ELException, FacesException, FaceletException, IOException
{
//Apply only if we are creating a new component
if (!ComponentHandler.isNew(parent))
@@ -130,11 +133,14 @@ public final class EventHandler extends
UIViewRoot viewRoot = ComponentSupport.getViewRoot(ctx, parent);
if (listenerIsCompositeComponentME)
{
- // Subscribe after the view is built, so we can calculate a findComponent valid expression, and then use it to
+ // Subscribe after the view is built, so we can calculate a
+ // findComponent valid expression, and then use it to
// put the expression in context.
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent parentCompositeComponent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
parentCompositeComponent.subscribeToEvent(PostAddToViewEvent.class,
- new SubscribeEventListener(eventClass, methodExpOneArg, methodExpZeroArg, (eventClass == PreRenderViewEvent.class) ? null : parent));
+ new SubscribeEventListener(eventClass, methodExpOneArg, methodExpZeroArg,
+ (eventClass == PreRenderViewEvent.class) ? null : parent));
}
else
{
@@ -402,7 +408,8 @@ public final class EventHandler extends
UIComponent parentCompositeComponent = event.getComponent();
FacesContext facesContext = FacesContext.getCurrentInstance();
//Calculate a findComponent expression to locate the right instance so PreRenderViewEvent could be called
- String findComponentExpression = ComponentSupport.getFindComponentExpression(facesContext, parentCompositeComponent);
+ String findComponentExpression
+ = ComponentSupport.getFindComponentExpression(facesContext, parentCompositeComponent);
//Note in practice this is only used for PreRenderViewEvent, but in the future it could be more events that
//require this hack.
@@ -410,7 +417,8 @@ public final class EventHandler extends
{
// ensure ViewRoot for PreRenderViewEvent
UIViewRoot viewRoot = facesContext.getViewRoot();
- viewRoot.subscribeToEvent(eventClass, new CompositeComponentRelativeListener(methodExpOneArg, methodExpZeroArg, findComponentExpression));
+ viewRoot.subscribeToEvent(eventClass, new CompositeComponentRelativeListener(methodExpOneArg,
+ methodExpZeroArg, findComponentExpression));
}
else
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java Sat Oct 29 10:02:34 2011
@@ -62,8 +62,8 @@ public class SetPropertyActionListenerHa
this._target = this.getRequiredAttribute("target");
}
- public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
- ELException
+ public void apply(FaceletContext ctx, UIComponent parent)
+ throws IOException, FacesException, FaceletException, ELException
{
//Apply only if we are creating a new component
if (!ComponentHandler.isNew(parent))
@@ -81,7 +81,8 @@ public class SetPropertyActionListenerHa
}
else
{
- throw new TagException(this.tag, "Parent is not composite component or of type ActionSource, type is: " + parent);
+ throw new TagException(this.tag,
+ "Parent is not composite component or of type ActionSource, type is: " + parent);
}
}
@@ -121,7 +122,8 @@ public class SetPropertyActionListenerHa
// Spec says: "all getType() on the "value" to determine property type" but it is not necessary
// beacuse type we have objValue already
- // Coerce the value of the "value" expression to the "target" expression value type following the Expression
+ // Coerce the value of the "value" expression to
+ // the "target" expression value type following the Expression
// Language coercion rules.
ExpressionFactory expressionFactory = facesContext.getApplication().getExpressionFactory();
value = expressionFactory.coerceToType(value, targetType);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/ValueChangeListenerHandler.java Sat Oct 29 10:02:34 2011
@@ -168,7 +168,8 @@ public final class ValueChangeListenerHa
}
else
{
- throw new TagException(this.tag, "Parent not composite component or an instance of EditableValueHolder: " + parent);
+ throw new TagException(this.tag,
+ "Parent not composite component or an instance of EditableValueHolder: " + parent);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java Sat Oct 29 10:02:34 2011
@@ -73,9 +73,11 @@ public final class HtmlLibrary extends A
this.addHtmlComponent("outputLink", "javax.faces.HtmlOutputLink", "javax.faces.Link");
- this.addComponent ("outputScript", "javax.faces.Output", "javax.faces.resource.Script", HtmlOutputScriptHandler.class);
+ this.addComponent("outputScript", "javax.faces.Output", "javax.faces.resource.Script",
+ HtmlOutputScriptHandler.class);
- this.addComponent ("outputStylesheet", "javax.faces.Output", "javax.faces.resource.Stylesheet", HtmlOutputStylesheetHandler.class);
+ this.addComponent("outputStylesheet", "javax.faces.Output", "javax.faces.resource.Stylesheet",
+ HtmlOutputStylesheetHandler.class);
this.addHtmlComponent("outputText", "javax.faces.HtmlOutputText", "javax.faces.Text");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java?rev=1194861&r1=1194860&r2=1194861&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java Sat Oct 29 10:02:34 2011
@@ -79,10 +79,12 @@ public class HtmlOutputScriptHandler ext
public void onComponentCreated(FaceletContext ctx, UIComponent c,
UIComponent parent)
{
- UIComponent parentCompositeComponent = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+ UIComponent parentCompositeComponent
+ = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
if (parentCompositeComponent != null)
{
- c.getAttributes().put(CompositeComponentELUtils.LOCATION_KEY, parentCompositeComponent.getAttributes().get(CompositeComponentELUtils.LOCATION_KEY));
+ c.getAttributes().put(CompositeComponentELUtils.LOCATION_KEY,
+ parentCompositeComponent.getAttributes().get(CompositeComponentELUtils.LOCATION_KEY));
}
}
}