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 [2/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/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Sat Oct 29 09:28:45 2011
@@ -126,6 +126,8 @@ import org.apache.myfaces.view.facelets.
import org.apache.myfaces.view.facelets.tag.ui.UILibrary;
import org.apache.myfaces.view.facelets.util.ReflectionUtil;
+import static org.apache.myfaces.view.facelets.DefaultFaceletsStateManagementStrategy.*;
+
/**
* This class represents the abstraction of Facelets as a ViewDeclarationLanguage.
*
@@ -145,7 +147,8 @@ public class FaceletViewDeclarationLangu
private static final Class<?>[] ACTION_LISTENER_SIGNATURE = new Class[]{ActionEvent.class};
- private static final Class<?>[] VALIDATOR_SIGNATURE = new Class[]{FacesContext.class, UIComponent.class, Object.class};
+ private static final Class<?>[] VALIDATOR_SIGNATURE
+ = new Class[]{FacesContext.class, UIComponent.class, Object.class};
public static final String CHARACTER_ENCODING_KEY = "javax.faces.request.charset";
@@ -160,7 +163,8 @@ public class FaceletViewDeclarationLangu
* Define the default buffer size value passed to ExternalContext.setResponseBufferResponse() and in a
* servlet environment to HttpServletResponse.setBufferSize().
*/
- @JSFWebConfigParam(since = "2.0", alias = "facelets.BUFFER_SIZE", classType = "java.lang.Integer", tags = "performance",
+ @JSFWebConfigParam(since = "2.0", alias = "facelets.BUFFER_SIZE", classType = "java.lang.Integer",
+ tags = "performance",
desc = "Define the default buffer size value passed to ExternalContext.setResponseBufferResponse() and in "
+ "a servlet environment to HttpServletResponse.setBufferSize()")
public final static String PARAM_BUFFER_SIZE = "javax.faces.FACELETS_BUFFER_SIZE";
@@ -201,14 +205,16 @@ public class FaceletViewDeclarationLangu
/**
* Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.
*/
- @JSFWebConfigParam(since = "2.0", desc = "Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.",
+ @JSFWebConfigParam(since = "2.0",
+ desc = "Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.",
alias = "facelets.LIBRARIES")
public final static String PARAM_LIBRARIES = "javax.faces.FACELETS_LIBRARIES";
/**
* Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.
*/
- @JSFWebConfigParam(since = "2.0", desc = "Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.",
+ @JSFWebConfigParam(since = "2.0",
+ desc = "Set of .taglib.xml files, separated by ';' that should be loaded by facelet engine.",
deprecated = true)
private final static String PARAM_LIBRARIES_DEPRECATED = "facelets.LIBRARIES";
@@ -219,7 +225,8 @@ public class FaceletViewDeclarationLangu
*
* <p>By default is infinite (no active).</p>
*/
- @JSFWebConfigParam(since = "2.0", defaultValue = "-1", alias = "facelets.REFRESH_PERIOD", classType = "java.lang.Long", tags = "performance")
+ @JSFWebConfigParam(since = "2.0", defaultValue = "-1", alias = "facelets.REFRESH_PERIOD",
+ classType = "java.lang.Long", tags = "performance")
public final static String PARAM_REFRESH_PERIOD = "javax.faces.FACELETS_REFRESH_PERIOD";
/**
@@ -244,7 +251,8 @@ public class FaceletViewDeclarationLangu
@JSFWebConfigParam(since = "2.0", deprecated = true)
private final static String PARAM_RESOURCE_RESOLVER_DEPRECATED = "facelets.RESOURCE_RESOLVER";
- private final static String[] PARAMS_RESOURCE_RESOLVER = {PARAM_RESOURCE_RESOLVER, PARAM_RESOURCE_RESOLVER_DEPRECATED};
+ private final static String[] PARAMS_RESOURCE_RESOLVER
+ = {PARAM_RESOURCE_RESOLVER, PARAM_RESOURCE_RESOLVER_DEPRECATED};
/**
* Skip comments found on a facelet file.
@@ -259,18 +267,15 @@ public class FaceletViewDeclarationLangu
private final static String PARAM_SKIP_COMMENTS_DEPRECATED = "facelets.SKIP_COMMENTS";
@JSFWebConfigParam(since = "2.1", defaultValue = "false", expectedValues = "true, false", tags = "performance")
- private final static String PARAM_MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW = "org.apache.myfaces.MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW";
+ private final static String PARAM_MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW
+ = "org.apache.myfaces.MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW";
private final static String[] PARAMS_SKIP_COMMENTS = {PARAM_SKIP_COMMENTS, PARAM_SKIP_COMMENTS_DEPRECATED};
- //public final static String PARAM_VIEW_MAPPINGS = "javax.faces.FACELETS_VIEW_MAPPINGS";
-
- //private final static String PARAM_VIEW_MAPPINGS_DEPRECATED = "facelets.VIEW_MAPPINGS";
public final static String FILLED_VIEW = "org.apache.myfaces.FILLED_VIEW";
//BEGIN CONSTANTS SET ON BUILD VIEW
- //public final static String BUILDING_COMPOSITE_COMPONENT_METADATA = "org.apache.myfaces.BUILDING_COMPOSITE_COMPONENT_METADATA";
public final static String BUILDING_VIEW_METADATA = "org.apache.myfaces.BUILDING_VIEW_METADATA";
@@ -290,9 +295,11 @@ public class FaceletViewDeclarationLangu
*/
public final static String MARK_INITIAL_STATE_KEY = "org.apache.myfaces.MARK_INITIAL_STATE";
- public final static String IS_BUILDING_INITIAL_STATE_KEY_ALIAS = "javax.faces.view.ViewDeclarationLanguage.IS_BUILDING_INITIAL_STATE";
+ public final static String IS_BUILDING_INITIAL_STATE_KEY_ALIAS
+ = "javax.faces.view.ViewDeclarationLanguage.IS_BUILDING_INITIAL_STATE";
- public final static String CLEAN_TRANSIENT_BUILD_ON_RESTORE = "org.apache.myfaces.CLEAN_TRANSIENT_BUILD_ON_RESTORE";
+ public final static String CLEAN_TRANSIENT_BUILD_ON_RESTORE
+ = "org.apache.myfaces.CLEAN_TRANSIENT_BUILD_ON_RESTORE";
private final static String STATE_KEY = "<!-...@-->";
@@ -408,7 +415,8 @@ public class FaceletViewDeclarationLangu
if (refreshTransientBuildOnPSS)
{
//This value is only set when _refreshTransientBuildOnPSSMode is "auto" or "true"
- context.getAttributes().put(REFRESH_TRANSIENT_BUILD_ON_PSS, _refreshTransientBuildOnPSSAuto ? "auto" : "true");
+ context.getAttributes().put(REFRESH_TRANSIENT_BUILD_ON_PSS,
+ _refreshTransientBuildOnPSSAuto ? "auto" : "true");
}
}
@@ -473,7 +481,8 @@ public class FaceletViewDeclarationLangu
setFilledView(context, view);
}
//At this point refreshTransientBuild = false && refreshTransientBuildOnPSS is true
- else if (_refreshTransientBuildOnPSSAuto && !context.getAttributes().containsKey(CLEAN_TRANSIENT_BUILD_ON_RESTORE))
+ else if (_refreshTransientBuildOnPSSAuto &&
+ !context.getAttributes().containsKey(CLEAN_TRANSIENT_BUILD_ON_RESTORE))
{
setFilledView(context, view);
}
@@ -489,7 +498,7 @@ public class FaceletViewDeclarationLangu
if (_markInitialStateWhenApplyBuildView)
{
if (!refreshTransientBuildOnPSS ||
- !view.getAttributes().containsKey(DefaultFaceletsStateManagementStrategy.COMPONENT_ADDED_AFTER_BUILD_VIEW))
+ !view.getAttributes().containsKey(COMPONENT_ADDED_AFTER_BUILD_VIEW))
{
view.markInitialState();
}
@@ -515,7 +524,8 @@ public class FaceletViewDeclarationLangu
// relocated components are not retrieved later on getClientIdsRemoved().
if (!(refreshTransientBuild && PhaseId.RESTORE_VIEW.equals(context.getCurrentPhaseId())))
{
- ((DefaultFaceletsStateManagementStrategy) getStateManagementStrategy(context, view.getViewId())).suscribeListeners(view);
+ ((DefaultFaceletsStateManagementStrategy) getStateManagementStrategy(context, view.getViewId())).
+ suscribeListeners(view);
}
context.getAttributes().remove(USING_PSS_ON_THIS_VIEW);
@@ -530,7 +540,7 @@ public class FaceletViewDeclarationLangu
private void _markInitialStateOnView(final UIViewRoot view, final boolean refreshTransientBuildOnPSS)
{
if (!refreshTransientBuildOnPSS ||
- !view.getAttributes().containsKey(DefaultFaceletsStateManagementStrategy.COMPONENT_ADDED_AFTER_BUILD_VIEW))
+ !view.getAttributes().containsKey(COMPONENT_ADDED_AFTER_BUILD_VIEW))
{
if (!view.isTransient())
{
@@ -623,7 +633,8 @@ public class FaceletViewDeclarationLangu
public static void _publishPostBuildComponentTreeOnRestoreViewEvent(FacesContext context, UIComponent component)
{
- context.getApplication().publishEvent(context, PostBuildComponentTreeOnRestoreViewEvent.class, component.getClass(), component);
+ context.getApplication().publishEvent(context, PostBuildComponentTreeOnRestoreViewEvent.class,
+ component.getClass(), component);
if (component.getChildCount() > 0)
{
@@ -699,7 +710,8 @@ public class FaceletViewDeclarationLangu
FaceletFactory.setInstance(_faceletFactory);
try
{
- compositeComponentFacelet = _faceletFactory.getCompositeComponentMetadataFacelet(componentResource.getURL());
+ compositeComponentFacelet
+ = _faceletFactory.getCompositeComponentMetadataFacelet(componentResource.getURL());
}
finally
{
@@ -709,7 +721,8 @@ public class FaceletViewDeclarationLangu
// Create a temporal tree where all components will be put, but we are only
// interested in metadata.
- UINamingContainer compositeComponentBase = (UINamingContainer) context.getApplication().createComponent(UINamingContainer.COMPONENT_TYPE);
+ UINamingContainer compositeComponentBase
+ = (UINamingContainer) context.getApplication().createComponent(UINamingContainer.COMPONENT_TYPE);
// Fill the component resource key, because this information should be available
// on metadata to recognize which is the component used as composite component base.
@@ -834,7 +847,8 @@ public class FaceletViewDeclarationLangu
checkNull(topLevelComponent, "topLevelComponent");
checkNull(handlerList, "handlerList");
- BeanInfo compositeComponentMetadata = (BeanInfo) topLevelComponent.getAttributes().get(UIComponent.BEANINFO_KEY);
+ BeanInfo compositeComponentMetadata
+ = (BeanInfo) topLevelComponent.getAttributes().get(UIComponent.BEANINFO_KEY);
if (compositeComponentMetadata == null)
{
@@ -944,10 +958,13 @@ public class FaceletViewDeclarationLangu
}
else
{
- if (currentHandler instanceof ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper)
+ if (currentHandler instanceof
+ ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper)
{
- currentHandler.applyAttachedObject(context, new ClientBehaviorRedirectEventComponentWrapper(component,
- ((ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper) currentHandler).getWrappedEventName(), eventName));
+ currentHandler.applyAttachedObject(context,
+ new ClientBehaviorRedirectEventComponentWrapper(component,
+ ((ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper)
+ currentHandler).getWrappedEventName(), eventName));
}
else
{
@@ -966,7 +983,8 @@ public class FaceletViewDeclarationLangu
{
checkNull(context, "context");
- BeanInfo compositeComponentMetadata = (BeanInfo) topLevelComponent.getAttributes().get(UIComponent.BEANINFO_KEY);
+ BeanInfo compositeComponentMetadata
+ = (BeanInfo) topLevelComponent.getAttributes().get(UIComponent.BEANINFO_KEY);
if (compositeComponentMetadata == null)
{
@@ -1012,7 +1030,8 @@ public class FaceletViewDeclarationLangu
}
String targetAttributeName = null;
- ValueExpression targetAttributeNameVE = (ValueExpression) propertyDescriptor.getValue("targetAttributeName");
+ ValueExpression targetAttributeNameVE
+ = (ValueExpression) propertyDescriptor.getValue("targetAttributeName");
if (targetAttributeNameVE != null)
{
targetAttributeName = (String) targetAttributeNameVE.getValue(context.getELContext());
@@ -1026,8 +1045,9 @@ public class FaceletViewDeclarationLangu
targetAttributeName = attributeName;
}
- boolean isKnownTargetAttributeMethod = "action".equals(targetAttributeName) || "actionListener".equals(targetAttributeName)
- || "validator".equals(targetAttributeName) || "valueChangeListener".equals(targetAttributeName);
+ boolean isKnownTargetAttributeMethod
+ = "action".equals(targetAttributeName) || "actionListener".equals(targetAttributeName)
+ || "validator".equals(targetAttributeName) || "valueChangeListener".equals(targetAttributeName);
// either the attributeName has to be a knownMethod or there has to be a method-signature
if (isKnownTargetAttributeMethod || methodSignature != null)
@@ -1088,8 +1108,9 @@ public class FaceletViewDeclarationLangu
{
if (log.isLoggable(Level.SEVERE))
{
- log.severe("attributeValueExpression not found under the key \"" + attributeName +
- "\". Looking for the next attribute");
+ log.severe("attributeValueExpression not found under the key \""
+ + attributeName
+ + "\". Looking for the next attribute");
}
}
}
@@ -1121,7 +1142,8 @@ public class FaceletViewDeclarationLangu
// target is ActionSource2
methodExpression = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
- attributeExpressionString, null, EMPTY_CLASS_ARRAY), attributeNameValueExpression);
+ attributeExpressionString, null,
+ EMPTY_CLASS_ARRAY), attributeNameValueExpression);
//Store the method expression to the topLevelComponent to allow reference it through EL
if (!ccAttrMeRedirection)
@@ -1129,26 +1151,31 @@ public class FaceletViewDeclarationLangu
//Replace it with a method expression
topLevelComponent.getAttributes().put(attributeName, methodExpression);
}
- // Otherwise keep the current ValueExpression, because it will be used chain other value expressions
+ // Otherwise keep the current ValueExpression,
+ // because it will be used chain other value expressions
}
else if ("actionListener".equals(targetAttributeName))
{
// target is ActionSource2
methodExpression = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
- attributeExpressionString, Void.TYPE, ACTION_LISTENER_SIGNATURE), attributeNameValueExpression);
+ attributeExpressionString, Void.TYPE, ACTION_LISTENER_SIGNATURE),
+ attributeNameValueExpression);
methodExpression2 = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
- attributeExpressionString, Void.TYPE, EMPTY_CLASS_ARRAY), attributeNameValueExpression);
+ attributeExpressionString, Void.TYPE, EMPTY_CLASS_ARRAY),
+ attributeNameValueExpression);
//Store the method expression to the topLevelComponent to allow reference it through EL
if (!ccAttrMeRedirection)
{
//Replace it with a method expression
- topLevelComponent.getAttributes().put(attributeName, new MethodExpressionMethodExpression(methodExpression, methodExpression2));
+ topLevelComponent.getAttributes().put(attributeName,
+ new MethodExpressionMethodExpression(methodExpression, methodExpression2));
}
- // Otherwise keep the current ValueExpression, because it will be used chain other value expressions
+ // Otherwise keep the current ValueExpression,
+ // because it will be used chain other value expressions
}
else if ("validator".equals(targetAttributeName))
{
@@ -1164,7 +1191,8 @@ public class FaceletViewDeclarationLangu
//Replace it with a method expression
topLevelComponent.getAttributes().put(attributeName, methodExpression);
}
- // Otherwise keep the current ValueExpression, because it will be used chain other value expressions
+ // Otherwise keep the current ValueExpression,
+ // because it will be used chain other value expressions
}
else if ("valueChangeListener".equals(targetAttributeName))
{
@@ -1183,7 +1211,8 @@ public class FaceletViewDeclarationLangu
if (!ccAttrMeRedirection)
{
//Replace it with a method expression
- topLevelComponent.getAttributes().put(attributeName, new MethodExpressionMethodExpression(methodExpression, methodExpression2));
+ topLevelComponent.getAttributes().put(attributeName,
+ new MethodExpressionMethodExpression(methodExpression, methodExpression2));
}
// Otherwise keep the current ValueExpression, because it will be used chain other value expressions
}
@@ -1192,12 +1221,12 @@ public class FaceletViewDeclarationLangu
for (String target : targetsArray)
{
- UIComponent innerComponent = ComponentSupport.findComponentChildOrFacetFrom(context, topLevelComponentBase, target);
+ UIComponent innerComponent
+ = ComponentSupport.findComponentChildOrFacetFrom(context, topLevelComponentBase,
+ target);
if (innerComponent == null)
{
- //if (log.isLoggable(Level.SEVERE))
- // log.severe("Inner component " + target + " not found when retargetMethodExpressions");
continue;
}
@@ -1214,14 +1243,18 @@ public class FaceletViewDeclarationLangu
if ("action".equals(targetAttributeName))
{
// target is ActionSource2
- methodExpression = reWrapMethodExpression(context.getApplication().getExpressionFactory().
+ methodExpression
+ = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
- attributeExpressionString, null, EMPTY_CLASS_ARRAY), attributeNameValueExpression);
+ attributeExpressionString, null, EMPTY_CLASS_ARRAY),
+ attributeNameValueExpression);
- // If it is a redirection, a wrapper is used to locate the right instance and call it properly.
+ // If it is a redirection, a wrapper is used to
+ // locate the right instance and call it properly.
if (ccAttrMeRedirection)
{
- ((ActionSource2) innerComponent).setActionExpression(new ValueExpressionMethodExpression(attributeNameValueExpression));
+ ((ActionSource2) innerComponent).setActionExpression(
+ new ValueExpressionMethodExpression(attributeNameValueExpression));
}
else
{
@@ -1231,7 +1264,8 @@ public class FaceletViewDeclarationLangu
else if ("actionListener".equals(targetAttributeName))
{
//First try to remove any prevous target if any
- ActionListener o = (ActionListener) mctx.removeMethodExpressionTargeted(innerComponent, targetAttributeName);
+ ActionListener o = (ActionListener)
+ mctx.removeMethodExpressionTargeted(innerComponent, targetAttributeName);
if (o != null)
{
((ActionSource2) innerComponent).removeActionListener(o);
@@ -1242,13 +1276,14 @@ public class FaceletViewDeclarationLangu
// If it is a redirection, a wrapper is used to locate the right instance and call it properly.
if (ccAttrMeRedirection)
{
- actionListener = new RedirectMethodExpressionValueExpressionActionListener(attributeNameValueExpression);
+ actionListener = new RedirectMethodExpressionValueExpressionActionListener(
+ attributeNameValueExpression);
}
else
{
methodExpression = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
- attributeExpressionString, Void.TYPE, ACTION_LISTENER_SIGNATURE), attributeNameValueExpression);
+ attributeExpressionString, Void.TYPE, ACTION_LISTENER_SIGNATURE), attributeNameValueExpression);
methodExpression2 = reWrapMethodExpression(context.getApplication().getExpressionFactory().
createMethodExpression(elContext,
@@ -1443,8 +1478,10 @@ public class FaceletViewDeclarationLangu
targetAttributeName = attributeName;
}
- boolean isKnownTargetAttributeMethod = "action".equals(targetAttributeName) || "actionListener".equals(targetAttributeName)
- || "validator".equals(targetAttributeName) || "valueChangeListener".equals(targetAttributeName);
+ boolean isKnownTargetAttributeMethod = "action".equals(targetAttributeName)
+ || "actionListener".equals(targetAttributeName)
+ || "validator".equals(targetAttributeName)
+ || "valueChangeListener".equals(targetAttributeName);
// either the attributeName has to be a knownMethod or there has to be a method-signature
if (isKnownTargetAttributeMethod || methodSignature != null)
@@ -1481,7 +1518,8 @@ public class FaceletViewDeclarationLangu
}
@SuppressWarnings("unchecked")
- private MethodExpression reWrapMethodExpression(MethodExpression createdMethodExpression, ValueExpression originalValueExpression)
+ private MethodExpression reWrapMethodExpression(MethodExpression createdMethodExpression,
+ ValueExpression originalValueExpression)
{
if (originalValueExpression instanceof LocationValueExpression)
{
@@ -1939,16 +1977,19 @@ public class FaceletViewDeclarationLangu
long refreshPeriod;
if (context.isProjectStage(ProjectStage.Production))
{
- refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, DEFAULT_REFRESH_PERIOD_PRODUCTION);
+ refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD,
+ DEFAULT_REFRESH_PERIOD_PRODUCTION);
}
else
{
- refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, DEFAULT_REFRESH_PERIOD);
+ refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD,
+ DEFAULT_REFRESH_PERIOD);
}
// resource resolver
ResourceResolver resolver = new DefaultResourceResolver();
- String faceletsResourceResolverClassName = WebConfigParamUtils.getStringInitParameter(eContext, PARAMS_RESOURCE_RESOLVER, null);
+ String faceletsResourceResolverClassName = WebConfigParamUtils.getStringInitParameter(eContext,
+ PARAMS_RESOURCE_RESOLVER, null);
if (faceletsResourceResolverClassName != null)
{
ArrayList<String> classNames = new ArrayList<String>(1);
@@ -2396,8 +2437,12 @@ public class FaceletViewDeclarationLangu
if (_partialStateSaving)
{
_refreshTransientBuildOnPSS = MyfacesConfig.getCurrentInstance(context).isRefreshTransientBuildOnPSS();
- _refreshTransientBuildOnPSSAuto = MyfacesConfig.getCurrentInstance(context).isRefreshTransientBuildOnPSSAuto();
- _markInitialStateWhenApplyBuildView = WebConfigParamUtils.getBooleanInitParameter(context, PARAM_MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW, false);
+
+ _refreshTransientBuildOnPSSAuto
+ = MyfacesConfig.getCurrentInstance(context).isRefreshTransientBuildOnPSSAuto();
+
+ _markInitialStateWhenApplyBuildView = WebConfigParamUtils.getBooleanInitParameter(context,
+ PARAM_MARK_INITIAL_STATE_WHEN_APPLY_BUILD_VIEW, false);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java Sat Oct 29 09:28:45 2011
@@ -322,8 +322,8 @@ final class CompilationManager
" and uses the tag " + qName + " , but no TagLibrary associated to namespace. "+
"Please check the namespace name and if it is correct, it is probably that your " +
"library .taglib.xml cannot be found on the current classpath, or if you are " +
- "referencing a composite component library check your library folder match with the namespace and " +
- "can be located by the installed ResourceHandler.");
+ "referencing a composite component library check your library folder match with the " +
+ "namespace and can be located by the installed ResourceHandler.");
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java Sat Oct 29 09:28:45 2011
@@ -102,8 +102,8 @@ public abstract class Compiler
if (!this.createTagLibrary().containsNamespace(UILibrary.NAMESPACE))
{
- log
- .severe("Missing Built-in Tag Libraries! Make sure they are included within the META-INF directory of Facelets' Jar");
+ log.severe("Missing Built-in Tag Libraries! Make sure they are included within "
+ + "the META-INF directory of Facelets' Jar");
}
}
@@ -128,8 +128,8 @@ public abstract class Compiler
return this.doCompile(src, alias);
}
- public final FaceletHandler compileViewMetadata(URL src, String alias) throws IOException, FaceletException, ELException,
- FacesException
+ public final FaceletHandler compileViewMetadata(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException
{
if (!this.initialized)
{
@@ -138,8 +138,8 @@ public abstract class Compiler
return this.doCompileViewMetadata(src, alias);
}
- public final FaceletHandler compileCompositeComponentMetadata(URL src, String alias) throws IOException, FaceletException, ELException,
- FacesException
+ public final FaceletHandler compileCompositeComponentMetadata(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException
{
if (!this.initialized)
{
@@ -148,14 +148,14 @@ public abstract class Compiler
return this.doCompileCompositeComponentMetadata(src, alias);
}
- protected abstract FaceletHandler doCompile(URL src, String alias) throws IOException, FaceletException,
- ELException, FacesException;
+ protected abstract FaceletHandler doCompile(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException;
- protected abstract FaceletHandler doCompileViewMetadata(URL src, String alias) throws IOException, FaceletException,
- ELException, FacesException;
+ protected abstract FaceletHandler doCompileViewMetadata(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException;
- protected abstract FaceletHandler doCompileCompositeComponentMetadata(URL src, String alias) throws IOException, FaceletException,
- ELException, FacesException;
+ protected abstract FaceletHandler doCompileCompositeComponentMetadata(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException;
public final TagDecorator createTagDecorator()
{
@@ -186,7 +186,8 @@ public abstract class Compiler
el = FacesContext.getCurrentInstance().getApplication().getExpressionFactory();
if (el == null)
{
- log.warning("No default ExpressionFactory from Faces Implementation, attempting to load from Feature["
+ log.warning("No default ExpressionFactory from Faces Implementation, "
+ + "attempting to load from Feature["
+ EXPRESSION_FACTORY + "]");
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java Sat Oct 29 09:28:45 2011
@@ -439,7 +439,7 @@ public final class SAXCompiler extends C
}
if (inMetadata)
{
- this.unit.pushTag(new Tag(this.createLocation(), uri, localName, qName, this.createAttributes(attributes)));
+ this.unit.pushTag(new Tag(createLocation(), uri, localName, qName, createAttributes(attributes)));
}
}
@@ -454,11 +454,11 @@ public final class SAXCompiler extends C
public void processingInstruction(String target, String data) throws SAXException
{
- if (this.inDocument && inMetadata && !this.unit.getFaceletsProcessingInstructions().isConsumeProcessingInstructions())
+ if (inDocument && inMetadata && !unit.getFaceletsProcessingInstructions().isConsumeProcessingInstructions())
{
StringBuffer sb = new StringBuffer(64);
sb.append("<?").append(target).append(' ').append(data).append("?>\n");
- this.unit.writeInstruction(sb.toString());
+ unit.writeInstruction(sb.toString());
}
}
}
@@ -504,7 +504,7 @@ public final class SAXCompiler extends C
public void comment(char[] ch, int start, int length) throws SAXException
{
- if (this.inDocument && inCompositeInterface && !unit.getFaceletsProcessingInstructions().isConsumeXMLComments())
+ if (inDocument && inCompositeInterface && !unit.getFaceletsProcessingInstructions().isConsumeXMLComments())
{
this.unit.writeComment(new String(ch, start, length));
}
@@ -669,7 +669,7 @@ public final class SAXCompiler extends C
if (inCompositeInterface)
{
- this.unit.pushTag(new Tag(this.createLocation(), uri, localName, qName, this.createAttributes(attributes)));
+ this.unit.pushTag(new Tag(createLocation(), uri, localName, qName, createAttributes(attributes)));
}
else if (inCompositeImplementation && CompositeLibrary.NAMESPACE.equals(uri))
{
@@ -678,7 +678,7 @@ public final class SAXCompiler extends C
"insertChildren".equals(localName) ||
ImplementationHandler.NAME.equals(localName) )
{
- this.unit.pushTag(new Tag(this.createLocation(), uri, localName, qName, this.createAttributes(attributes)));
+ this.unit.pushTag(new Tag(createLocation(), uri, localName, qName, createAttributes(attributes)));
}
}
}
@@ -694,7 +694,8 @@ public final class SAXCompiler extends C
public void processingInstruction(String target, String data) throws SAXException
{
- if (this.inDocument && inCompositeInterface && !this.unit.getFaceletsProcessingInstructions().isConsumeProcessingInstructions())
+ if (inDocument && inCompositeInterface
+ && !unit.getFaceletsProcessingInstructions().isConsumeProcessingInstructions())
{
StringBuffer sb = new StringBuffer(64);
sb.append("<?").append(target).append(' ').append(data).append("?>\n");
@@ -708,8 +709,8 @@ public final class SAXCompiler extends C
super();
}
- public FaceletHandler doCompile(URL src, String alias) throws IOException, FaceletException, ELException,
- FacesException
+ public FaceletHandler doCompile(URL src, String alias)
+ throws IOException, FaceletException, ELException, FacesException
{
CompilationManager mngr = null;
InputStream is = null;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java Sat Oct 29 09:28:45 2011
@@ -61,7 +61,8 @@ import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
/**
- * Handles creating a {@link org.apache.myfaces.view.facelets.tag.TagLibrary TagLibrary} from a {@link java.net.URL URL} source.
+ * Handles creating a {@link org.apache.myfaces.view.facelets.tag.TagLibrary TagLibrary}
+ * from a {@link java.net.URL URL} source.
*
* @author Jacob Hookom
* @version $Id$
@@ -694,8 +695,9 @@ public final class TagLibraryConfig
}
}
- private static final SAXParser createSAXParser(LibraryHandler handler, ExternalContext externalContext, boolean schemaValidating) throws SAXException,
- ParserConfigurationException
+ private static final SAXParser createSAXParser(LibraryHandler handler, ExternalContext externalContext,
+ boolean schemaValidating)
+ throws SAXException, ParserConfigurationException
{
SAXParserFactory factory = SAXParserFactory.newInstance();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Sat Oct 29 09:28:45 2011
@@ -237,7 +237,8 @@ final class TextUnit extends Compilation
for (Iterator<Object> it = messages.iterator(); it.hasNext();)
{
Object[] message = (Object[])it.next();
- this.addInstruction(new AddFacesMessageInstruction((FacesMessage.Severity) message[0], (String)message[1], (String)message[2]));
+ this.addInstruction(new AddFacesMessageInstruction((FacesMessage.Severity) message[0],
+ (String)message[1], (String)message[2]));
it.remove();
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java Sat Oct 29 09:28:45 2011
@@ -94,47 +94,6 @@ final class UIInstructionHandler extends
if (mctx.isRefreshingTransientBuild())
{
c = ComponentSupport.findChildByTagId(parent, id);
- /*
- if (c == null && mctx.isRefreshTransientBuildOnPSS() &&
- mctx.isRefreshingTransientBuild() && UIComponent.isCompositeComponent(parent))
- {
- String facetName = this.getFacetName(ctx, 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)
@@ -168,7 +127,8 @@ final class UIInstructionHandler extends
// mark it owned by a facelet instance
//c.setId(ComponentSupport.getViewRoot(ctx, parent).createUniqueId());
- UniqueIdVendor uniqueIdVendor = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
+ UniqueIdVendor uniqueIdVendor
+ = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
if (uniqueIdVendor == null)
{
uniqueIdVendor = ComponentSupport.getViewRoot(ctx, parent);
@@ -202,46 +162,6 @@ final class UIInstructionHandler extends
}
}
}
- /*
- 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.
- String facetName = this.getFacetName(ctx, parent);
- 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 (!componentFoundInserted)
{
if (componentFound && mctx.isRefreshingTransientBuild())
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILiteralTextHandler.java Sat Oct 29 09:28:45 2011
@@ -46,9 +46,8 @@ final class UILiteralTextHandler extends
if (parent != null)
{
UIComponent c = new UILiteralText(this.txtString);
- //c.setId(ComponentSupport.getViewRoot(ctx, parent).createUniqueId());
- //AbstractFaceletContext actx = (AbstractFaceletContext) ctx;
- UniqueIdVendor uniqueIdVendor = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
+ UniqueIdVendor uniqueIdVendor
+ = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
if (uniqueIdVendor == null)
{
uniqueIdVendor = ComponentSupport.getViewRoot(ctx, parent);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UITextHandler.java Sat Oct 29 09:28:45 2011
@@ -62,9 +62,9 @@ final class UITextHandler extends Abstra
{
ELText nt = this.txt.apply(ctx.getExpressionFactory(), ctx);
UIComponent c = new UIText(this.alias, nt);
- //c.setId(ComponentSupport.getViewRoot(ctx, parent).createUniqueId());
- UniqueIdVendor uniqueIdVendor = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
+ UniqueIdVendor uniqueIdVendor
+ = FaceletCompositionContext.getCurrentInstance(ctx).getUniqueIdVendorFromStack();
if (uniqueIdVendor == null)
{
uniqueIdVendor = ComponentSupport.getViewRoot(ctx, parent);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java Sat Oct 29 09:28:45 2011
@@ -69,7 +69,8 @@ public final class CompositeComponentELU
* - [^\\.]* - There must be no dot after cc.attrs to indicate a method invocation on cc.attrs
* - (\\(.*)? - If there is a left paranthesis after cc.attrs, a dot is allowed again
*/
- public static final Pattern CC_ATTRS_METHOD_EXPRESSION_REGEX = Pattern.compile("[^\\(]*[^\\w\\.\\(]cc\\.attrs\\.[^\\.]*(\\(.*)?");
+ public static final Pattern CC_ATTRS_METHOD_EXPRESSION_REGEX
+ = Pattern.compile("[^\\(]*[^\\w\\.\\(]cc\\.attrs\\.[^\\.]*(\\(.*)?");
private static final String CC = "cc";
@@ -119,7 +120,8 @@ public final class CompositeComponentELU
}
//2. Look on the stack using a recursive algorithm.
- UIComponent matchingCompositeComponent = lookForCompositeComponentOnStack(facesContext, location, currentComponent);
+ UIComponent matchingCompositeComponent
+ = lookForCompositeComponentOnStack(facesContext, location, currentComponent);
if (matchingCompositeComponent != null)
{
@@ -157,7 +159,8 @@ public final class CompositeComponentELU
{
while (foundComponent != null)
{
- Location componentLocation = (Location) foundComponent.getAttributes().get(LOCATION_KEY);
+ Location componentLocation
+ = (Location) foundComponent.getAttributes().get(LOCATION_KEY);
if (componentLocation != null
&& componentLocation.getPath().equals(location.getPath()))
{
@@ -199,7 +202,9 @@ public final class CompositeComponentELU
return null;
}
- private static UIComponent lookForCompositeComponentOnStack(final FacesContext facesContext, final Location location, UIComponent currentComponent)
+ private static UIComponent lookForCompositeComponentOnStack(final FacesContext facesContext,
+ final Location location,
+ UIComponent currentComponent)
{
if (UIComponent.isCompositeComponent(currentComponent))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java Sat Oct 29 09:28:45 2011
@@ -28,7 +28,9 @@ import javax.faces.view.Location;
*
* @see ContextAware
*/
-public class ContextAwarePropertyNotFoundException extends javax.el.PropertyNotFoundException implements ContextAwareExceptionWrapper
+public class ContextAwarePropertyNotFoundException
+ extends javax.el.PropertyNotFoundException
+ implements ContextAwareExceptionWrapper
{
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotWritableException.java Sat Oct 29 09:28:45 2011
@@ -28,7 +28,9 @@ import javax.faces.view.Location;
*
* @see ContextAware
*/
-public class ContextAwarePropertyNotWritableException extends javax.el.PropertyNotWritableException implements ContextAwareExceptionWrapper
+public class ContextAwarePropertyNotWritableException
+ extends javax.el.PropertyNotWritableException
+ implements ContextAwareExceptionWrapper
{
private ContextAwareExceptionWrapper _delegate;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagMethodExpression.java Sat Oct 29 09:28:45 2011
@@ -39,7 +39,9 @@ import javax.faces.view.facelets.TagAttr
* @author Jacob Hookom
* @version $Id$
*/
-public final class ContextAwareTagMethodExpression extends MethodExpression implements Externalizable, FacesWrapper<MethodExpression>, ContextAware
+public final class ContextAwareTagMethodExpression
+ extends MethodExpression
+ implements Externalizable, FacesWrapper<MethodExpression>, ContextAware
{
private static final long serialVersionUID = 1L;
@@ -70,7 +72,7 @@ public final class ContextAwareTagMethod
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (MethodNotFoundException mnfe)
{
@@ -95,7 +97,7 @@ public final class ContextAwareTagMethod
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (MethodNotFoundException mnfe)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareTagValueExpression.java Sat Oct 29 09:28:45 2011
@@ -38,7 +38,9 @@ import javax.faces.view.facelets.TagAttr
* @author Jacob Hookom
* @version $Id$
*/
-public class ContextAwareTagValueExpression extends ValueExpression implements Externalizable, FacesWrapper<ValueExpression>, ContextAware
+public class ContextAwareTagValueExpression
+ extends ValueExpression
+ implements Externalizable, FacesWrapper<ValueExpression>, ContextAware
{
private static final long serialVersionUID = 1L;
@@ -74,7 +76,7 @@ public class ContextAwareTagValueExpress
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (ELException e)
{
@@ -95,7 +97,7 @@ public class ContextAwareTagValueExpress
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (ELException e)
{
@@ -130,7 +132,7 @@ public class ContextAwareTagValueExpress
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (ELException e)
{
@@ -152,11 +154,12 @@ public class ContextAwareTagValueExpress
}
catch (PropertyNotFoundException pnfe)
{
- throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(), pnfe);
+ throw new ContextAwarePropertyNotFoundException(getLocation(), getLocalExpressionString(), getQName(),pnfe);
}
catch (PropertyNotWritableException pnwe)
{
- throw new ContextAwarePropertyNotWritableException(getLocation(), getLocalExpressionString(), getQName(), pnwe);
+ throw new ContextAwarePropertyNotWritableException(getLocation(), getLocalExpressionString(),
+ getQName(), pnwe);
}
catch (ELException e)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareUtils.java Sat Oct 29 09:28:45 2011
@@ -27,16 +27,19 @@ import org.apache.myfaces.shared.util.We
public class ContextAwareUtils
{
/**
- * Wrap exception caused by calls to EL expressions, so information like the location, expression string and tag name can be retrieved by
+ * Wrap exception caused by calls to EL expressions, so information like
+ * the location, expression string and tag name can be retrieved by
* the ExceptionHandler implementation and used to output meaningful information about itself.
*
- * <p>Note in some cases this will wrap the original javax.el.ELException, so the information will not be on the stack trace unless ExceptionHandler
+ * <p>Note in some cases this will wrap the original javax.el.ELException, so the
+ * information will not be on the stack trace unless ExceptionHandler
* retrieve checking if the exception implements ContextAware interface and calling getWrapped() method.
* </p>
*
*/
@JSFWebConfigParam(since="2.0.9, 2.1.3" , defaultValue="true", expectedValues="true, false")
- public static final String INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE = "org.apache.myfaces.WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE";
+ public static final String INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE
+ = "org.apache.myfaces.WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE";
public static boolean isWrapTagExceptionsAsContextAware(ELContext context)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java Sat Oct 29 09:28:45 2011
@@ -35,7 +35,8 @@ import org.apache.myfaces.util.ExternalS
import org.apache.myfaces.view.facelets.AbstractFaceletContext;
/**
- * Handles parsing EL Strings in accordance with the EL-API Specification. The parser accepts either <code>${..}</code>
+ * Handles parsing EL Strings in accordance with the EL-API Specification.
+ * The parser accepts either <code>${..}</code>
* or <code>#{..}</code>.
*
* @author Jacob Hookom
@@ -240,7 +241,8 @@ public class ELText
{
super(ve.getExpressionString());
this.ve = ve;
- boolean compositeComponentExpression = CompositeComponentELUtils.isCompositeComponentExpression(ve.getExpressionString());
+ boolean compositeComponentExpression
+ = CompositeComponentELUtils.isCompositeComponentExpression(ve.getExpressionString());
boolean resourceExpression = ResourceELUtils.isResourceExpression(ve.getExpressionString());
this.capabilities = (compositeComponentExpression ? EL_CC : 0) | ( resourceExpression ? EL_RESOURCE : 0);
}
@@ -262,7 +264,8 @@ public class ELText
actx.beforeConstructELExpression();
try
{
- ValueExpression valueExpression = factory.createValueExpression(ctx, this.ve.getExpressionString(), String.class);
+ ValueExpression valueExpression
+ = factory.createValueExpression(ctx, this.ve.getExpressionString(), String.class);
if ((this.capabilities & EL_CC) != 0)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/MethodExpressionMethodExpression.java Sat Oct 29 09:28:45 2011
@@ -45,14 +45,16 @@ public class MethodExpressionMethodExpre
{
}
- public MethodExpressionMethodExpression(MethodExpression methodExpressionOneArg, MethodExpression methodExpressionZeroArg)
+ public MethodExpressionMethodExpression(MethodExpression methodExpressionOneArg,
+ MethodExpression methodExpressionZeroArg)
{
this.methodExpressionOneArg = methodExpressionOneArg;
this.methodExpressionZeroArg = methodExpressionZeroArg;
}
@Override
- public MethodInfo getMethodInfo(ELContext context) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException
+ public MethodInfo getMethodInfo(ELContext context)
+ throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException
{
try
{
@@ -67,7 +69,8 @@ public class MethodExpressionMethodExpre
}
@Override
- public Object invoke(ELContext context, Object[] params) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException
+ public Object invoke(ELContext context, Object[] params)
+ throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException
{
try
{
@@ -120,7 +123,8 @@ public class MethodExpressionMethodExpre
if (obj instanceof MethodExpressionMethodExpression)
{
MethodExpressionMethodExpression me = (MethodExpressionMethodExpression) obj;
- return methodExpressionOneArg.equals(me.methodExpressionOneArg) && methodExpressionZeroArg.equals(me.methodExpressionZeroArg);
+ return methodExpressionOneArg.equals(me.methodExpressionOneArg) &&
+ methodExpressionZeroArg.equals(me.methodExpressionZeroArg);
}
return false;
}
@@ -128,7 +132,7 @@ public class MethodExpressionMethodExpre
@Override
public int hashCode()
{
- int hash = 3;
+ int hash = 31;
hash = 19 * hash + (this.methodExpressionOneArg != null ? this.methodExpressionOneArg.hashCode() : 0);
hash = 19 * hash + (this.methodExpressionZeroArg != null ? this.methodExpressionZeroArg.hashCode() : 0);
return hash;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/RedirectMethodExpressionValueExpressionValidator.java Sat Oct 29 09:28:45 2011
@@ -53,7 +53,8 @@ public class RedirectMethodExpressionVal
public void validate(FacesContext context, UIComponent component,
Object value) throws ValidatorException
{
- getMethodExpression().invoke(FacesContext.getCurrentInstance().getELContext(), new Object[]{context,component,value});
+ getMethodExpression().invoke(FacesContext.getCurrentInstance().getELContext(),
+ new Object[]{context,component,value});
}
private MethodExpression getMethodExpression()
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/TagMethodExpression.java Sat Oct 29 09:28:45 2011
@@ -38,7 +38,9 @@ import javax.faces.view.facelets.TagAttr
* @author Jacob Hookom
* @version $Id$
*/
-public final class TagMethodExpression extends MethodExpression implements Externalizable, FacesWrapper<MethodExpression>
+public final class TagMethodExpression
+ extends MethodExpression
+ implements Externalizable, FacesWrapper<MethodExpression>
{
private static final long serialVersionUID = 1L;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java Sat Oct 29 09:28:45 2011
@@ -111,7 +111,8 @@ final class DefaultFacelet extends Abstr
}
/**
- * @see org.apache.myfaces.view.facelets.Facelet#apply(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+ * @see org.apache.myfaces.view.facelets.Facelet#apply(javax.faces.context.FacesContext,
+ * javax.faces.component.UIComponent)
*/
public void apply(FacesContext facesContext, UIComponent parent) throws IOException, FacesException,
FaceletException, ELException
@@ -138,7 +139,8 @@ final class DefaultFacelet extends Abstr
// push the parent as a UniqueIdVendor to the stack here,
// if there is no UniqueIdVendor on the stack yet
boolean pushedUniqueIdVendor = false;
- if (parent instanceof UniqueIdVendor && ctx.getFaceletCompositionContext().getUniqueIdVendorFromStack() == null)
+ if (parent instanceof UniqueIdVendor
+ && ctx.getFaceletCompositionContext().getUniqueIdVendorFromStack() == null)
{
ctx.getFaceletCompositionContext().pushUniqueIdVendorToStack((UniqueIdVendor) parent);
pushedUniqueIdVendor = true;
@@ -360,8 +362,8 @@ final class DefaultFacelet extends Abstr
* @throws FaceletException
* @throws ELException
*/
- public void include(AbstractFaceletContext ctx, UIComponent parent, String path) throws IOException, FacesException,
- FaceletException, ELException
+ public void include(AbstractFaceletContext ctx, UIComponent parent, String path)
+ throws IOException, FacesException, FaceletException, ELException
{
URL url = this.getRelativePath(path);
this.include(ctx, parent, url);
@@ -389,8 +391,8 @@ final class DefaultFacelet extends Abstr
f.include(ctx, parent);
}
- public void applyCompositeComponent(AbstractFaceletContext ctx, UIComponent parent, Resource resource) throws IOException, FacesException,
- FaceletException, ELException
+ public void applyCompositeComponent(AbstractFaceletContext ctx, UIComponent parent, Resource resource)
+ throws IOException, FacesException, FaceletException, ELException
{
// Here we are creating a facelet using the url provided by the resource.
// It works, but the Resource API provides getInputStream() for that. But the default
@@ -407,7 +409,8 @@ final class DefaultFacelet extends Abstr
// if there is no UniqueIdVendor on the stack yet
boolean pushedUniqueIdVendor = false;
FaceletCompositionContext mctx = ctx.getFaceletCompositionContext();
- if (parent instanceof UniqueIdVendor && ctx.getFaceletCompositionContext().getUniqueIdVendorFromStack() == null)
+ if (parent instanceof UniqueIdVendor
+ && ctx.getFaceletCompositionContext().getUniqueIdVendorFromStack() == null)
{
mctx.pushUniqueIdVendorToStack((UniqueIdVendor) parent);
pushedUniqueIdVendor = true;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java Sat Oct 29 09:28:45 2011
@@ -57,7 +57,8 @@ import org.apache.myfaces.view.facelets.
* Default FaceletContext implementation.
*
* A single FaceletContext is used for all Facelets involved in an invocation of
- * {@link org.apache.myfaces.view.facelets.Facelet#apply(FacesContext, UIComponent) Facelet#apply(FacesContext, UIComponent)}. This
+ * {@link org.apache.myfaces.view.facelets.Facelet#apply(FacesContext, UIComponent)
+ * Facelet#apply(FacesContext, UIComponent)}. This
* means that included Facelets are treated the same as the JSP include directive.
*
* @author Jacob Hookom
@@ -318,65 +319,6 @@ final class DefaultFaceletContext extend
_uniqueIdBuilder.append("_");
_uniqueIdBuilder.append(base);
return _uniqueIdBuilder.toString();
- /*
- if (_prefix == null)
- {
- StringBuilder builder = new StringBuilder(
- _faceletHierarchy.size() * 30);
- for (int i = 0; i < _faceletHierarchy.size(); i++)
- {
- AbstractFacelet facelet = _faceletHierarchy.get(i);
- builder.append(facelet.getAlias());
- }
-
- // Integer prefixInt = new Integer(builder.toString().hashCode());
- // -= Leonardo Uribe =- if the previous formula is used, it is possible that
- // negative values are introduced. The presence of '-' char causes problems
- // with htmlunit 2.4 or lower, so in order to prevent it it is better to use
- // only positive values instead.
- // Take into account CompilationManager.nextTagId() uses Math.abs too.
- Integer prefixInt = new Integer(Math.abs(builder.toString().hashCode()));
-
- Integer cnt = _prefixes.get(prefixInt);
- if (cnt == null)
- {
- _prefixes.put(prefixInt, Integer.valueOf(0));
- _prefix = prefixInt.toString();
- }
- else
- {
- int i = cnt.intValue() + 1;
- _prefixes.put(prefixInt, Integer.valueOf(i));
- _prefix = prefixInt + "_" + i;
- }
- }
-
- Integer cnt = _ids.get(base);
- if (cnt == null)
- {
- _ids.put(base, Integer.valueOf(0));
- _uniqueIdBuilder.delete(0, _uniqueIdBuilder.length());
- _uniqueIdBuilder.append(getFaceletCompositionContext().generateUniqueId());
- _uniqueIdBuilder.append("_");
- _uniqueIdBuilder.append(_prefix);
- _uniqueIdBuilder.append("_");
- _uniqueIdBuilder.append(base);
- return _uniqueIdBuilder.toString();
- }
- else
- {
- int i = cnt.intValue() + 1;
- _ids.put(base, Integer.valueOf(i));
- _uniqueIdBuilder.delete(0, _uniqueIdBuilder.length());
- _uniqueIdBuilder.append(getFaceletCompositionContext().generateUniqueId());
- _uniqueIdBuilder.append("_");
- _uniqueIdBuilder.append(_prefix);
- _uniqueIdBuilder.append("_");
- _uniqueIdBuilder.append(base);
- _uniqueIdBuilder.append("_");
- _uniqueIdBuilder.append(i);
- return _uniqueIdBuilder.toString();
- }*/
}
/**
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=1194849&r1=1194848&r2=1194849&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 09:28:45 2011
@@ -103,7 +103,8 @@ public final class DefaultFaceletFactory
_refreshPeriod = refreshPeriod < 0 ? INFINITE_DELAY : refreshPeriod * 1000;
// facelet cache. Lookup here, because after all this is a "part" of the facelet factory implementation.
- FaceletCacheFactory cacheFactory = (FaceletCacheFactory) FactoryFinder.getFactory(FactoryFinder.FACELET_CACHE_FACTORY);
+ FaceletCacheFactory cacheFactory
+ = (FaceletCacheFactory) FactoryFinder.getFactory(FactoryFinder.FACELET_CACHE_FACTORY);
_faceletCache = (FaceletCache<Facelet>) cacheFactory.getFaceletCache();
FaceletCache.MemberFactory<Facelet> faceletFactory = new FaceletCache.MemberFactory<Facelet>()
@@ -135,7 +136,8 @@ public final class DefaultFaceletFactory
}
catch (Exception e)
{
- throw new FacesException("Cannot call setMemberFactories method, Initialization of FaceletCache failed.", e);
+ throw new FacesException("Cannot call setMemberFactories method, Initialization of FaceletCache failed.",
+ e);
}
if (log.isLoggable(Level.FINE))
@@ -195,25 +197,6 @@ public final class DefaultFaceletFactory
public Facelet getFacelet(URL url) throws IOException, FaceletException, FacesException, ELException
{
return _faceletCache.getFacelet(url);
- /*
- ParameterCheck.notNull("url", url);
-
- String key = url.toString();
-
- DefaultFacelet f = _facelets.get(key);
-
- if (f == null || this.needsToBeRefreshed(f))
- {
- f = this._createFacelet(url);
- if (_refreshPeriod != NO_CACHE_DELAY)
- {
- Map<String, DefaultFacelet> newLoc = new HashMap<String, DefaultFacelet>(_facelets);
- newLoc.put(key, f);
- _facelets = newLoc;
- }
- }
-
- return f;*/
}
public long getRefreshPeriod()
@@ -341,7 +324,8 @@ public final class DefaultFaceletFactory
* @throws FacesException
* @throws ELException
*/
- private DefaultFacelet _createViewMetadataFacelet(URL url) throws IOException, FaceletException, FacesException, ELException
+ private DefaultFacelet _createViewMetadataFacelet(URL url)
+ throws IOException, FaceletException, FacesException, ELException
{
if (log.isLoggable(Level.FINE))
{
@@ -373,7 +357,8 @@ public final class DefaultFaceletFactory
* @throws FacesException
* @throws ELException
*/
- private DefaultFacelet _createCompositeComponentMetadataFacelet(URL url) throws IOException, FaceletException, FacesException, ELException
+ private DefaultFacelet _createCompositeComponentMetadataFacelet(URL url)
+ throws IOException, FaceletException, FacesException, ELException
{
if (log.isLoggable(Level.FINE))
{
@@ -429,26 +414,6 @@ public final class DefaultFaceletFactory
FaceletException, FacesException, ELException
{
return _faceletCache.getViewMetadataFacelet(url);
- /*
- ParameterCheck.notNull("url", url);
-
- String key = url.toString();
-
- DefaultFacelet f = _viewMetadataFacelets.get(key);
-
- if (f == null || this.needsToBeRefreshed(f))
- {
- f = this._createViewMetadataFacelet(url);
- if (_refreshPeriod != NO_CACHE_DELAY)
- {
- Map<String, DefaultFacelet> newLoc = new HashMap<String, DefaultFacelet>(_viewMetadataFacelets);
- newLoc.put(key, f);
- _viewMetadataFacelets = newLoc;
- }
- }
-
- return f;
- */
}
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java Sat Oct 29 09:28:45 2011
@@ -45,30 +45,38 @@ import java.util.Map;
public class FaceletCompositionContextImpl extends FaceletCompositionContext
{
/**
- * Indicates if expressions generated by facelets should be cached or not. Default is noCache. There there are four modes:
+ * Indicates if expressions generated by facelets should be cached or not.
+ * Default is noCache. There there are four modes:
*
* <ul>
- * <li>always: Only does not cache when expressions are inside user tags or the expression contains a variable resolved using VariableMapper</li>
- * <li>allowCset: Like always, but does not allow cache when ui:param was used on the current template context</li>
- * <li>strict: Like allowCset, but does not allow cache when c:set with var and value properties only is used on the current page context</li>
+ * <li>always: Only does not cache when expressions are inside user tags or the e
+ * xpression contains a variable resolved using VariableMapper</li>
+ * <li>allowCset: Like always, but does not allow cache when ui:param
+ * was used on the current template context</li>
+ * <li>strict: Like allowCset, but does not allow cache when c:set with
+ * var and value properties only is used on the current page context</li>
* <li>noCache: All expression are created each time the view is built</li>
* </ul>
*
*/
- @JSFWebConfigParam(since="2.0.8", defaultValue="noCache", expectedValues="noCache, strict, allowCset, always", group="EL", tags="performance")
+ @JSFWebConfigParam(since="2.0.8", defaultValue="noCache", expectedValues="noCache, strict, allowCset, always",
+ group="EL", tags="performance")
public static final String INIT_PARAM_CACHE_EL_EXPRESSIONS = "org.apache.myfaces.CACHE_EL_EXPRESSIONS";
/**
- * Wrap exception caused by calls to EL expressions, so information like the location, expression string and tag name can be retrieved by
+ * Wrap exception caused by calls to EL expressions, so information like
+ * the location, expression string and tag name can be retrieved by
* the ExceptionHandler implementation and used to output meaningful information about itself.
*
- * <p>Note in some cases this will wrap the original javax.el.ELException, so the information will not be on the stack trace unless ExceptionHandler
+ * <p>Note in some cases this will wrap the original javax.el.ELException,
+ * so the information will not be on the stack trace unless ExceptionHandler
* retrieve checking if the exception implements ContextAware interface and calling getWrapped() method.
* </p>
*
*/
@JSFWebConfigParam(since="2.0.9, 2.1.3" , defaultValue="true", expectedValues="true, false")
- public static final String INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE = "org.apache.myfaces.WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE";
+ public static final String INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE
+ = "org.apache.myfaces.WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE";
private FacesContext _facesContext;
@@ -392,7 +400,8 @@ public class FaceletCompositionContextIm
if (_elExpressionCacheMode == null)
{
String value = WebConfigParamUtils.getStringInitParameter(
- _facesContext.getExternalContext(), INIT_PARAM_CACHE_EL_EXPRESSIONS, ELExpressionCacheMode.noCache.name());
+ _facesContext.getExternalContext(),
+ INIT_PARAM_CACHE_EL_EXPRESSIONS, ELExpressionCacheMode.noCache.name());
_elExpressionCacheMode = Enum.valueOf(ELExpressionCacheMode.class, value);
}
@@ -404,7 +413,8 @@ public class FaceletCompositionContextIm
{
if (_isWrapTagExceptionsAsContextAware == null)
{
- _isWrapTagExceptionsAsContextAware = WebConfigParamUtils.getBooleanInitParameter(_facesContext.getExternalContext(),
+ _isWrapTagExceptionsAsContextAware
+ = WebConfigParamUtils.getBooleanInitParameter(_facesContext.getExternalContext(),
INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE, true);
}
return _isWrapTagExceptionsAsContextAware;
@@ -450,18 +460,6 @@ public class FaceletCompositionContextIm
map.put(attributeName, backingValue);
}
- /*
- @Override
- public Map<String, Object> getMethodExpressionsTargeted(UIComponent compositeComponentParent)
- {
- Map<String, Object> map = _methodExpressionsTargeted.get(compositeComponentParent);
- if (map == null)
- {
- map = Collections.emptyMap();
- }
- return map;
- }*/
-
public boolean isMethodExpressionAttributeApplied(UIComponent compositeComponentParent, String attributeName)
{
Map<String, Boolean> map = _compositeComponentAttributesMarked.get(compositeComponentParent);
@@ -649,7 +647,8 @@ public class FaceletCompositionContextIm
{
itr.remove();
}
- else if ( id == null && Boolean.TRUE.equals(fc.getAttributes().get(ComponentSupport.FACET_CREATED_UIPANEL_MARKER)))
+ else if (id == null
+ && Boolean.TRUE.equals(fc.getAttributes().get(ComponentSupport.FACET_CREATED_UIPANEL_MARKER)))
{
if (fc.getChildCount() > 0)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java?rev=1194849&r1=1194848&r2=1194849&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java Sat Oct 29 09:28:45 2011
@@ -107,7 +107,8 @@ public class TemplateContextImpl extends
}
@Override
- public void extendClient(final AbstractFaceletContext actx, final AbstractFacelet owner, final TemplateClient client)
+ public void extendClient(final AbstractFaceletContext actx, final AbstractFacelet owner,
+ final TemplateClient client)
{
_clients.addLast(new TemplateManagerImpl(owner, client, false, actx.getPageContext()));
_lastClient = _clients.getLast();