You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/03/22 22:44:25 UTC
svn commit: r926360 -
/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
Author: jakobk
Date: Mon Mar 22 21:44:25 2010
New Revision: 926360
URL: http://svn.apache.org/viewvc?rev=926360&view=rev
Log:
some code formatting
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java?rev=926360&r1=926359&r2=926360&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewParameter.java Mon Mar 22 21:44:25 2010
@@ -88,7 +88,8 @@ public class UIViewParameter extends UII
@Override
public void encodeAll(FacesContext context) throws IOException
{
- if (context == null) {
+ if (context == null)
+ {
throw new NullPointerException();
}
setSubmittedValue(getStringValue(context));
@@ -101,7 +102,8 @@ public class UIViewParameter extends UII
public String getStringValue(FacesContext context)
{
- if (getValueExpression ("value") != null) {
+ if (getValueExpression ("value") != null)
+ {
// Value specified as an expression, so do the conversion.
return getStringValueFromModel (context);
@@ -118,26 +120,27 @@ public class UIViewParameter extends UII
Converter converter;
Object value;
- if (ve == null) {
+ if (ve == null)
+ {
// No value expression, return null.
-
return null;
}
value = ve.getValue (context.getELContext());
- if (value instanceof String) {
+ if (value instanceof String)
+ {
// No need to convert.
-
return ((String) value);
}
converter = getConverter();
- if (converter == null) {
- if (value == null) {
+ if (converter == null)
+ {
+ if (value == null)
+ {
// No converter, no value, return null.
-
return null;
}
@@ -145,7 +148,8 @@ public class UIViewParameter extends UII
converter = context.getApplication().createConverter (value.getClass());
- if (converter == null) {
+ if (converter == null)
+ {
// Only option is to call toString().
return value.toString();
@@ -178,21 +182,24 @@ public class UIViewParameter extends UII
@Override
public void processValidators(FacesContext context)
{
- if (context == null) {
+ if (context == null)
+ {
throw new NullPointerException ("context");
}
// If value is null and required is set, validation fails.
- if ((getSubmittedValue() == null) && isRequired()) {
+ if ((getSubmittedValue() == null) && isRequired())
+ {
FacesMessage message;
String required = getRequiredMessage();
- if (required != null) {
+ if (required != null)
+ {
message = new FacesMessage (FacesMessage.SEVERITY_ERROR, required, required);
}
-
- else {
+ else
+ {
String label = _MessageUtils.getLabel (context, this);
message = _MessageUtils.getMessage (context, context.getViewRoot().getLocale(),
@@ -229,7 +236,8 @@ public class UIViewParameter extends UII
// Put name in request map if value is not a value expression, is valid, and local
// value was set.
- if ((getValueExpression ("value") == null) && isValid() && isLocalValueSet()) {
+ if ((getValueExpression ("value") == null) && isValid() && isLocalValueSet())
+ {
context.getExternalContext().getRequestMap().put (getName(), getLocalValue());
}
}