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/24 22:04:33 UTC
svn commit: r1188342 [1/2] - in
/myfaces/core/trunk/api/src/main/java/javax/faces: ./ application/
component/ component/behavior/ context/ event/
Author: struberg
Date: Mon Oct 24 20:04:32 2011
New Revision: 1188342
URL: http://svn.apache.org/viewvc?rev=1188342&view=rev
Log:
MYFACES-3368 fix bracelet and too long lines
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java
myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandler.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ClassUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToActionListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToValueChangeListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_UISelectItems.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java
myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialResponseWriter.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/MethodExpressionActionListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PostConstructCustomScopeEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ScopeContext.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/FactoryFinder.java Mon Oct 24 20:04:32 2011
@@ -109,14 +109,18 @@ public final class FactoryFinder
try
{
ClassLoader classLoader;
- if (System.getSecurityManager() != null) {
- classLoader = (ClassLoader) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction() {
- public Object run() {
+ if (System.getSecurityManager() != null)
+ {
+ classLoader = (ClassLoader) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction()
+ {
+ public Object run()
+ {
return FactoryFinder.class.getClassLoader();
}
});
}
- else {
+ else
+ {
classLoader = FactoryFinder.class.getClassLoader();
}
@@ -132,7 +136,7 @@ public final class FactoryFinder
}
}
- // ~ Start FactoryFinderProvider Support ------------------------------------------------------------------------------------
+ // ~ Start FactoryFinderProvider Support
private static Object _factoryFinderProviderFactoryInstance;
@@ -147,7 +151,7 @@ public final class FactoryFinder
}
}
- // ~ End FactoryFinderProvider Support ------------------------------------------------------------------------------------
+ // ~ End FactoryFinderProvider Support
// avoid instantiation
FactoryFinder()
@@ -204,27 +208,43 @@ public final class FactoryFinder
try
{
//Obtain the FactoryFinderProvider instance for this context.
- Object ffp = _FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD.invoke(
- _factoryFinderProviderFactoryInstance, null);
+ Object ffp = _FactoryFinderProviderFactory
+ .FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
+ .invoke(_factoryFinderProviderFactoryInstance, null);
//Call getFactory method and pass the params
- return _FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_GET_FACTORY_METHOD.invoke(ffp, factoryName);
- } catch (InvocationTargetException e) {
+ return _FactoryFinderProviderFactory
+ .FACTORY_FINDER_PROVIDER_GET_FACTORY_METHOD.invoke(ffp, factoryName);
+ } catch (InvocationTargetException e)
+ {
Throwable targetException = e.getCause();
- if (targetException instanceof NullPointerException) {
+ if (targetException instanceof NullPointerException)
+ {
throw (NullPointerException) targetException;
- } else if (targetException instanceof FacesException) {
+ }
+ else if (targetException instanceof FacesException)
+ {
throw (FacesException) targetException;
- } else if (targetException instanceof IllegalArgumentException) {
+ }
+ else if (targetException instanceof IllegalArgumentException)
+ {
throw (IllegalArgumentException) targetException;
- } else if (targetException instanceof IllegalStateException) {
+ }
+ else if (targetException instanceof IllegalStateException)
+ {
throw (IllegalStateException) targetException;
- } else if (targetException == null) {
+ }
+ else if (targetException == null)
+ {
throw new FacesException(e);
- } else {
+ }
+ else
+ {
throw new FacesException(targetException);
}
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
//No Op
throw new FacesException(e);
}
@@ -247,10 +267,14 @@ public final class FactoryFinder
if (factoryClassNames == null)
{
- String message = "No Factories configured for this Application. This happens if the faces-initialization "
- + "does not work at all - make sure that you properly include all configuration settings necessary for a basic faces application "
- + "and that all the necessary libs are included. Also check the logging output of your web application and your container for any exceptions!"
- + "\nIf you did that and find nothing, the mistake might be due to the fact that you use some special web-containers which "
+ String message
+ = "No Factories configured for this Application. This happens if the faces-initialization "
+ + "does not work at all - make sure that you properly include all configuration "
+ + "settings necessary for a basic faces application "
+ + "and that all the necessary libs are included. Also check the logging output of your "
+ + "web application and your container for any exceptions!"
+ + "\nIf you did that and find nothing, the mistake might be due to the fact "
+ + "that you use some special web-containers which "
+ "do not support registering context-listeners via TLD files and "
+ "a context listener is not setup in your web.xml.\n"
+ "A typical config looks like this;\n<listener>\n"
@@ -397,25 +421,40 @@ public final class FactoryFinder
try
{
//Obtain the FactoryFinderProvider instance for this context.
- Object ffp = _FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD.invoke(
- _factoryFinderProviderFactoryInstance,null);
+ Object ffp = _FactoryFinderProviderFactory
+ .FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
+ .invoke(_factoryFinderProviderFactoryInstance,null);
//Call getFactory method and pass the params
- _FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_SET_FACTORY_METHOD.invoke(ffp, factoryName, implName);
- } catch (InvocationTargetException e) {
+ _FactoryFinderProviderFactory
+ .FACTORY_FINDER_PROVIDER_SET_FACTORY_METHOD.invoke(ffp, factoryName, implName);
+ }
+ catch (InvocationTargetException e)
+ {
Throwable targetException = e.getCause();
- if (targetException instanceof NullPointerException) {
+ if (targetException instanceof NullPointerException)
+ {
throw (NullPointerException) targetException;
- } else if (targetException instanceof FacesException) {
+ }
+ else if (targetException instanceof FacesException)
+ {
throw (FacesException) targetException;
- } else if (targetException instanceof IllegalArgumentException) {
+ }
+ else if (targetException instanceof IllegalArgumentException)
+ {
throw (IllegalArgumentException) targetException;
- } else if (targetException == null) {
+ }
+ else if (targetException == null)
+ {
throw new FacesException(e);
- } else {
+ }
+ else
+ {
throw new FacesException(targetException);
}
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
//No Op
throw new FacesException(e);
}
@@ -477,8 +516,9 @@ public final class FactoryFinder
try
{
//Obtain the FactoryFinderProvider instance for this context.
- Object ffp = _FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD.invoke(
- _factoryFinderProviderFactoryInstance, null);
+ Object ffp = _FactoryFinderProviderFactory
+ .FACTORY_FINDER_PROVIDER_FACTORY_GET_FACTORY_FINDER_METHOD
+ .invoke(_factoryFinderProviderFactoryInstance, null);
//Call getFactory method and pass the params
_FactoryFinderProviderFactory.FACTORY_FINDER_PROVIDER_RELEASE_FACTORIES_METHOD.invoke(ffp, null);
@@ -533,14 +573,18 @@ public final class FactoryFinder
try
{
ClassLoader classLoader = null;
- if (System.getSecurityManager() != null) {
- classLoader = (ClassLoader) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction() {
- public Object run() {
+ if (System.getSecurityManager() != null)
+ {
+ classLoader = (ClassLoader) AccessController.doPrivileged(new java.security.PrivilegedExceptionAction()
+ {
+ public Object run()
+ {
return Thread.currentThread().getContextClassLoader();
}
});
}
- else {
+ else
+ {
classLoader = Thread.currentThread().getContextClassLoader();
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandler.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandler.java Mon Oct 24 20:04:32 2011
@@ -195,12 +195,16 @@ public abstract class ViewHandler
}
/**
- * Returns a URL, suitable for encoding and rendering, that (if activated) will cause the JSF request processing lifecycle for the specified viewId to be executed
+ * Returns a URL, suitable for encoding and rendering, that (if activated) will cause the JSF
+ * request processing lifecycle for the specified viewId to be executed
*/
public abstract String getActionURL(FacesContext context, String viewId);
/**
- * Return a JSF action URL derived from the viewId argument that is suitable to be used as the target of a link in a JSF response. Compiliant implementations must implement this method as specified in section JSF.7.5.2. The default implementation simply calls through to getActionURL(javax.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
+ * Return a JSF action URL derived from the viewId argument that is suitable to be used as
+ * the target of a link in a JSF response. Compiliant implementations must implement this method
+ * as specified in section JSF.7.5.2. The default implementation simply calls through to
+ * getActionURL(javax.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
*
* @param context
* @param viewId
@@ -229,8 +233,10 @@ public abstract class ViewHandler
*/
public ViewDeclarationLanguage getViewDeclarationLanguage(FacesContext context, String viewId)
{
- // TODO: In some places like RestoreViewExecutor, we are calling deriveViewId after call restoreViewSupport.calculateViewId
- // Maybe this method should be called from here, because it is supposed that calculateViewId "calculates the view id!"
+ // TODO: In some places like RestoreViewExecutor, we are calling deriveViewId
+ // TODO: after call restoreViewSupport.calculateViewId
+ // Maybe this method should be called from here, because it is supposed that
+ // calculateViewId "calculates the view id!"
// here we return null to support pre jsf 2.0 ViewHandlers (e.g. com.sun.facelets.FaceletViewHandler),
// because they don't provide any ViewDeclarationLanguage,
@@ -239,7 +245,11 @@ public abstract class ViewHandler
}
/**
- * Return a JSF action URL derived from the viewId argument that is suitable to be used by the NavigationHandler to issue a redirect request to the URL using a NonFaces request. Compiliant implementations must implement this method as specified in section JSF.7.5.2. The default implementation simply calls through to getActionURL(javax.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
+ * Return a JSF action URL derived from the viewId argument that is suitable to be used by
+ * the NavigationHandler to issue a redirect request to the URL using a NonFaces request.
+ * Compiliant implementations must implement this method as specified in section JSF.7.5.2.
+ * The default implementation simply calls through to
+ * getActionURL(javax.faces.context.FacesContext, java.lang.String), passing the arguments context and viewId.
*
* @param context
* @param viewId
@@ -256,16 +266,23 @@ public abstract class ViewHandler
}
/**
- * Returns a URL, suitable for encoding and rendering, that (if activated) will retrieve the specified web application resource.
+ * Returns a URL, suitable for encoding and rendering, that (if activated)
+ * will retrieve the specified web application resource.
*/
public abstract String getResourceURL(FacesContext context, String path);
/**
* Initialize the view for the request processing lifecycle.
* <P>
- * This method must be called at the beginning of the Restore View Phase of the Request Processing Lifecycle. It is responsible for performing any per-request initialization necessary to the operation of the lifycecle.
+ * This method must be called at the beginning of the Restore View Phase of the Request
+ * Processing Lifecycle. It is responsible for performing any per-request initialization
+ * necessary to the operation of the lifycecle.
* <P>
- * The default implementation must perform the following actions. If ExternalContext.getRequestCharacterEncoding() returns null, call calculateCharacterEncoding(javax.faces.context.FacesContext) and pass the result, if non-null, into the ExternalContext.setRequestCharacterEncoding(java.lang.String) method. If ExternalContext.getRequestCharacterEncoding() returns non-null take no action.
+ * The default implementation must perform the following actions. If
+ * ExternalContext.getRequestCharacterEncoding() returns null, call
+ * calculateCharacterEncoding(javax.faces.context.FacesContext) and pass the result,
+ * if non-null, into the ExternalContext.setRequestCharacterEncoding(java.lang.String) method.
+ * If ExternalContext.getRequestCharacterEncoding() returns non-null take no action.
*
* @since JSF 1.2
*/
@@ -286,23 +303,38 @@ public abstract class ViewHandler
}
/**
- * Perform whatever actions are required to render the response view to the response object associated with the current FacesContext.
+ * Perform whatever actions are required to render the response view to the
+ * response object associated with the current FacesContext.
* <P>
- * Otherwise, the default implementation must obtain a reference to the ViewDeclarationLanguage for the viewId of the argument viewToRender and call its ViewDeclarationLanguage.renderView(javax.faces.context.FacesContext, javax.faces.component.UIViewRoot) method, returning the result and not swallowing any exceptions thrown by that method.
+ * Otherwise, the default implementation must obtain a reference to the
+ * ViewDeclarationLanguage for the viewId of the argument viewToRender and call its
+ * ViewDeclarationLanguage.renderView(javax.faces.context.FacesContext, javax.faces.component.UIViewRoot)
+ * method, returning the result and not swallowing any exceptions thrown by that method.
*/
public abstract void renderView(FacesContext context, UIViewRoot viewToRender) throws IOException, FacesException;
/**
- * Perform whatever actions are required to restore the view associated with the specified FacesContext and viewId. It may delegate to the restoreView of the associated StateManager to do the actual work of restoring the view. If there is no available state for the specified viewId, return null.
+ * Perform whatever actions are required to restore the view associated with the
+ * specified FacesContext and viewId. It may delegate to the restoreView of the
+ * associated StateManager to do the actual work of restoring the view. If there
+ * is no available state for the specified viewId, return null.
* <P>
- * Otherwise, the default implementation must obtain a reference to the ViewDeclarationLanguage for this viewId and call its ViewDeclarationLanguage.restoreView(javax.faces.context.FacesContext, java.lang.String) method, returning the result and not swallowing any exceptions thrown by that method.
+ * Otherwise, the default implementation must obtain a reference to the
+ * ViewDeclarationLanguage for this viewId and call its
+ * ViewDeclarationLanguage.restoreView(javax.faces.context.FacesContext, java.lang.String)
+ * method, returning the result and not swallowing any exceptions thrown by that method.
*/
public abstract UIViewRoot restoreView(FacesContext context, String viewId);
/**
- * Take any appropriate action to either immediately write out the current state information (by calling StateManager.writeState(javax.faces.context.FacesContext, java.lang.Object), or noting where state information should later be written.
+ * Take any appropriate action to either immediately write out the current state information
+ * (by calling StateManager.writeState(javax.faces.context.FacesContext, java.lang.Object),
+ * or noting where state information should later be written.
* <P>
- * This method must do nothing if the current request is an Ajax request. When responding to Ajax requests, the state is obtained by calling StateManager.getViewState(javax.faces.context.FacesContext) and then written into the Ajax response during final encoding (UIViewRoot.encodeEnd(javax.faces.context.FacesContext).
+ * This method must do nothing if the current request is an Ajax request. When responding
+ * to Ajax requests, the state is obtained by calling StateManager.getViewState(javax.faces.context.FacesContext)
+ * and then written into the Ajax response during
+ * final encoding (UIViewRoot.encodeEnd(javax.faces.context.FacesContext).
*/
public abstract void writeState(FacesContext context) throws IOException;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Mon Oct 24 20:04:32 2011
@@ -73,8 +73,13 @@ import java.util.logging.Logger;
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-@JSFComponent(type = "javax.faces.ComponentBase", family = "javax.faces.ComponentBase", desc = "base component when all components must inherit", tagClass = "javax.faces.webapp.UIComponentELTag", configExcluded = true)
-@JSFJspProperty(name = "binding", returnType = "javax.faces.component.UIComponent", longDesc = "Identifies a backing bean property (of type UIComponent or appropriate subclass) to bind to this component instance. This value must be an EL expression.", desc = "backing bean property to bind to this component instance")
+@JSFComponent(type = "javax.faces.ComponentBase", family = "javax.faces.ComponentBase",
+ desc = "base component when all components must inherit",
+ tagClass = "javax.faces.webapp.UIComponentELTag", configExcluded = true)
+@JSFJspProperty(name = "binding", returnType = "javax.faces.component.UIComponent",
+ longDesc = "Identifies a backing bean property (of type UIComponent or appropriate subclass) to bind "
+ + "to this component instance. This value must be an EL expression.",
+ desc = "backing bean property to bind to this component instance")
public abstract class UIComponentBase extends UIComponent
{
//private static Log log = LogFactory.getLog(UIComponentBase.class);
@@ -306,7 +311,8 @@ public abstract class UIComponentBase ex
//log an error and return
if(log.isLoggable(Level.SEVERE))
{
- log.severe("attempted to add a behavior to a component which did not properly implement getEventNames. getEventNames must not return null");
+ log.severe("attempted to add a behavior to a component which did not properly "
+ + "implement getEventNames. getEventNames must not return null");
return;
}
}
@@ -449,14 +455,15 @@ public abstract class UIComponentBase ex
if (isRendered())
{
- // If our rendered property is true, render the beginning of the current state of this UIComponent to the
- // response contained in the specified FacesContext.
+ // If our rendered property is true, render the beginning of the current state of this
+ // UIComponent to the response contained in the specified FacesContext.
// Call Application.publishEvent(java.lang.Class, java.lang.Object), passing BeforeRenderEvent.class as
// the first argument and the component instance to be rendered as the second argument.
- //The main issue we have here is that the listeners are normally just registered to UIComponent, how do we deal with inherited ones?
- //We have to ask the EG
+ // The main issue we have here is that the listeners are normally just registered
+ // to UIComponent, how do we deal with inherited ones?
+ // We have to ask the EG
context.getApplication().publishEvent(context, PreRenderComponentEvent.class, UIComponent.class, this);
Renderer renderer = getRenderer(context);
@@ -807,7 +814,8 @@ public abstract class UIComponentBase ex
if (containerClientId != null)
{
StringBuilder bld = __getSharedStringBuilder(context);
- _clientId = bld.append(containerClientId).append(UINamingContainer.getSeparatorChar(context)).append(id).toString();
+ _clientId = bld.append(containerClientId).append(
+ UINamingContainer.getSeparatorChar(context)).append(id).toString();
}
else
{
@@ -861,7 +869,8 @@ public abstract class UIComponentBase ex
*/
public Collection<String> getEventNames()
{
- // must be specified by the implementing component. Returning null will force an error message in addClientBehavior.
+ // must be specified by the implementing component.
+ // Returning null will force an error message in addClientBehavior.
return null;
}
@@ -1779,7 +1788,8 @@ public abstract class UIComponentBase ex
return null;
}
- return new Object[] {facesListenersSaved, stateHelperSaved, behaviorsMapSaved, systemEventListenerClassMapSaved};
+ return new Object[] {facesListenersSaved, stateHelperSaved, behaviorsMapSaved,
+ systemEventListenerClassMapSaved};
}
else
{
@@ -1911,7 +1921,8 @@ public abstract class UIComponentBase ex
_unmodifiableBehaviorsMap = null;
for (Map.Entry<String, Object> entry : stateMap.entrySet())
{
- _behaviorsMap.put(entry.getKey(), (List<ClientBehavior>) restoreAttachedState(facesContext, entry.getValue()));
+ _behaviorsMap.put(entry.getKey(),
+ (List<ClientBehavior>) restoreAttachedState(facesContext, entry.getValue()));
}
}
else
@@ -1939,11 +1950,13 @@ public abstract class UIComponentBase ex
if (savedObject instanceof _AttachedDeltaWrapper)
{
StateHolder holderList = (StateHolder) _behaviorsMap.get(entry.getKey());
- holderList.restoreState(facesContext, ((_AttachedDeltaWrapper) savedObject).getWrappedStateObject());
+ holderList.restoreState(facesContext,
+ ((_AttachedDeltaWrapper) savedObject).getWrappedStateObject());
}
else
{
- _behaviorsMap.put(entry.getKey(), (List<ClientBehavior>) restoreAttachedState(facesContext, savedObject));
+ _behaviorsMap.put(entry.getKey(),
+ (List<ClientBehavior>) restoreAttachedState(facesContext, savedObject));
}
}
}
@@ -2009,10 +2022,12 @@ public abstract class UIComponentBase ex
{
Map<Class<? extends SystemEvent>, Object> stateMap = (Map<Class<? extends SystemEvent>, Object>) stateObj;
int initCapacity = (stateMap.size() * 4 + 3) / 3;
- _systemEventListenerClassMap = new HashMap<Class<? extends SystemEvent>, List<SystemEventListener>>(initCapacity);
+ _systemEventListenerClassMap
+ = new HashMap<Class<? extends SystemEvent>, List<SystemEventListener>>(initCapacity);
for (Map.Entry<Class<? extends SystemEvent>, Object> entry : stateMap.entrySet())
{
- _systemEventListenerClassMap.put(entry.getKey(), (List<SystemEventListener>) restoreAttachedState(facesContext, entry.getValue()));
+ _systemEventListenerClassMap.put(entry.getKey(),
+ (List<SystemEventListener>) restoreAttachedState(facesContext, entry.getValue()));
}
}
else
@@ -2030,7 +2045,8 @@ public abstract class UIComponentBase ex
int initCapacity = (stateMap.size() * 4 + 3) / 3;
if (_systemEventListenerClassMap == null)
{
- _systemEventListenerClassMap = new HashMap<Class<? extends SystemEvent>, List<SystemEventListener>>(initCapacity);
+ _systemEventListenerClassMap
+ = new HashMap<Class<? extends SystemEvent>, List<SystemEventListener>>(initCapacity);
}
for (Map.Entry<Class<? extends SystemEvent>, Object> entry : stateMap.entrySet())
{
@@ -2038,11 +2054,13 @@ public abstract class UIComponentBase ex
if (savedObject instanceof _AttachedDeltaWrapper)
{
StateHolder holderList = (StateHolder) _systemEventListenerClassMap.get(entry.getKey());
- holderList.restoreState(facesContext, ((_AttachedDeltaWrapper) savedObject).getWrappedStateObject());
+ holderList.restoreState(facesContext,
+ ((_AttachedDeltaWrapper) savedObject).getWrappedStateObject());
}
else
{
- _systemEventListenerClassMap.put(entry.getKey(), (List<SystemEventListener>) restoreAttachedState(facesContext, savedObject));
+ _systemEventListenerClassMap.put(entry.getKey(),
+ (List<SystemEventListener>) restoreAttachedState(facesContext, savedObject));
}
}
}
@@ -2054,9 +2072,11 @@ public abstract class UIComponentBase ex
{
if (initialStateMarked())
{
- HashMap<Class<? extends SystemEvent>, Object> stateMap = new HashMap<Class<? extends SystemEvent>, Object>(_systemEventListenerClassMap.size(), 1);
+ HashMap<Class<? extends SystemEvent>, Object> stateMap
+ = new HashMap<Class<? extends SystemEvent>, Object>(_systemEventListenerClassMap.size(), 1);
boolean nullDelta = true;
- for (Map.Entry<Class<? extends SystemEvent>, List<SystemEventListener> > entry : _systemEventListenerClassMap.entrySet())
+ for (Map.Entry<Class<? extends SystemEvent>, List<SystemEventListener> > entry
+ : _systemEventListenerClassMap.entrySet())
{
// The list is always an instance of _DeltaList so we can cast to
// PartialStateHolder
@@ -2066,8 +2086,8 @@ public abstract class UIComponentBase ex
Object attachedState = holder.saveState(facesContext);
if (attachedState != null)
{
- stateMap.put(entry.getKey(), new _AttachedDeltaWrapper(_systemEventListenerClassMap.getClass(),
- attachedState));
+ stateMap.put(entry.getKey(),
+ new _AttachedDeltaWrapper(_systemEventListenerClassMap.getClass(), attachedState));
nullDelta = false;
}
}
@@ -2088,7 +2108,8 @@ public abstract class UIComponentBase ex
//Save it in the traditional way
HashMap<Class<? extends SystemEvent>, Object> stateMap =
new HashMap<Class<? extends SystemEvent>, Object>(_systemEventListenerClassMap.size(), 1);
- for (Map.Entry<Class<? extends SystemEvent>, List<SystemEventListener> > entry : _systemEventListenerClassMap.entrySet())
+ for (Map.Entry<Class<? extends SystemEvent>, List<SystemEventListener> > entry
+ : _systemEventListenerClassMap.entrySet())
{
stateMap.put(entry.getKey(), saveAttachedState(facesContext, entry.getValue()));
}
@@ -2166,9 +2187,9 @@ public abstract class UIComponentBase ex
// 2. First character must be a letter or an underscore ('_').
if (!Character.isLetter(string.charAt(0)) && string.charAt(0) != '_')
{
- throw new IllegalArgumentException(
- "component identifier's first character must be a letter or an underscore ('_')! But it is \""
- + string.charAt(0) + "\"");
+ throw new IllegalArgumentException("component identifier's first character must be a letter "
+ + "or an underscore ('_')! But it is \""
+ + string.charAt(0) + "\"");
}
for (int i = 1; i < string.length(); i++)
{
@@ -2176,9 +2197,10 @@ public abstract class UIComponentBase ex
// 3. Subsequent characters must be a letter, a digit, an underscore ('_'), or a dash ('-').
if (!Character.isLetterOrDigit(c) && c != '-' && c != '_')
{
- throw new IllegalArgumentException(
- "Subsequent characters of component identifier must be a letter, a digit, an underscore ('_'), or a dash ('-')! But component identifier contains \""
- + c + "\"");
+ throw new IllegalArgumentException("Subsequent characters of component identifier must be a letter, "
+ + "a digit, an underscore ('_'), or a dash ('-')! "
+ + "But component identifier contains \""
+ + c + "\"");
}
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Mon Oct 24 20:04:32 2011
@@ -639,14 +639,16 @@ public class UIData extends UIComponentB
if (_initialDescendantFullComponentState != null)
{
//Just save the row
- Map<String, Object> sm = saveFullDescendantComponentStates(facesContext, null, getChildren().iterator(), false);
+ Map<String, Object> sm = saveFullDescendantComponentStates(facesContext, null,
+ getChildren().iterator(), false);
if (sm != null && !sm.isEmpty())
{
_rowDeltaStates.put(getContainerClientId(facesContext), sm);
}
if (_rowIndex != -1)
{
- _rowTransientStates.put(getContainerClientId(facesContext), saveTransientDescendantComponentStates(facesContext, null, getChildren().iterator(), false));
+ _rowTransientStates.put(getContainerClientId(facesContext),
+ saveTransientDescendantComponentStates(facesContext, null, getChildren().iterator(), false));
}
}
@@ -685,12 +687,14 @@ public class UIData extends UIComponentB
if (rowState == null)
{
//Restore as original
- restoreFullDescendantComponentStates(facesContext, getChildren().iterator(), _initialDescendantFullComponentState, false);
+ restoreFullDescendantComponentStates(facesContext, getChildren().iterator(),
+ _initialDescendantFullComponentState, false);
}
else
{
//Restore first original and then delta
- restoreFullDescendantComponentDeltaStates(facesContext, getChildren().iterator(), rowState, _initialDescendantFullComponentState, false);
+ restoreFullDescendantComponentDeltaStates(facesContext, getChildren().iterator(),
+ rowState, _initialDescendantFullComponentState, false);
}
if (_rowIndex == -1)
{
@@ -825,7 +829,8 @@ public class UIData extends UIComponentB
* @param iterateFacets
* @param restoreChildFacets
*/
- private void restoreDescendantComponentWithoutRestoreState(UIComponent parent, boolean iterateFacets, boolean restoreChildFacets)
+ private void restoreDescendantComponentWithoutRestoreState(UIComponent parent, boolean iterateFacets,
+ boolean restoreChildFacets)
{
if (iterateFacets && parent.getFacetCount() > 0)
{
@@ -1056,7 +1061,8 @@ public class UIData extends UIComponentB
{
if (getFacesContext().getAttributes().containsKey(StateManager.IS_BUILDING_INITIAL_STATE))
{
- _initialDescendantFullComponentState = saveDescendantInitialComponentStates(getFacesContext(), getChildren().iterator(), false);
+ _initialDescendantFullComponentState
+ = saveDescendantInitialComponentStates(getFacesContext(), getChildren().iterator(), false);
}
}
super.markInitialState();
@@ -1284,7 +1290,8 @@ public class UIData extends UIComponentB
*/
@SuppressWarnings("unchecked")
/*
- private void restoreTransientDescendantComponentStates(FacesContext facesContext, Iterator<UIComponent> childIterator, Object state,
+ private void restoreTransientDescendantComponentStates(FacesContext facesContext,
+ Iterator<UIComponent> childIterator, Object state,
boolean restoreChildFacets)
{
Iterator<? extends Object[]> descendantStateIterator = null;
@@ -1323,8 +1330,10 @@ public class UIData extends UIComponentB
}
}*/
- private void restoreTransientDescendantComponentStates(FacesContext facesContext, Iterator<UIComponent> childIterator, Map<String, Object> state,
- boolean restoreChildFacets)
+ private void restoreTransientDescendantComponentStates(FacesContext facesContext,
+ Iterator<UIComponent> childIterator,
+ Map<String, Object> state,
+ boolean restoreChildFacets)
{
while (childIterator.hasNext())
{
@@ -1334,7 +1343,10 @@ public class UIData extends UIComponentB
component.setId(component.getId());
if (!component.isTransient())
{
- component.restoreTransientState(facesContext, (state == null) ? null : state.get(component.getClientId(facesContext)));
+ component.restoreTransientState(facesContext,
+ (state == null)
+ ? null
+ : state.get(component.getClientId(facesContext)));
Iterator<UIComponent> childsIterator;
if (restoreChildFacets)
@@ -1364,7 +1376,8 @@ public class UIData extends UIComponentB
* may itself contain a collection of the state of that child's child components.
*/
/*
- private Collection<Object[]> saveTransientDescendantComponentStates(FacesContext facesContext, Iterator<UIComponent> childIterator,
+ private Collection<Object[]> saveTransientDescendantComponentStates(FacesContext facesContext,
+ Iterator<UIComponent> childIterator,
boolean saveChildFacets)
{
Collection<Object[]> childStates = null;
@@ -1401,7 +1414,9 @@ public class UIData extends UIComponentB
return childStates;
}*/
- private Map<String, Object> saveTransientDescendantComponentStates(FacesContext facesContext, Map<String, Object> childStates, Iterator<UIComponent> childIterator,
+ private Map<String, Object> saveTransientDescendantComponentStates(FacesContext facesContext,
+ Map<String, Object> childStates,
+ Iterator<UIComponent> childIterator,
boolean saveChildFacets)
{
while (childIterator.hasNext())
@@ -1608,12 +1623,14 @@ public class UIData extends UIComponentB
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1L));
- // Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
+ // Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX,
+ // and will be unique within this UIViewRoot.
if(seed==null)
{
return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
}
- // Optionally, a unique seed value can be supplied by component creators which should be included in the generated unique id.
+ // Optionally, a unique seed value can be supplied by component creators
+ // which should be included in the generated unique id.
else
{
return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString();
@@ -1912,7 +1929,8 @@ public class UIData extends UIComponentB
* <p>
* This is complicated by the fact that this table may be nested within another table. In this case a different
* datamodel should be fetched for each row. When nested within a parent table, the parent reference won't change
- * but parent.getContainerClientId() will, as the suffix changes depending upon the current row index. A map object on this
+ * but parent.getContainerClientId() will, as the suffix changes
+ * depending upon the current row index. A map object on this
* component is therefore used to cache the datamodel for each row of the table. In the normal case where this table
* is not nested inside a component that changes its id (like a table does) then this map only ever has one entry.
*/
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Mon Oct 24 20:04:32 2011
@@ -83,7 +83,8 @@ public class UIInput extends UIOutput im
* <p>Note this param is ignored for components extending from UISelectOne/UISelectMany.</p>
**/
@JSFWebConfigParam(defaultValue="false", expectedValues="true, false", since="2.0", group="validation")
- private static final String EMPTY_VALUES_AS_NULL_PARAM_NAME = "javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL";
+ private static final String EMPTY_VALUES_AS_NULL_PARAM_NAME
+ = "javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL";
// our own, cached key
private static final String MYFACES_EMPTY_VALUES_AS_NULL_PARAM_NAME =
@@ -422,7 +423,7 @@ public class UIInput extends UIOutput im
// continue for this lifecycle phase, as in all the other lifecycle phases.
UpdateModelException updateModelException = new UpdateModelException(facesMessage, e);
ExceptionQueuedEventContext exceptionQueuedContext
- = new ExceptionQueuedEventContext (context, updateModelException, this, PhaseId.UPDATE_MODEL_VALUES);
+ = new ExceptionQueuedEventContext(context, updateModelException, this, PhaseId.UPDATE_MODEL_VALUES);
// spec javadoc says we should call context.getExceptionHandler().processEvent(exceptionQueuedContext),
// which is not just syntactically wrong, but also stupid!!
@@ -475,7 +476,8 @@ public class UIInput extends UIOutput im
private boolean shouldInterpretEmptyStringSubmittedValuesAsNull(FacesContext context)
{
ExternalContext ec = context.getExternalContext();
- Boolean interpretEmptyStringAsNull = (Boolean)ec.getApplicationMap().get(MYFACES_EMPTY_VALUES_AS_NULL_PARAM_NAME);
+ Boolean interpretEmptyStringAsNull
+ = (Boolean)ec.getApplicationMap().get(MYFACES_EMPTY_VALUES_AS_NULL_PARAM_NAME);
// not yet cached...
if (interpretEmptyStringAsNull == null)
@@ -758,7 +760,8 @@ public class UIInput extends UIOutput im
* @deprecated
*/
@SuppressWarnings("dep-ann")
- @JSFProperty(stateHolder=true, returnSignature = "void", methodSignature = "javax.faces.context.FacesContext,javax.faces.component.UIComponent,java.lang.Object")
+ @JSFProperty(stateHolder=true, returnSignature = "void",
+ methodSignature = "javax.faces.context.FacesContext,javax.faces.component.UIComponent,java.lang.Object")
public MethodBinding getValidator()
{
return (MethodBinding) getStateHelper().eval(PropertyKeys.validator);
@@ -833,7 +836,8 @@ public class UIInput extends UIOutput im
*
* @deprecated
*/
- @JSFProperty(stateHolder=true, returnSignature = "void", methodSignature = "javax.faces.event.ValueChangeEvent", clientEvent="valueChange")
+ @JSFProperty(stateHolder=true, returnSignature = "void",
+ methodSignature = "javax.faces.event.ValueChangeEvent", clientEvent="valueChange")
public MethodBinding getValueChangeListener()
{
return (MethodBinding) getStateHelper().eval(PropertyKeys.valueChangeListener);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java Mon Oct 24 20:04:32 2011
@@ -76,12 +76,14 @@ public class UINamingContainer extends U
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1L));
- // Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
+ // Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX,
+ // and will be unique within this UIViewRoot.
if(seed==null)
{
return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
}
- // Optionally, a unique seed value can be supplied by component creators which should be included in the generated unique id.
+ // Optionally, a unique seed value can be supplied by component creators
+ // which should be included in the generated unique id.
else
{
return bld.append(UIViewRoot.UNIQUE_ID_PREFIX).append(seed).toString();
@@ -142,47 +144,56 @@ public class UINamingContainer extends U
setCachedFacesContext(context.getFacesContext());
}
- if (!isVisitable(context)) {
+ if (!isVisitable(context))
+ {
return false;
}
pushComponentToEL(context.getFacesContext(), this);
- try {
+ try
+ {
VisitResult res = context.invokeVisitCallback(this, callback);
- switch (res) {
- //we are done nothing has to be processed anymore
- case COMPLETE:
- return true;
-
- case REJECT:
- return false;
-
- //accept
- default:
- // Take advantage of the fact this is a NamingContainer
- // and we can know if there are ids to visit inside it
- Collection<String> subtreeIdsToVisit = context.getSubtreeIdsToVisit(this);
-
- if (subtreeIdsToVisit != null && !subtreeIdsToVisit.isEmpty())
- {
- if (getFacetCount() > 0) {
- for (UIComponent facet : getFacets().values()) {
- if (facet.visitTree(context, callback)) {
- return true;
+ switch (res)
+ {
+ //we are done nothing has to be processed anymore
+ case COMPLETE:
+ return true;
+
+ case REJECT:
+ return false;
+
+ //accept
+ default:
+ // Take advantage of the fact this is a NamingContainer
+ // and we can know if there are ids to visit inside it
+ Collection<String> subtreeIdsToVisit = context.getSubtreeIdsToVisit(this);
+
+ if (subtreeIdsToVisit != null && !subtreeIdsToVisit.isEmpty())
+ {
+ if (getFacetCount() > 0)
+ {
+ for (UIComponent facet : getFacets().values())
+ {
+ if (facet.visitTree(context, callback))
+ {
+ return true;
+ }
}
}
- }
- for (int i = 0, childCount = getChildCount(); i < childCount; i++) {
- UIComponent child = getChildren().get(i);
- if (child.visitTree(context, callback)) {
- return true;
+ for (int i = 0, childCount = getChildCount(); i < childCount; i++)
+ {
+ UIComponent child = getChildren().get(i);
+ if (child.visitTree(context, callback))
+ {
+ return true;
+ }
}
}
- }
- return false;
+ return false;
}
}
- finally {
+ finally
+ {
//all components must call popComponentFromEl after visiting is finished
popComponentFromEL(context.getFacesContext());
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java Mon Oct 24 20:04:32 2011
@@ -155,7 +155,8 @@ public class UIViewRoot extends UICompon
// Call getComponentResources to obtain the child list for the given target
List<UIComponent> componentResources = _getComponentResources(context, target);
- // If the component ID of componentResource matches the ID of a resource that has already been added, remove the old resource.
+ // If the component ID of componentResource matches the ID of a resource
+ // that has already been added, remove the old resource.
String componentId = componentResource.getId();
if (componentId == null)
@@ -253,7 +254,8 @@ public class UIViewRoot extends UICompon
Events events = _getEvents(phaseId);
// Spec. 3.4.2.6 Event Broadcasting:
- // Queue one or more additional events, from the same source component or a different one, for processing during the
+ // Queue one or more additional events, from the same source
+ // component or a different one, for processing during the
// current lifecycle phase.
// Unfortunately with that requirement it is easy to create infinite loop in processing. One example can be:
@@ -302,7 +304,8 @@ public class UIViewRoot extends UICompon
String clientId = facesEvent.getComponent().getClientId(getFacesContext());
name.add(clientId);
}
- logger.log(level, "Event broadcating for PhaseId {0} at UIViewRoot {1} reaches maximal limit, please check " +
+ logger.log(level,
+ "Event broadcating for PhaseId {0} at UIViewRoot {1} reaches maximal limit, please check " +
"listeners for infinite recursion. Component id: {2}",
new Object [] {phaseId, getViewId(), name});
}
@@ -331,12 +334,14 @@ public class UIViewRoot extends UICompon
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1L));
- // Generate an identifier for a component. The identifier will be prefixed with UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
+ // Generate an identifier for a component. The identifier will be prefixed with
+ // UNIQUE_ID_PREFIX, and will be unique within this UIViewRoot.
if(seed==null)
{
return bld.append(UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
}
- // Optionally, a unique seed value can be supplied by component creators which should be included in the generated unique id.
+ // Optionally, a unique seed value can be supplied by component creators which
+ // should be included in the generated unique id.
else
{
return bld.append(UNIQUE_ID_PREFIX).append(seed).toString();
@@ -418,10 +423,12 @@ public class UIViewRoot extends UICompon
PartialViewContext partialContext = context.getPartialViewContext();
if (!partialContext.isAjaxRequest())
{
- ViewDeclarationLanguage vdl = context.getApplication().getViewHandler().getViewDeclarationLanguage(context, getViewId());
+ ViewDeclarationLanguage vdl
+ = context.getApplication().getViewHandler().getViewDeclarationLanguage(context, getViewId());
if (vdl != null)
{
- // If the current view has view parameters, as indicated by a non-empty and non-UnsupportedOperationException throwing
+ // If the current view has view parameters, as indicated by a non-empty
+ // and non-UnsupportedOperationException throwing
// return from ViewDeclarationLanguage.getViewMetadata(javax.faces.context.FacesContext, String)
ViewMetadata metadata = null;
try
@@ -449,7 +456,8 @@ public class UIViewRoot extends UICompon
}
catch(UnsupportedOperationException e)
{
- // If calling getViewParameters() causes UnsupportedOperationException to be thrown, the exception must be silently swallowed.
+ // If calling getViewParameters() causes UnsupportedOperationException
+ // to be thrown, the exception must be silently swallowed.
}
}
}
@@ -473,7 +481,8 @@ public class UIViewRoot extends UICompon
*
* @return the new afterPhaseListener value
*/
- @JSFProperty(returnSignature = "void", methodSignature = "javax.faces.event.PhaseEvent", jspName = "afterPhase", stateHolder=true)
+ @JSFProperty(returnSignature = "void", methodSignature = "javax.faces.event.PhaseEvent",
+ jspName = "afterPhase", stateHolder=true)
public MethodExpression getAfterPhaseListener()
{
return (MethodExpression) getStateHelper().eval(PropertyKeys.afterPhaseListener);
@@ -485,7 +494,8 @@ public class UIViewRoot extends UICompon
*
* @return the new beforePhaseListener value
*/
- @JSFProperty(returnSignature = "void", methodSignature = "javax.faces.event.PhaseEvent", jspName = "beforePhase", stateHolder=true)
+ @JSFProperty(returnSignature = "void", methodSignature = "javax.faces.event.PhaseEvent",
+ jspName = "beforePhase", stateHolder=true)
public MethodExpression getBeforePhaseListener()
{
return (MethodExpression) getStateHelper().eval(PropertyKeys.beforePhaseListener);
@@ -516,7 +526,8 @@ public class UIViewRoot extends UICompon
// If the facet is not found,
if (facet == null)
{
- // create the facet by calling context.getApplication().createComponent() using javax.faces.Panel as the argument
+ // create the facet by calling context.getApplication().createComponent()
+ // using javax.faces.Panel as the argument
facet = context.getApplication().createComponent("javax.faces.Panel");
// Set the id of the facet to be target
@@ -527,7 +538,8 @@ public class UIViewRoot extends UICompon
}
// Return the children of the facet
- // The API doc indicates that this method should "Return an unmodifiable List of UIComponents for the provided target argument."
+ // The API doc indicates that this method should "Return an unmodifiable
+ // List of UIComponents for the provided target argument."
// and also that "If no children are found for the facet, return Collections.emptyList()."
List<UIComponent> children = facet.getChildren();
return ( children == null ? Collections.<UIComponent>emptyList() : Collections.unmodifiableList(children) );
@@ -554,7 +566,8 @@ public class UIViewRoot extends UICompon
// If the facet is not found,
if (facet == null)
{
- // create the facet by calling context.getApplication().createComponent() using javax.faces.Panel as the argument
+ // create the facet by calling context.getApplication().createComponent()
+ // using javax.faces.Panel as the argument
facet = context.getApplication().createComponent("javax.faces.ComponentResourceContainer");
// Set the id of the facet to be target
@@ -851,7 +864,8 @@ public class UIViewRoot extends UICompon
" in Phase " + phaseId, t);
if (beforePhase)
{
- return context.getResponseComplete() || (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
+ return context.getResponseComplete() ||
+ (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
}
}
}
@@ -894,7 +908,8 @@ public class UIViewRoot extends UICompon
logger.log(Level.SEVERE, "An Exception occured while processing the " +
"beforePhase method of PhaseListener " + phaseListener +
" in Phase " + phaseId, t);
- return context.getResponseComplete() || (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
+ return context.getResponseComplete() ||
+ (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
}
}
}
@@ -939,7 +954,8 @@ public class UIViewRoot extends UICompon
if (beforePhase)
{
- return context.getResponseComplete() || (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
+ return context.getResponseComplete() ||
+ (context.getRenderResponse() && !PhaseId.RENDER_RESPONSE.equals(phaseId));
}
else
{
@@ -971,7 +987,9 @@ public class UIViewRoot extends UICompon
*
* @return <code>true</code> if the broadcast was completed without abortion, <code>false</code> otherwise
*/
- private void _broadcastAll(FacesContext context, Collection<? extends FacesEvent> events, Collection<FacesEvent> eventsAborted)
+ private void _broadcastAll(FacesContext context,
+ Collection<? extends FacesEvent> events,
+ Collection<FacesEvent> eventsAborted)
{
assert events != null;
@@ -1358,15 +1376,19 @@ public class UIViewRoot extends UICompon
public void process(FacesContext context, UIViewRoot root)
{
PartialViewContext pvc = context.getPartialViewContext();
- // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId) with PhaseId.UPDATE_MODEL_VALUES if:
- // * PartialViewContext.isPartialRequest() returns true and we don't have a request to process all components in the view (PartialViewContext.isExecuteAll() returns false)
+ // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId)
+ // with PhaseId.UPDATE_MODEL_VALUES if:
+ // * PartialViewContext.isPartialRequest() returns true and we don't have a request to process all
+ // components in the view (PartialViewContext.isExecuteAll() returns false)
//section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.APPLY_REQUEST_VALUES);
}
- // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext) if one of the following conditions are met:
- // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components in the view (PartialViewContext.isExecuteAll() returns true)
+ // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext)
+ // if one of the following conditions are met:
+ // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components
+ // in the view (PartialViewContext.isExecuteAll() returns true)
// * PartialViewContext.isPartialRequest() returns false
else
{
@@ -1380,15 +1402,19 @@ public class UIViewRoot extends UICompon
public void process(FacesContext context, UIViewRoot root)
{
PartialViewContext pvc = context.getPartialViewContext();
- // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId) with PhaseId.UPDATE_MODEL_VALUES if:
- // PartialViewContext.isPartialRequest() returns true and we don't have a request to process all components in the view (PartialViewContext.isExecuteAll() returns false)
+ // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId)
+ // with PhaseId.UPDATE_MODEL_VALUES if:
+ // PartialViewContext.isPartialRequest() returns true and we don't have a request to process all components
+ // in the view (PartialViewContext.isExecuteAll() returns false)
//section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.PROCESS_VALIDATIONS);
}
- // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext) if one of the following conditions are met:
- // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components in the view (PartialViewContext.isExecuteAll() returns true)
+ // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext)
+ // if one of the following conditions are met:
+ // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components
+ // in the view (PartialViewContext.isExecuteAll() returns true)
// * PartialViewContext.isPartialRequest() returns false
else
{
@@ -1402,15 +1428,19 @@ public class UIViewRoot extends UICompon
public void process(FacesContext context, UIViewRoot root)
{
PartialViewContext pvc = context.getPartialViewContext();
- // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId) with PhaseId.UPDATE_MODEL_VALUES if:
- // * PartialViewContext.isPartialRequest() returns true and we don't have a request to process all components in the view (PartialViewContext.isExecuteAll() returns false)
+ // Perform partial processing by calling PartialViewContext.processPartial(javax.faces.event.PhaseId)
+ // with PhaseId.UPDATE_MODEL_VALUES if:
+ // * PartialViewContext.isPartialRequest() returns true and we don't have a request to process
+ // all components in the view (PartialViewContext.isExecuteAll() returns false)
//section 13.4.2 from the JSF2 spec also see https://issues.apache.org/jira/browse/MYFACES-2119
if (pvc.isPartialRequest() && !pvc.isExecuteAll())
{
pvc.processPartial(PhaseId.UPDATE_MODEL_VALUES);
}
- // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext) if one of the following conditions are met:
- // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components in the view (PartialViewContext.isExecuteAll() returns true)
+ // Perform full processing by calling UIComponentBase.processUpdates(javax.faces.context.FacesContext)
+ // if one of the following conditions are met:
+ // * PartialViewContext.isPartialRequest() returns true and we have a request to process all components
+ // in the view (PartialViewContext.isExecuteAll() returns true)
// * PartialViewContext.isPartialRequest() returns false
else
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ClassUtils.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ClassUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ClassUtils.java Mon Oct 24 20:04:32 2011
@@ -391,19 +391,27 @@ final class _ClassUtils
*
* @return ClassLoader
*/
- protected static ClassLoader getContextClassLoader(){
- if (System.getSecurityManager() != null) {
- try {
- Object cl = AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ protected static ClassLoader getContextClassLoader()
+ {
+ if (System.getSecurityManager() != null)
+ {
+ try
+ {
+ Object cl = AccessController.doPrivileged(new PrivilegedExceptionAction()
+ {
public Object run() throws PrivilegedActionException {
return Thread.currentThread().getContextClassLoader();
}
- });
+ });
return (ClassLoader) cl;
- } catch (PrivilegedActionException pae) {
+ }
+ catch (PrivilegedActionException pae)
+ {
throw new FacesException(pae);
}
- }else{
+ }
+ else
+ {
return Thread.currentThread().getContextClassLoader();
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java Mon Oct 24 20:04:32 2011
@@ -284,8 +284,10 @@ class _ComponentAttributesMap implements
if (attribute.getName().equals(key))
{
String attributeName = attribute.getName();
- boolean isKnownMethod = "action".equals(attributeName) || "actionListener".equals(attributeName)
- || "validator".equals(attributeName) || "valueChangeListener".equals(attributeName);
+ boolean isKnownMethod = "action".equals(attributeName)
+ || "actionListener".equals(attributeName)
+ || "validator".equals(attributeName)
+ || "valueChangeListener".equals(attributeName);
// <composite:attribute> method-signature attribute is
// ValueExpression that must evaluate to String
@@ -296,10 +298,12 @@ class _ComponentAttributesMap implements
{
// Check if the value expression holds a method signature
// Note that it could be null, so in that case we don't have to do anything
- methodSignature = (String) methodSignatureExpression.getValue(_component.getFacesContext().getELContext());
+ methodSignature = (String) methodSignatureExpression.getValue(
+ _component.getFacesContext().getELContext());
}
- // either the attributeName has to be a knownMethod or there has to be a method-signature
+ // either the attributeName has to be a knownMethod
+ // or there has to be a method-signature
if (isKnownMethod || methodSignature != null)
{
//In this case it is expecting a ValueExpression
@@ -489,7 +493,8 @@ class _ComponentAttributesMap implements
Method readMethod = propertyDescriptor.getReadMethod();
if (readMethod == null)
{
- throw new IllegalArgumentException("Component property " + propertyDescriptor.getName() + " is not readable");
+ throw new IllegalArgumentException("Component property " + propertyDescriptor.getName()
+ + " is not readable");
}
try
{
@@ -498,7 +503,8 @@ class _ComponentAttributesMap implements
catch (Exception e)
{
FacesContext facesContext = _component.getFacesContext();
- throw new FacesException("Could not get property " + propertyDescriptor.getName() + " of component " + _component.getClientId(facesContext), e);
+ throw new FacesException("Could not get property " + propertyDescriptor.getName() + " of component "
+ + _component.getClientId(facesContext), e);
}
}
@@ -516,7 +522,8 @@ class _ComponentAttributesMap implements
Method writeMethod = propertyDescriptor.getWriteMethod();
if (writeMethod == null)
{
- throw new IllegalArgumentException("Component property " + propertyDescriptor.getName() + " is not writable");
+ throw new IllegalArgumentException("Component property " + propertyDescriptor.getName()
+ + " is not writable");
}
try
{
@@ -551,7 +558,8 @@ class _ComponentAttributesMap implements
*/
Map<String, Object> getUnderlyingMap()
{
- Map _attributes = (Map<String, Object>) _component.getStateHelper().get(UIComponentBase.PropertyKeys.attributesMap);
+ Map _attributes
+ = (Map<String, Object>) _component.getStateHelper().get(UIComponentBase.PropertyKeys.attributesMap);
return _attributes == null ? Collections.EMPTY_MAP : _attributes;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToActionListener.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToActionListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToActionListener.java Mon Oct 24 20:04:32 2011
@@ -28,17 +28,21 @@ import javax.faces.event.ActionListener;
*
* @author Stan Silvert
*/
-class _MethodBindingToActionListener extends _MethodBindingToListener implements ActionListener {
+class _MethodBindingToActionListener extends _MethodBindingToListener implements ActionListener
+{
- public _MethodBindingToActionListener() {
+ public _MethodBindingToActionListener()
+ {
super();
}
- public _MethodBindingToActionListener(MethodBinding methodBinding) {
+ public _MethodBindingToActionListener(MethodBinding methodBinding)
+ {
super(methodBinding);
}
- public void processAction(ActionEvent actionEvent) throws AbortProcessingException {
+ public void processAction(ActionEvent actionEvent) throws AbortProcessingException
+ {
invokeMethodBinding(actionEvent);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToValueChangeListener.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToValueChangeListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToValueChangeListener.java Mon Oct 24 20:04:32 2011
@@ -29,17 +29,21 @@ import javax.faces.event.ValueChangeList
*
* @author Stan Silvert
*/
-class _MethodBindingToValueChangeListener extends _MethodBindingToListener implements ValueChangeListener {
-
- public _MethodBindingToValueChangeListener() {
+class _MethodBindingToValueChangeListener extends _MethodBindingToListener implements ValueChangeListener
+{
+
+ public _MethodBindingToValueChangeListener()
+ {
super();
}
-
- public _MethodBindingToValueChangeListener(MethodBinding methodBinding) {
+
+ public _MethodBindingToValueChangeListener(MethodBinding methodBinding)
+ {
super(methodBinding);
}
-
- public void processValueChange(ValueChangeEvent event) throws AbortProcessingException {
+
+ public void processValueChange(ValueChangeEvent event) throws AbortProcessingException
+ {
invokeMethodBinding(event);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_UISelectItems.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_UISelectItems.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_UISelectItems.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_UISelectItems.java Mon Oct 24 20:04:32 2011
@@ -57,7 +57,8 @@ abstract class _UISelectItems extends UI
*/
@JSFProperty(tagExcluded=true)
@Override
- public void setRendered(boolean state) {
+ public void setRendered(boolean state)
+ {
super.setRendered(state);
//call parent method due TCK problems
//throw new UnsupportedOperationException();
@@ -82,7 +83,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty(literalOnly = true)
- public String getVar() {
+ public String getVar()
+ {
return null;
}
@@ -94,7 +96,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty
- public Object getItemValue() {
+ public Object getItemValue()
+ {
return null;
}
@@ -106,7 +109,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty
- public String getItemLabel() {
+ public String getItemLabel()
+ {
return null;
}
@@ -118,7 +122,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty
- public String getItemDescription() {
+ public String getItemDescription()
+ {
return null;
}
@@ -130,7 +135,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty(defaultValue = "false", deferredValueType="java.lang.Boolean")
- public boolean isItemDisabled() {
+ public boolean isItemDisabled()
+ {
return false;
}
@@ -143,7 +149,8 @@ abstract class _UISelectItems extends UI
*/
@JSFExclude
@JSFProperty(defaultValue = "true", deferredValueType="java.lang.Boolean")
- public boolean isItemLabelEscaped() {
+ public boolean isItemLabelEscaped()
+ {
return true;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java Mon Oct 24 20:04:32 2011
@@ -137,7 +137,8 @@ public class AjaxBehavior extends Client
public ValueExpression getValueExpression(String name)
{
//return getValueExpressionMap().get(name);
- if (name == null) {
+ if (name == null)
+ {
throw new NullPointerException("name can not be null");
}
@@ -166,13 +167,16 @@ public class AjaxBehavior extends Client
getValueExpressionMap().put(name, item);
}
*/
- if (name == null) {
+ if (name == null)
+ {
throw new NullPointerException("name");
}
- if (expression == null) {
+ if (expression == null){
getStateHelper().remove(PropertyKeys.bindings, name);
- } else {
+ }
+ else
+ {
getStateHelper().put(PropertyKeys.bindings, name, expression);
}
}
@@ -233,7 +237,8 @@ public class AjaxBehavior extends Client
getStateHelper().restoreState(facesContext, values[1]);
}
- private StateHelper getStateHelper() {
+ private StateHelper getStateHelper()
+ {
return getStateHelper(true);
}
@@ -243,11 +248,14 @@ public class AjaxBehavior extends Client
* @param create if true a state helper is created if not already existing
* @return an implementation of the StateHelper interface or null if none exists and create is set to false
*/
- private StateHelper getStateHelper(boolean create) {
- if(_stateHelper != null) {
+ private StateHelper getStateHelper(boolean create)
+ {
+ if(_stateHelper != null)
+ {
return _stateHelper;
}
- if(create) {
+ if(create)
+ {
_stateHelper = new _DeltaStateHelper<AjaxBehavior>(this);
}
return _stateHelper;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialResponseWriter.java?rev=1188342&r1=1188341&r2=1188342&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialResponseWriter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialResponseWriter.java Mon Oct 24 20:04:32 2011
@@ -61,7 +61,8 @@ public class PartialResponseWriter exten
@Override
public void endDocument() throws IOException
{
- if (hasChanges) {
+ if (hasChanges)
+ {
// Close the <insert> element, if any.
//error close the last op if any
endInsert();
@@ -98,7 +99,8 @@ public class PartialResponseWriter exten
public void endInsert() throws IOException
{
- if (insertType == null) {
+ if (insertType == null)
+ {
// No insert started; ignore.
return;
@@ -161,12 +163,14 @@ public class PartialResponseWriter exten
}
@Override
- public void startCDATA() throws IOException {
+ public void startCDATA() throws IOException
+ {
_wrapped.startCDATA();
}
@Override
- public void endCDATA() throws IOException {
+ public void endCDATA() throws IOException
+ {
_wrapped.endCDATA();
}
@@ -234,7 +238,8 @@ public class PartialResponseWriter exten
attrNames = attributes.keySet().iterator();
- while (attrNames.hasNext()) {
+ while (attrNames.hasNext())
+ {
String attrName = attrNames.next();
_wrapped.startElement ("attribute", null);
@@ -246,7 +251,8 @@ public class PartialResponseWriter exten
_wrapped.endElement ("attributes");
}
- private void startChanges () throws IOException {
+ private void startChanges () throws IOException
+ {
if (!hasChanges) {
_wrapped.startElement ("changes", null);
@@ -254,8 +260,10 @@ public class PartialResponseWriter exten
}
}
- private void startInsertCommon (String type, String targetId) throws IOException {
- if (insertType != null) {
+ private void startInsertCommon (String type, String targetId) throws IOException
+ {
+ if (insertType != null)
+ {
// An insert has already been started; ignore.
return;