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 19:09:41 UTC
svn commit: r1188235 [1/5] - in /myfaces/core/trunk:
api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/component/behavior/
api/src/main/java/javax/faces/convert/ api/src/main/java/javax/fa...
Author: struberg
Date: Mon Oct 24 17:09:33 2011
New Revision: 1188235
URL: http://svn.apache.org/viewvc?rev=1188235&view=rev
Log:
MYFACES-3368 fix 'if' without bracelets
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.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/UIForm.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.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/_ComponentFacetMap.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ParametrizableFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/BehaviorBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/BooleanConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/ByteConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/DateTimeConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/convert/_ParametrizableFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/ListDataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultDataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultSetDataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItem.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItemGroup.java
myfaces/core/trunk/api/src/main/java/javax/faces/render/Renderer.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/MethodExpressionValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/RegexValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/RequiredValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/_MessageUtils.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/_ParametrizableFacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/FacesServlet.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIViewRootTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/_Delta2StateHelperTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaFacesListenerListTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/_DeltaListTest.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/FullVisitContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/component/visit/PartialVisitContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/CookieMap.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/CompositeELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/PropertyResolverImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToVariableResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/event/SetPropertyActionListener.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/logging/MyfacesLogRecord.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/logging/MyfacesLogger.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/RenderKitFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXml.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/FactoryFinderProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/SetPropertyActionListenerTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractAttributeMap.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Path.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java
myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/Assert.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java Mon Oct 24 17:09:33 2011
@@ -162,7 +162,9 @@ public class FacesMessage implements Ser
public FacesMessage(FacesMessage.Severity severity, String summary, String detail)
{
if (severity == null)
+ {
throw new NullPointerException("severity");
+ }
_severity = severity;
_summary = summary;
_detail = detail;
@@ -184,7 +186,9 @@ public class FacesMessage implements Ser
public void setSeverity(FacesMessage.Severity severity)
{
if (severity == null)
+ {
throw new NullPointerException("severity");
+ }
_severity = severity;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponent.java Mon Oct 24 17:09:33 2011
@@ -300,10 +300,14 @@ public abstract class UIComponent implem
Collection<VisitHint> hints = context.getHints();
if (hints.contains(VisitHint.SKIP_TRANSIENT) && this.isTransient())
+ {
return false;
+ }
if (hints.contains(VisitHint.SKIP_UNRENDERED) && !this.isRendered())
+ {
return false;
+ }
//executable cannot be handled here because we do not have any method to determine
//whether a component is executable or not, this seems to be a hole in the spec!
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=1188235&r1=1188234&r2=1188235&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 17:09:33 2011
@@ -352,7 +352,9 @@ public abstract class UIComponentBase ex
public void broadcast(FacesEvent event) throws AbortProcessingException
{
if (event == null)
+ {
throw new NullPointerException("event");
+ }
try
{
if (event instanceof BehaviorEvent && event.getComponent() == this)
@@ -362,7 +364,9 @@ public abstract class UIComponentBase ex
}
if (_facesListeners == null)
+ {
return;
+ }
for (Iterator<FacesListener> it = _facesListeners.iterator(); it.hasNext();)
{
FacesListener facesListener = it.next();
@@ -417,7 +421,9 @@ public abstract class UIComponentBase ex
public void decode(FacesContext context)
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
Renderer renderer = getRenderer(context);
if (renderer != null)
@@ -576,9 +582,13 @@ public abstract class UIComponentBase ex
public UIComponent findComponent(String expr)
{
if (expr == null)
+ {
throw new NullPointerException("expr");
+ }
if (expr.length() == 0)
+ {
return null;
+ }
final char separatorChar = UINamingContainer.getSeparatorChar(getFacesContext());
UIComponent findBase;
@@ -613,8 +623,10 @@ public abstract class UIComponentBase ex
}
if (!(findBase instanceof NamingContainer))
+ {
throw new IllegalArgumentException("Intermediate identifier " + id + " in search expression " + expr
+ " identifies a UIComponent that is not a NamingContainer");
+ }
return findBase.findComponent(expr.substring(separator + 1));
@@ -740,10 +752,14 @@ public abstract class UIComponentBase ex
public String getClientId(FacesContext context)
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
if (_clientId != null)
+ {
return _clientId;
+ }
//boolean idWasNull = false;
String id = getId();
@@ -885,14 +901,18 @@ public abstract class UIComponentBase ex
if (getFacetCount() == 0)
{
if (getChildCount() == 0)
+ {
return _EMPTY_UICOMPONENT_ITERATOR;
+ }
return getChildren().iterator();
}
else
{
if (getChildCount() == 0)
+ {
return getFacets().values().iterator();
+ }
return new _FacetsAndChildrenIterator(getFacets(), getChildren());
}
@@ -1066,7 +1086,9 @@ public abstract class UIComponentBase ex
protected void addFacesListener(FacesListener listener)
{
if (listener == null)
+ {
throw new NullPointerException("listener");
+ }
if (_facesListeners == null)
{
_facesListeners = new _DeltaList<FacesListener>(new ArrayList<FacesListener>());
@@ -1111,7 +1133,9 @@ public abstract class UIComponentBase ex
if (facesListener != null && clazz.isAssignableFrom(facesListener.getClass()))
{
if (lst == null)
+ {
lst = new ArrayList<FacesListener>();
+ }
lst.add(facesListener);
}
}
@@ -1127,10 +1151,14 @@ public abstract class UIComponentBase ex
protected Renderer getRenderer(FacesContext context)
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
String rendererType = getRendererType();
if (rendererType == null)
+ {
return null;
+ }
RenderKit renderKit = context.getRenderKit();
Renderer renderer = renderKit.getRenderer(getFamily(), rendererType);
@@ -1166,7 +1194,9 @@ public abstract class UIComponentBase ex
public void queueEvent(FacesEvent event)
{
if (event == null)
+ {
throw new NullPointerException("event");
+ }
UIComponent parent = getParent();
if (parent == null)
{
@@ -1528,7 +1558,9 @@ public abstract class UIComponentBase ex
private void getPathToComponent(UIComponent component, StringBuffer buf)
{
if (component == null)
+ {
return;
+ }
StringBuffer intBuf = new StringBuffer();
@@ -1582,7 +1614,9 @@ public abstract class UIComponentBase ex
}
if (attachedObject == null)
+ {
return null;
+ }
// StateHolder interface should take precedence over
// List children
if (attachedObject instanceof StateHolder)
@@ -1635,9 +1669,13 @@ public abstract class UIComponentBase ex
public static Object restoreAttachedState(FacesContext context, Object stateObj) throws IllegalStateException
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
if (stateObj == null)
+ {
return null;
+ }
if (stateObj instanceof _AttachedListStateWrapper)
{
List<Object> lst = ((_AttachedListStateWrapper) stateObj).getWrappedStateList();
@@ -2108,7 +2146,9 @@ public abstract class UIComponentBase ex
// is there any component identifier ?
if (string == null)
+ {
return;
+ }
// Component identifiers must obey the following syntax restrictions:
// 1. Must not be a zero-length String.
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=1188235&r1=1188234&r2=1188235&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 17:09:33 2011
@@ -253,7 +253,9 @@ public class UIData extends UIComponentB
public void setRowIndex(int i)
{
if (i < -1)
+ {
throw new IllegalArgumentException();
+ }
}
@Override
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java Mon Oct 24 17:09:33 2011
@@ -97,7 +97,9 @@ public class UIForm extends UIComponentB
decode(context);
if (!isSubmitted())
+ {
return;
+ }
int facetCount = getFacetCount();
if (facetCount > 0)
@@ -148,7 +150,9 @@ public class UIForm extends UIComponentB
decode(context);
}
if (!isSubmitted())
+ {
return;
+ }
//Pre validation event dispatch for component
context.getApplication().publishEvent(context, PreValidateEvent.class, getClass(), this);
@@ -203,7 +207,9 @@ public class UIForm extends UIComponentB
decode(context);
}
if (!isSubmitted())
+ {
return;
+ }
int facetCount = getFacetCount();
if (facetCount > 0)
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=1188235&r1=1188234&r2=1188235&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 17:09:33 2011
@@ -143,7 +143,10 @@ public class UIInput extends UIOutput im
*/
public Object getValue()
{
- if (isLocalValueSet()) return super.getLocalValue();
+ if (isLocalValueSet())
+ {
+ return super.getLocalValue();
+ }
return super.getValue();
}
@@ -433,7 +436,9 @@ public class UIInput extends UIOutput im
protected void validateValue(FacesContext context, Object convertedValue)
{
if (!isValid())
+ {
return;
+ }
// If our value is empty, check the required property
boolean isEmpty = isEmpty(convertedValue);
@@ -551,7 +556,9 @@ public class UIInput extends UIOutput im
public void validate(FacesContext context)
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
Object submittedValue = getSubmittedValue();
if (submittedValue == null)
@@ -602,7 +609,9 @@ public class UIInput extends UIOutput im
validateValue(context, convertedValue);
if (!isValid())
+ {
return;
+ }
Object previousValue = getValue();
setValue(convertedValue);
@@ -787,7 +796,9 @@ public class UIInput extends UIOutput im
public void removeValidator(Validator validator)
{
if (validator == null || _validatorList == null)
+ {
return;
+ }
_validatorList.remove(validator);
}
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=1188235&r1=1188234&r2=1188235&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 17:09:33 2011
@@ -233,7 +233,9 @@ public class UIViewRoot extends UICompon
public void addPhaseListener(PhaseListener phaseListener)
{
if (phaseListener == null)
+ {
throw new NullPointerException("phaseListener");
+ }
getStateHelper().add(PropertyKeys.phaseListeners, phaseListener);
}
@@ -1127,7 +1129,9 @@ public class UIViewRoot extends UICompon
public void removePhaseListener(PhaseListener phaseListener)
{
if (phaseListener == null)
+ {
return;
+ }
getStateHelper().remove(PropertyKeys.phaseListeners, phaseListener);
}
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=1188235&r1=1188234&r2=1188235&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 17:09:33 2011
@@ -135,7 +135,9 @@ final class _ClassUtils
public static Class<?> classForName(String type) throws ClassNotFoundException
{
if (type == null)
+ {
throw new NullPointerException("type");
+ }
try
{
// Try WebApp ClassLoader first
@@ -188,7 +190,9 @@ final class _ClassUtils
public static Class<?> javaTypeToClass(String type) throws ClassNotFoundException
{
if (type == null)
+ {
throw new NullPointerException("type");
+ }
// try common types and arrays of common types first
Class<?> clazz = COMMON_TYPES.get(type);
@@ -272,7 +276,9 @@ final class _ClassUtils
public static Object newInstance(String type) throws FacesException
{
if (type == null)
+ {
return null;
+ }
return newInstance(simpleClassForName(type));
}
@@ -284,7 +290,9 @@ final class _ClassUtils
public static Object newInstance(String type, Class<?>[] expectedTypes)
{
if (type == null)
+ {
return null;
+ }
Class<?> clazzForName = simpleClassForName(type);
@@ -329,7 +337,9 @@ final class _ClassUtils
public static Object convertToType(Object value, Class<?> desiredClass)
{
if (value == null)
+ {
return null;
+ }
try
{
@@ -348,7 +358,9 @@ final class _ClassUtils
throws Exception
{
if (value == null)
+ {
return null;
+ }
ExpressionFactory expFactory = facesContext.getApplication().getExpressionFactory();
return expFactory.coerceToType(value, desiredClass);
@@ -395,4 +407,4 @@ final class _ClassUtils
return Thread.currentThread().getContextClassLoader();
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentFacetMap.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentFacetMap.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentFacetMap.java Mon Oct 24 17:09:33 2011
@@ -125,7 +125,9 @@ class _ComponentFacetMap<V extends UICom
checkKey(key);
V facet = _map.remove(key);
if (facet != null)
+ {
facet.setParent(null);
+ }
return facet;
}
@@ -133,10 +135,14 @@ class _ComponentFacetMap<V extends UICom
{
//checkKey(key);
if (key == null)
+ {
throw new NullPointerException("key");
+ }
//checkValue(value);
if (value == null)
+ {
throw new NullPointerException("value");
+ }
setNewParent(key, value);
V previousValue = _map.put(key, value);
if (previousValue != null)
@@ -176,17 +182,25 @@ class _ComponentFacetMap<V extends UICom
private void checkKey(Object key)
{
if (key == null)
+ {
throw new NullPointerException("key");
+ }
if (!(key instanceof String))
+ {
throw new ClassCastException("key is not a String");
+ }
}
private void checkValue(Object value)
{
if (value == null)
+ {
throw new NullPointerException("value");
+ }
if (!(value instanceof UIComponent))
+ {
throw new ClassCastException("value is not a UIComponent");
+ }
}
private class ComponentFacetEntrySet extends AbstractSet<Entry<String, V>>
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentUtils.java Mon Oct 24 17:09:33 2011
@@ -51,7 +51,9 @@ class _ComponentUtils
while (parent != null)
{
if (parent instanceof NamingContainer)
+ {
return parent;
+ }
if (returnRootIfNotFound)
{
UIComponent nextParent = parent.getParent();
@@ -91,7 +93,9 @@ class _ComponentUtils
{
parent = component.getParent();
if (parent == null)
+ {
return component;
+ }
component = parent;
}
}
@@ -124,7 +128,9 @@ class _ComponentUtils
{
UIComponent find = findComponent(facet, id, separatorChar);
if (find != null)
+ {
return find;
+ }
}
else if (idsAreEqual(id, facet, separatorChar))
{
@@ -140,7 +146,9 @@ class _ComponentUtils
{
UIComponent find = findComponent(child, id, separatorChar);
if (find != null)
+ {
return find;
+ }
}
else if (idsAreEqual(id, child, separatorChar))
{
@@ -227,7 +235,9 @@ class _ComponentUtils
private static boolean idsAreEqual(String id, UIComponent cmp, final char separatorChar)
{
if (id.equals(cmp.getId()))
+ {
return true;
+ }
/* By the spec, findComponent algorithm does not take into account UIData.rowIndex() property,
* because it just scan over nested plain ids.
@@ -407,7 +417,9 @@ class _ComponentUtils
private static void getPathToComponent(UIComponent component, StringBuffer buf)
{
if (component == null)
+ {
return;
+ }
StringBuffer intBuf = new StringBuffer();
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_DeltaStateHelper.java Mon Oct 24 17:09:33 2011
@@ -595,7 +595,9 @@ class _DeltaStateHelper implements State
public void restoreState(FacesContext context, Object state)
{
if (state == null)
+ {
return;
+ }
Object[] serializedState = (Object[]) state;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.java Mon Oct 24 17:09:33 2011
@@ -194,11 +194,15 @@ class _MessageUtils
static Object getLabel(FacesContext facesContext, UIComponent component) {
Object label = component.getAttributes().get("label");
if(label != null)
+ {
return label;
+ }
ValueExpression expression = component.getValueExpression("label");
if(expression != null)
+ {
return expression;
+ }
//If no label is not specified, use clientId
return component.getClientId( facesContext );
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToListener.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToListener.java Mon Oct 24 17:09:33 2011
@@ -43,8 +43,14 @@ abstract class _MethodBindingToListener
* Creates a new instance of MethodBindingToListener
*/
public _MethodBindingToListener(MethodBinding methodBinding) {
- if (methodBinding == null) throw new NullPointerException("methodBinding can not be null");
- if (!(methodBinding instanceof StateHolder)) throw new IllegalArgumentException("methodBinding must implement the StateHolder interface");
+ if (methodBinding == null)
+ {
+ throw new NullPointerException("methodBinding can not be null");
+ }
+ if (!(methodBinding instanceof StateHolder))
+ {
+ throw new IllegalArgumentException("methodBinding must implement the StateHolder interface");
+ }
this.methodBinding = methodBinding;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java Mon Oct 24 17:09:33 2011
@@ -128,7 +128,9 @@ class _MethodBindingToMethodExpression e
public boolean isLiteralText()
{
if (methodBinding == null)
+ {
throw new IllegalStateException("methodBinding is null");
+ }
String expr = methodBinding.getExpressionString();
return !(expr.startsWith("#{") && expr.endsWith("}"));
}
@@ -197,32 +199,46 @@ class _MethodBindingToMethodExpression e
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
final _MethodBindingToMethodExpression other = (_MethodBindingToMethodExpression)obj;
if (methodBinding == null)
{
if (other.methodBinding != null)
+ {
return false;
+ }
}
else if (!methodBinding.equals(other.methodBinding))
+ {
return false;
+ }
return true;
}
private void checkNullState(Object notNullInstance, String instanceName)
{
if (notNullInstance == null)
+ {
throw new IllegalStateException(instanceName + " is null");
+ }
}
private void checkNullArgument(Object notNullInstance, String instanceName)
{
if (notNullInstance == null)
+ {
throw new IllegalArgumentException(instanceName + " is null");
+ }
}
private <T> T invoke(Invoker<T> invoker)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java Mon Oct 24 17:09:33 2011
@@ -102,13 +102,17 @@ class _MethodExpressionToMethodBinding e
public void restoreState(FacesContext context, Object state)
{
if (state != null)
- methodExpression = (MethodExpression)state;
+ {
+ methodExpression = (MethodExpression) state;
+ }
}
public Object saveState(FacesContext context)
{
if (!isTransient)
+ {
return methodExpression;
+ }
return null;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ParametrizableFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ParametrizableFacesMessage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ParametrizableFacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ParametrizableFacesMessage.java Mon Oct 24 17:09:33 2011
@@ -50,7 +50,10 @@ class _ParametrizableFacesMessage extend
String summary, String detail, Object[] args, Locale locale)
{
super(summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
@@ -59,7 +62,10 @@ class _ParametrizableFacesMessage extend
String summary, String detail, Object[] args, Locale locale)
{
super(severity, summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_SharedRendererUtils.java Mon Oct 24 17:09:33 2011
@@ -60,19 +60,27 @@ class _SharedRendererUtils
Converter converter = component.getConverter();
if (converter != null)
+ {
return converter;
+ }
// Try to find out by value expression
ValueExpression expression = component.getValueExpression("value");
if (expression == null)
+ {
return null;
+ }
Class<?> valueType = expression.getType(facesContext.getELContext());
if (valueType == null)
+ {
return null;
+ }
if (Object.class.equals(valueType))
+ {
return null; // There is no converter for Object class
+ }
try
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java Mon Oct 24 17:09:33 2011
@@ -150,21 +150,33 @@ class _ValueBindingToValueExpression ext
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
final _ValueBindingToValueExpression other = (_ValueBindingToValueExpression)obj;
if (_transient != other._transient)
+ {
return false;
+ }
if (_valueBinding == null)
{
if (other._valueBinding != null)
+ {
return false;
+ }
}
else if (!_valueBinding.equals(other._valueBinding))
+ {
return false;
+ }
return true;
}
@@ -278,4 +290,4 @@ class _ValueBindingToValueExpression ext
{
T invoke();
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java Mon Oct 24 17:09:33 2011
@@ -61,21 +61,33 @@ class _ValueExpressionToValueBinding ext
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
final _ValueExpressionToValueBinding other = (_ValueExpressionToValueBinding) obj;
if (_valueExpression == null)
{
if (other._valueExpression != null)
+ {
return false;
+ }
}
else if (!_valueExpression.equals(other._valueExpression))
+ {
return false;
+ }
if (isTransient != other.isTransient)
+ {
return false;
+ }
return true;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/BehaviorBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/BehaviorBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/BehaviorBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/BehaviorBase.java Mon Oct 24 17:09:33 2011
@@ -161,7 +161,9 @@ public class BehaviorBase implements Beh
}
if (attachedObject == null)
+ {
return null;
+ }
// StateHolder interface should take precedence over
// List children
if (attachedObject instanceof StateHolder)
@@ -200,9 +202,13 @@ public class BehaviorBase implements Beh
private static Object restoreAttachedState(FacesContext context, Object stateObj) throws IllegalStateException
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
if (stateObj == null)
+ {
return null;
+ }
if (stateObj instanceof _AttachedListStateWrapper)
{
List<Object> lst = ((_AttachedListStateWrapper) stateObj).getWrappedStateList();
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java Mon Oct 24 17:09:33 2011
@@ -412,7 +412,9 @@ class _AjaxBehaviorDeltaStateHelper <A e
public void restoreState(FacesContext context, Object state) {
if (state == null)
+ {
return;
+ }
Object[] serializedState = (Object[]) state;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java Mon Oct 24 17:09:33 2011
@@ -595,7 +595,9 @@ class _DeltaStateHelper <A extends AjaxB
public void restoreState(FacesContext context, Object state)
{
if (state == null)
+ {
return;
+ }
Object[] serializedState = (Object[]) state;
@@ -832,7 +834,9 @@ class _DeltaStateHelper <A extends AjaxB
}
if (attachedObject == null)
+ {
return null;
+ }
// StateHolder interface should take precedence over
// List children
if (attachedObject instanceof StateHolder)
@@ -871,9 +875,13 @@ class _DeltaStateHelper <A extends AjaxB
private static Object restoreAttachedState(FacesContext context, Object stateObj) throws IllegalStateException
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
if (stateObj == null)
+ {
return null;
+ }
if (stateObj instanceof _AttachedListStateWrapper)
{
List<Object> lst = ((_AttachedListStateWrapper) stateObj).getWrappedStateList();
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigDecimalConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigDecimalConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigDecimalConverter.java Mon Oct 24 17:09:33 2011
@@ -48,8 +48,14 @@ public class BigDecimalConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -75,8 +81,14 @@ public class BigDecimalConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigIntegerConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigIntegerConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/BigIntegerConverter.java Mon Oct 24 17:09:33 2011
@@ -48,8 +48,14 @@ public class BigIntegerConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -73,8 +79,14 @@ public class BigIntegerConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/BooleanConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/BooleanConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/BooleanConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/BooleanConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class BooleanConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class BooleanConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/ByteConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/ByteConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/ByteConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/ByteConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class ByteConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class ByteConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class CharacterConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -68,8 +74,14 @@ public class CharacterConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/DateTimeConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/DateTimeConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/DateTimeConverter.java Mon Oct 24 17:09:33 2011
@@ -89,8 +89,14 @@ public class DateTimeConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -100,7 +106,9 @@ public class DateTimeConverter
DateFormat format = getDateFormat();
TimeZone tz = getTimeZone();
if( tz != null )
- format.setTimeZone( tz );
+ {
+ format.setTimeZone(tz);
+ }
try
{
return format.parse(value);
@@ -111,13 +119,21 @@ public class DateTimeConverter
Object[] args = new Object[]{value,format.format(new Date()),_MessageUtils.getLabel(facesContext, uiComponent)};
if(type.equals(TYPE_DATE))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATE_ID,args));
+ {
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, DATE_ID, args));
+ }
else if (type.equals(TYPE_TIME))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,TIME_ID,args));
+ {
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, TIME_ID, args));
+ }
else if (type.equals(TYPE_BOTH))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATETIME_ID,args));
+ {
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, DATETIME_ID, args));
+ }
else
+ {
throw new ConverterException("invalid type '" + _type + "'");
+ }
}
}
}
@@ -126,8 +142,14 @@ public class DateTimeConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
@@ -277,7 +299,10 @@ public class DateTimeConverter
@JSFProperty
public Locale getLocale()
{
- if (_locale != null) return _locale;
+ if (_locale != null)
+ {
+ return _locale;
+ }
FacesContext context = FacesContext.getCurrentInstance();
return context.getViewRoot().getLocale();
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/DoubleConverter.java Mon Oct 24 17:09:33 2011
@@ -52,8 +52,14 @@ public class DoubleConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -163,8 +169,14 @@ public class DoubleConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java Mon Oct 24 17:09:33 2011
@@ -60,7 +60,9 @@ public class EnumConverter implements Co
public EnumConverter(Class targetClass)
{
if (!targetClass.isEnum())
+ {
throw new IllegalArgumentException("targetClass for EnumConverter must be an Enum");
+ }
this.targetClass = targetClass;
}
@@ -68,14 +70,20 @@ public class EnumConverter implements Co
throws ConverterException
{
if (facesContext == null)
+ {
throw new NullPointerException("facesContext can not be null");
+ }
if (uiComponent == null)
+ {
throw new NullPointerException("uiComponent can not be null");
+ }
checkTargetClass(facesContext, uiComponent, value);
if (value == null)
+ {
return null;
+ }
if (value instanceof String
&& _isPassThroughStringValues(facesContext))
@@ -100,14 +108,22 @@ public class EnumConverter implements Co
throws ConverterException
{
if (facesContext == null)
+ {
throw new NullPointerException("facesContext");
+ }
if (uiComponent == null)
+ {
throw new NullPointerException("uiComponent");
+ }
if (value == null)
+ {
return null;
+ }
value = value.trim();
if (value.length() == 0)
+ {
return null;
+ }
checkTargetClass(facesContext, uiComponent, value);
// we know targetClass and value can't be null, so we can use Enum.valueOf
@@ -140,7 +156,9 @@ public class EnumConverter implements Co
Object[] enumConstants = targetClass.getEnumConstants();
if (enumConstants.length != 0)
+ {
return enumConstants[0].toString();
+ }
return ""; // if empty Enum
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/FloatConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class FloatConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class FloatConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/IntegerConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class IntegerConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class IntegerConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/LongConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class LongConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class LongConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java Mon Oct 24 17:09:33 2011
@@ -99,8 +99,14 @@ public class NumberConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -157,21 +163,29 @@ public class NumberConverter
{
if(getPattern() != null)
+ {
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- PATTERN_ID,
- new Object[]{value,"$###,###",_MessageUtils.getLabel(facesContext, uiComponent)}));
+ PATTERN_ID,
+ new Object[]{value, "$###,###", _MessageUtils.getLabel(facesContext, uiComponent)}));
+ }
else if(getType().equals("number"))
+ {
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- NUMBER_ID,
- new Object[]{value,format.format(21),_MessageUtils.getLabel(facesContext, uiComponent)}));
+ NUMBER_ID,
+ new Object[]{value, format.format(21), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ }
else if(getType().equals("currency"))
+ {
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- CURRENCY_ID,
- new Object[]{value,format.format(42.25),_MessageUtils.getLabel(facesContext, uiComponent)}));
+ CURRENCY_ID,
+ new Object[]{value, format.format(42.25), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ }
else if(getType().equals("percent"))
+ {
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- PERCENT_ID,
- new Object[]{value,format.format(.90),_MessageUtils.getLabel(facesContext, uiComponent)}));
+ PERCENT_ID,
+ new Object[]{value, format.format(.90), _MessageUtils.getLabel(facesContext, uiComponent)}));
+ }
}
}
}
@@ -181,8 +195,14 @@ public class NumberConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
@@ -195,10 +215,22 @@ public class NumberConverter
NumberFormat format = getNumberFormat(facesContext);
format.setGroupingUsed(_groupingUsed);
- if (_maxFractionDigitsSet) format.setMaximumFractionDigits(_maxFractionDigits);
- if (_maxIntegerDigitsSet) format.setMaximumIntegerDigits(_maxIntegerDigits);
- if (_minFractionDigitsSet) format.setMinimumFractionDigits(_minFractionDigits);
- if (_minIntegerDigitsSet) format.setMinimumIntegerDigits(_minIntegerDigits);
+ if (_maxFractionDigitsSet)
+ {
+ format.setMaximumFractionDigits(_maxFractionDigits);
+ }
+ if (_maxIntegerDigitsSet)
+ {
+ format.setMaximumIntegerDigits(_maxIntegerDigits);
+ }
+ if (_minFractionDigitsSet)
+ {
+ format.setMinimumFractionDigits(_minFractionDigits);
+ }
+ if (_minIntegerDigitsSet)
+ {
+ format.setMinimumIntegerDigits(_minIntegerDigits);
+ }
formatCurrency(format);
try
{
@@ -413,7 +445,10 @@ public class NumberConverter
@JSFProperty(deferredValueType="java.lang.Object")
public Locale getLocale()
{
- if (_locale != null) return _locale;
+ if (_locale != null)
+ {
+ return _locale;
+ }
FacesContext context = FacesContext.getCurrentInstance();
return context.getViewRoot().getLocale();
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/ShortConverter.java Mon Oct 24 17:09:33 2011
@@ -46,8 +46,14 @@ public class ShortConverter
// METHODS
public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value != null)
{
@@ -71,8 +77,14 @@ public class ShortConverter
public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object value)
{
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java Mon Oct 24 17:09:33 2011
@@ -185,11 +185,15 @@ class _MessageUtils
static Object getLabel(FacesContext facesContext, UIComponent component) {
Object label = component.getAttributes().get("label");
if(label != null)
+ {
return label;
+ }
ValueExpression expression = component.getValueExpression("label");
if(expression != null)
+ {
return expression;
+ }
//If no label is not specified, use clientId
return component.getClientId( facesContext );
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/_ParametrizableFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/_ParametrizableFacesMessage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/_ParametrizableFacesMessage.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/_ParametrizableFacesMessage.java Mon Oct 24 17:09:33 2011
@@ -50,7 +50,10 @@ class _ParametrizableFacesMessage extend
String summary, String detail, Object[] args, Locale locale)
{
super(summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
@@ -59,7 +62,10 @@ class _ParametrizableFacesMessage extend
String summary, String detail, Object[] args, Locale locale)
{
super(severity, summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java Mon Oct 24 17:09:33 2011
@@ -40,11 +40,17 @@ public class PhaseEvent extends EventObj
{
super(lifecycle);
if (facesContext == null)
+ {
throw new NullPointerException("facesContext");
+ }
if (phaseId == null)
+ {
throw new NullPointerException("phaseId");
+ }
if (lifecycle == null)
+ {
throw new NullPointerException("lifecycle");
+ }
_facesContext = facesContext;
_phaseId = phaseId;
@@ -76,33 +82,51 @@ public class PhaseEvent extends EventObj
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
final PhaseEvent other = (PhaseEvent) obj;
if (source == null)
{
if (other.source != null)
+ {
return false;
+ }
}
else if (!source.equals(other.source))
+ {
return false;
+ }
if (_facesContext == null)
{
if (other._facesContext != null)
+ {
return false;
+ }
}
else if (!_facesContext.equals(other._facesContext))
+ {
return false;
+ }
if (_phaseId == null)
{
if (other._phaseId != null)
+ {
return false;
+ }
}
else if (!_phaseId.equals(other._phaseId))
+ {
return false;
+ }
return true;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java Mon Oct 24 17:09:33 2011
@@ -38,7 +38,9 @@ public class ValueChangeEvent extends Fa
{
super(uiComponent);
if (uiComponent == null)
+ {
throw new IllegalArgumentException("uiComponent");
+ }
_oldValue = oldValue;
_newValue = newValue;
}