You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/03 23:18:39 UTC
svn commit: r673811 [1/5] - in /myfaces/core/trunk_1.2.x:
api/src/main/java-templates/javax/faces/component/
api/src/main/java/javax/faces/ api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/ api/src/main/java/javax/face...
Author: skitching
Date: Thu Jul 3 14:18:36 2008
New Revision: 673811
URL: http://svn.apache.org/viewvc?rev=673811&view=rev
Log:
Tabs to spaces only
Modified:
myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java
myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/FacesException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/FacesMessage.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandler.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/ContextCallback.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentUtils.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_MessageUtils.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/context/ExternalContext.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BooleanConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ByteConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/CharacterConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DateTimeConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DoubleConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/FloatConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/IntegerConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/LongConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/NumberConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ShortConverter.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_MessageUtils.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/EvaluationException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodBinding.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodNotFoundException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/VariableResolver.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/AbortProcessingException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionEvent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionListener.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/FacesEvent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseEvent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseId.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseListener.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeEvent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeListener.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ArrayDataModel.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelEvent.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelListener.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ResultSetDataModel.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItem.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItemGroup.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LengthValidator.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LongRangeValidator.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/Validator.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/ValidatorException.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_MessageUtils.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/FacesServlet.java
myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/FacesExceptionTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/application/FacesMessageTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UIInputTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UISelectManyTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/MessageUtilsTest.java
myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/GuiceResolver.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/AbstractMyFacesListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionAttributeListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesHttpSessionListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletContextListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServletRequestListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/MyfacesServletRequestAttributeListener.java
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/DefaultViewHandlerSupportTest.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotationProcessorTestCase.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/config/annotation/OwnAnnotationProcessorTestCase.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/DummyBean.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/ValueBindingImplCactus.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/unified/resolver/BulkOrder.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/unified/resolver/GuiceResolverTestCase.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/unified/resolver/Order.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ShoppingCart.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/el/unified/resolver/ShoppingModule.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/lifecycle/InstrumentingPhaseListener.java
myfaces/core/trunk_1.2.x/impl/src/test/java/org/apache/myfaces/lifecycle/LifecycleImplCactus.java
Modified: myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java Thu Jul 3 14:18:36 2008
@@ -197,7 +197,7 @@
if (expression == null) return;
try
{
- expression.setValue(context.getELContext(), getLocalValue());
+ expression.setValue(context.getELContext(), getLocalValue());
setValue(null);
setLocalValueSet(false);
}
@@ -243,14 +243,14 @@
if (isRequired() && empty)
{
- if(getRequiredMessage() != null) {
- String requiredMessage = getRequiredMessage();
- context.addMessage(this.getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,requiredMessage,requiredMessage));
- } else {
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
- }
- setValid(false);
- return;
+ if(getRequiredMessage() != null) {
+ String requiredMessage = getRequiredMessage();
+ context.addMessage(this.getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,requiredMessage,requiredMessage));
+ } else {
+ _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
+ }
+ setValid(false);
+ return;
}
if (!empty)
@@ -360,11 +360,11 @@
}
catch (ConverterException e)
{
- String converterMessage = getConverterMessage();
- if(converterMessage != null) {
- context.addMessage(getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,converterMessage,converterMessage));
- } else {
- FacesMessage facesMessage = e.getFacesMessage();
+ String converterMessage = getConverterMessage();
+ if(converterMessage != null) {
+ context.addMessage(getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,converterMessage,converterMessage));
+ } else {
+ FacesMessage facesMessage = e.getFacesMessage();
if (facesMessage != null)
{
context.addMessage(getClientId(context), facesMessage);
@@ -373,8 +373,8 @@
{
_MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
}
- }
- setValid(false);
+ }
+ setValid(false);
}
return submittedValue;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java Thu Jul 3 14:18:36 2008
@@ -268,7 +268,7 @@
// verify that iterator was successfully created for convertedValue type
if (itemValues == null)
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -278,7 +278,7 @@
// if UISelectMany is required, then there must be some selected values
if (isRequired() && !hasValues)
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -323,7 +323,7 @@
if (!_SelectItemsUtil.matchValue(context, itemValue,
items.iterator(), converter))
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/FacesException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/FacesException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/FacesException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/FacesException.java Thu Jul 3 14:18:36 2008
@@ -24,9 +24,9 @@
public class FacesException
extends RuntimeException
{
- private static final long serialVersionUID = 6592152487577416317L;
+ private static final long serialVersionUID = 6592152487577416317L;
- public FacesException()
+ public FacesException()
{
super();
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/FacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/FacesMessage.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/FacesMessage.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/FacesMessage.java Thu Jul 3 14:18:36 2008
@@ -27,9 +27,9 @@
public class FacesMessage
implements Serializable
{
- private static final long serialVersionUID = 4851488727794169661L;
+ private static final long serialVersionUID = 4851488727794169661L;
- public static final String FACES_MESSAGES = "javax.faces.Messages";
+ public static final String FACES_MESSAGES = "javax.faces.Messages";
public static final FacesMessage.Severity SEVERITY_INFO = new Severity("Info", 1);
public static final FacesMessage.Severity SEVERITY_WARN = new Severity("Warn", 2);
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandler.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandler.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandler.java Thu Jul 3 14:18:36 2008
@@ -70,29 +70,29 @@
*/
public String calculateCharacterEncoding(javax.faces.context.FacesContext context)
{
- String _encoding = null;
- ExternalContext externalContext = context.getExternalContext();
+ String _encoding = null;
+ ExternalContext externalContext = context.getExternalContext();
String _contentType = (String) externalContext.getRequestHeaderMap().get("Content-Type");
- int _indexOf = _contentType == null ? -1 :_contentType.indexOf("charset");
- if(_indexOf != -1)
- {
- String _tempEnc =_contentType.substring(_indexOf); //charset=UTF-8
- _encoding = _tempEnc.substring(_tempEnc.indexOf("=")+1); //UTF-8
- }
- else
- {
- boolean _sessionAvailable = externalContext.getSession(false) != null;
- if(_sessionAvailable)
- {
- Object _sessionParam = externalContext.getSessionMap().get(CHARACTER_ENCODING_KEY);
- if (_sessionParam != null)
- {
- _encoding = _sessionParam.toString();
- }
- }
- }
-
- return _encoding;
+ int _indexOf = _contentType == null ? -1 :_contentType.indexOf("charset");
+ if(_indexOf != -1)
+ {
+ String _tempEnc =_contentType.substring(_indexOf); //charset=UTF-8
+ _encoding = _tempEnc.substring(_tempEnc.indexOf("=")+1); //UTF-8
+ }
+ else
+ {
+ boolean _sessionAvailable = externalContext.getSession(false) != null;
+ if(_sessionAvailable)
+ {
+ Object _sessionParam = externalContext.getSessionMap().get(CHARACTER_ENCODING_KEY);
+ if (_sessionParam != null)
+ {
+ _encoding = _sessionParam.toString();
+ }
+ }
+ }
+
+ return _encoding;
}
/**
@@ -155,18 +155,18 @@
*/
public void initView(javax.faces.context.FacesContext context) throws FacesException
{
- String _encoding = this.calculateCharacterEncoding(context);
- if(_encoding != null)
- {
- try
- {
- context.getExternalContext().setRequestCharacterEncoding(_encoding);
- }
- catch(UnsupportedEncodingException uee)
- {
- throw new FacesException(uee);
- }
- }
+ String _encoding = this.calculateCharacterEncoding(context);
+ if(_encoding != null)
+ {
+ try
+ {
+ context.getExternalContext().setRequestCharacterEncoding(_encoding);
+ }
+ catch(UnsupportedEncodingException uee)
+ {
+ throw new FacesException(uee);
+ }
+ }
}
/**
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java Thu Jul 3 14:18:36 2008
@@ -30,14 +30,14 @@
public abstract class ViewHandlerWrapper extends ViewHandler {
@Override
- public String calculateCharacterEncoding(FacesContext context) {
- return getWrapped().calculateCharacterEncoding(context);
- }
-
- @Override
- public void initView(FacesContext context) throws FacesException {
- getWrapped().initView(context);
- }
+ public String calculateCharacterEncoding(FacesContext context) {
+ return getWrapped().calculateCharacterEncoding(context);
+ }
+
+ @Override
+ public void initView(FacesContext context) throws FacesException {
+ getWrapped().initView(context);
+ }
protected abstract ViewHandler getWrapped();
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/ContextCallback.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/ContextCallback.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/ContextCallback.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/ContextCallback.java Thu Jul 3 14:18:36 2008
@@ -31,5 +31,5 @@
* @param context <code>FacesContext</code> for the current request
* @param target <code>UIComponent</code> on which the <code>UIComponent.invokeOnComponent()</code> will be called
*/
- void invokeContextCallback(FacesContext context, UIComponent target);
+ void invokeContextCallback(FacesContext context, UIComponent target);
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponent.java Thu Jul 3 14:18:36 2008
@@ -145,31 +145,31 @@
*/
public boolean invokeOnComponent(javax.faces.context.FacesContext context, String clientId, javax.faces.component.ContextCallback callback) throws javax.faces.FacesException
{
- //java.lang.NullPointerException - if any of the arguments are null
- if(context == null || clientId == null || callback == null)
- {
- throw new NullPointerException();
- }
-
- //searching for this component?
- boolean found = clientId.equals(this.getClientId(context));
- if(found)
- {
- try
- {
- callback.invokeContextCallback(context, this);
- } catch(Exception e)
- {
- throw new FacesException(e);
- }
- return found;
- }
- //Searching for this component's children/facets
- for (Iterator<UIComponent> it = this.getFacetsAndChildren(); !found && it.hasNext();){
- found = it.next().invokeOnComponent(context, clientId, callback);
- }
-
- return found;
+ //java.lang.NullPointerException - if any of the arguments are null
+ if(context == null || clientId == null || callback == null)
+ {
+ throw new NullPointerException();
+ }
+
+ //searching for this component?
+ boolean found = clientId.equals(this.getClientId(context));
+ if(found)
+ {
+ try
+ {
+ callback.invokeContextCallback(context, this);
+ } catch(Exception e)
+ {
+ throw new FacesException(e);
+ }
+ return found;
+ }
+ //Searching for this component's children/facets
+ for (Iterator<UIComponent> it = this.getFacetsAndChildren(); !found && it.hasNext();){
+ found = it.next().invokeOnComponent(context, clientId, callback);
+ }
+
+ return found;
}
public abstract java.lang.String getClientId(javax.faces.context.FacesContext context);
@@ -228,35 +228,35 @@
throws java.io.IOException;
public abstract void encodeEnd(javax.faces.context.FacesContext context)
- throws java.io.IOException;
+ throws java.io.IOException;
public void encodeAll(javax.faces.context.FacesContext context) throws java.io.IOException
{
- if(context == null)
- {
- throw new NullPointerException();
- }
-
- if(isRendered())
- {
- this.encodeBegin(context);
-
- //rendering children
- if(this.getRendersChildren())
- {
- this.encodeChildren(context);
- }
- //let children render itself
- else
- {
+ if(context == null)
+ {
+ throw new NullPointerException();
+ }
+
+ if(isRendered())
+ {
+ this.encodeBegin(context);
+
+ //rendering children
+ if(this.getRendersChildren())
+ {
+ this.encodeChildren(context);
+ }
+ //let children render itself
+ else
+ {
if(this.getChildCount()>0) {
- for (UIComponent comp : this.getChildren()) {
- comp.encodeAll(context);
- }
+ for (UIComponent comp : this.getChildren()) {
+ comp.encodeAll(context);
+ }
}
- }
+ }
this.encodeEnd(context);
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIComponentBase.java Thu Jul 3 14:18:36 2008
@@ -286,7 +286,7 @@
* <code>invokeOnComponent</code> must be implemented in <code>UIComponentBase</code> too...
*/
public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback callback) throws FacesException{
- return super.invokeOnComponent(context, clientId, callback);
+ return super.invokeOnComponent(context, clientId, callback);
}
/**
@@ -449,7 +449,7 @@
findBase = _ComponentUtils.findComponent(findBase, id);
if (findBase == null)
{
- return null;
+ return null;
}
if (!(findBase instanceof NamingContainer))
@@ -1076,7 +1076,7 @@
private Object saveAttributesMap()
{
- return _attributesMap != null ? _attributesMap.getUnderlyingMap() : null;
+ return _attributesMap != null ? _attributesMap.getUnderlyingMap() : null;
}
private void restoreAttributesMap(Object stateObj)
@@ -1148,7 +1148,7 @@
// If new id is the same as old it must be valid
if (string.equals(_id)) {
- return;
+ return;
}
//2. First character must be a letter or an underscore ('_').
@@ -1158,7 +1158,7 @@
}
for (int i = 1; i < string.length(); i++)
{
- char c = string.charAt(i);
+ char c = string.charAt(i);
//3. Subsequent characters must be a letter, a digit, an underscore ('_'), or a dash ('-').
if(!Character.isLetterOrDigit(c) && c !='-' && c !='_')
{
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java Thu Jul 3 14:18:36 2008
@@ -966,10 +966,10 @@
/**
* Gets An EL expression that specifies the data model that backs this table. The value can be of any type.
*
- * A value of type DataModel is used directly. Array-like parameters of type java.util.List, array of Object,
- * java.sql.ResultSet, or javax.servlet.jsp.jstl.sql.Result are wrapped in a DataModel.
+ * A value of type DataModel is used directly. Array-like parameters of type java.util.List, array of Object,
+ * java.sql.ResultSet, or javax.servlet.jsp.jstl.sql.Result are wrapped in a DataModel.
*
- * Other values are wrapped in a DataModel as a single row.
+ * Other values are wrapped in a DataModel as a single row.
*
* @return the new value value
*/
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIInput.java Thu Jul 3 14:18:36 2008
@@ -232,7 +232,7 @@
if (expression == null) return;
try
{
- expression.setValue(context.getELContext(), getLocalValue());
+ expression.setValue(context.getELContext(), getLocalValue());
setValue(null);
setLocalValueSet(false);
}
@@ -277,14 +277,14 @@
if (isRequired() && empty)
{
- if(getRequiredMessage() != null) {
- String requiredMessage = getRequiredMessage();
- context.addMessage(this.getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,requiredMessage,requiredMessage));
- } else {
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
- }
- setValid(false);
- return;
+ if(getRequiredMessage() != null) {
+ String requiredMessage = getRequiredMessage();
+ context.addMessage(this.getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,requiredMessage,requiredMessage));
+ } else {
+ _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
+ }
+ setValid(false);
+ return;
}
if (!empty)
@@ -394,11 +394,11 @@
}
catch (ConverterException e)
{
- String converterMessage = getConverterMessage();
- if(converterMessage != null) {
- context.addMessage(getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,converterMessage,converterMessage));
- } else {
- FacesMessage facesMessage = e.getFacesMessage();
+ String converterMessage = getConverterMessage();
+ if(converterMessage != null) {
+ context.addMessage(getClientId(context),new FacesMessage(FacesMessage.SEVERITY_ERROR,converterMessage,converterMessage));
+ } else {
+ FacesMessage facesMessage = e.getFacesMessage();
if (facesMessage != null)
{
context.addMessage(getClientId(context), facesMessage);
@@ -407,8 +407,8 @@
{
_MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,new Object[]{_MessageUtils.getLabel(context,this)});
}
- }
- setValid(false);
+ }
+ setValid(false);
}
return submittedValue;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java Thu Jul 3 14:18:36 2008
@@ -305,7 +305,7 @@
// verify that iterator was successfully created for convertedValue type
if (itemValues == null)
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -315,7 +315,7 @@
// if UISelectMany is required, then there must be some selected values
if (isRequired() && !hasValues)
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -360,7 +360,7 @@
if (!_SelectItemsUtil.matchValue(context, itemValue,
items.iterator(), converter))
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java Thu Jul 3 14:18:36 2008
@@ -441,7 +441,7 @@
@Override
public boolean isRendered()
{
- return true;
+ return true;
}
/**
@@ -468,7 +468,7 @@
public String getId()
{
- //return null;
+ //return null;
return super.getId();
}
@@ -477,7 +477,7 @@
*/
public String getClientId(FacesContext context)
{
- return null;
+ return null;
}
// Property: viewId
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java Thu Jul 3 14:18:36 2008
@@ -25,8 +25,8 @@
class _AttachedListStateWrapper
implements Serializable
{
- private static final long serialVersionUID = -3958718149793179776L;
- private List<Object> _wrappedStateList;
+ private static final long serialVersionUID = -3958718149793179776L;
+ private List<Object> _wrappedStateList;
public _AttachedListStateWrapper(List<Object> wrappedStateList)
{
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java Thu Jul 3 14:18:36 2008
@@ -24,8 +24,8 @@
class _AttachedStateWrapper
implements Serializable
{
- private static final long serialVersionUID = 4948301780259917764L;
- private Class _class;
+ private static final long serialVersionUID = 4948301780259917764L;
+ private Class _class;
private Object _wrappedStateObject;
/**
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentChildrenList.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentChildrenList.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Thu Jul 3 14:18:36 2008
@@ -28,8 +28,8 @@
extends AbstractList
implements Serializable
{
- private static final long serialVersionUID = -6775078929331154224L;
- private UIComponent _component;
+ private static final long serialVersionUID = -6775078929331154224L;
+ private UIComponent _component;
private List<Object> _list = new ArrayList<Object>();
_ComponentChildrenList(UIComponent component)
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java Thu Jul 3 14:18:36 2008
@@ -25,8 +25,8 @@
class _ComponentFacetMap<V extends UIComponent>
implements Map<String, V>, Serializable
{
- private static final long serialVersionUID = -3456937594422167629L;
- private UIComponent _component;
+ private static final long serialVersionUID = -3456937594422167629L;
+ private UIComponent _component;
private Map<String, V> _map = new HashMap<String, V>();
_ComponentFacetMap(UIComponent component)
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentUtils.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_ComponentUtils.java Thu Jul 3 14:18:36 2008
@@ -157,19 +157,19 @@
}
catch (ValidatorException e)
{
- input.setValid(false);
-
- String validatorMessage = input.getValidatorMessage();
- if(validatorMessage != null) {
- context.addMessage(input.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,validatorMessage,validatorMessage));
- } else {
- FacesMessage facesMessage = e.getFacesMessage();
- if (facesMessage != null)
+ input.setValid(false);
+
+ String validatorMessage = input.getValidatorMessage();
+ if(validatorMessage != null) {
+ context.addMessage(input.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,validatorMessage,validatorMessage));
+ } else {
+ FacesMessage facesMessage = e.getFacesMessage();
+ if (facesMessage != null)
{
- facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(input.getClientId(context), facesMessage);
+ facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(input.getClientId(context), facesMessage);
}
- }
+ }
}
}
@@ -189,17 +189,17 @@
Throwable cause = e.getCause();
if (cause instanceof ValidatorException)
{
- String validatorMessage = input.getValidatorMessage();
- if(validatorMessage != null) {
- context.addMessage(input.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,validatorMessage,validatorMessage));
- }
- else {
- FacesMessage facesMessage = ((ValidatorException)cause).getFacesMessage();
- if (facesMessage != null)
- {
- facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(input.getClientId(context), facesMessage);
- }
+ String validatorMessage = input.getValidatorMessage();
+ if(validatorMessage != null) {
+ context.addMessage(input.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,validatorMessage,validatorMessage));
+ }
+ else {
+ FacesMessage facesMessage = ((ValidatorException)cause).getFacesMessage();
+ if (facesMessage != null)
+ {
+ facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(input.getClientId(context), facesMessage);
+ }
}
}
else
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_LabeledFacesMessage.java Thu Jul 3 14:18:36 2008
@@ -28,45 +28,45 @@
* @version $Revision$ $Date$
*/
class _LabeledFacesMessage extends FacesMessage{
-
- public _LabeledFacesMessage() {
- super();
- }
-
- public _LabeledFacesMessage(Severity severity, String summary,
- String detail, Object args[]) {
- super(severity, summary, detail);
-
- }
-
- public _LabeledFacesMessage(Severity severity, String summary,
- String detail) {
- super(severity, summary, detail);
- }
-
- public _LabeledFacesMessage(String summary, String detail) {
- super(summary, detail);
- }
-
- public _LabeledFacesMessage(String summary) {
- super(summary);
- }
-
- @Override
- public String getDetail() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
-
- @Override
- public String getSummary() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
-
+
+ public _LabeledFacesMessage() {
+ super();
+ }
+
+ public _LabeledFacesMessage(Severity severity, String summary,
+ String detail, Object args[]) {
+ super(severity, summary, detail);
+
+ }
+
+ public _LabeledFacesMessage(Severity severity, String summary,
+ String detail) {
+ super(severity, summary, detail);
+ }
+
+ public _LabeledFacesMessage(String summary, String detail) {
+ super(summary, detail);
+ }
+
+ public _LabeledFacesMessage(String summary) {
+ super(summary);
+ }
+
+ @Override
+ public String getDetail() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
+
+ @Override
+ public String getSummary() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
+
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_MessageUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_MessageUtils.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_MessageUtils.java Thu Jul 3 14:18:36 2008
@@ -32,29 +32,29 @@
{
private static final String DETAIL_SUFFIX = "_detail";
- static void addErrorMessage(FacesContext facesContext,
- UIComponent component,
- String messageId)
- {
- facesContext.addMessage(component.getClientId(facesContext),
- getMessage(facesContext,
- facesContext.getViewRoot().getLocale(),
- FacesMessage.SEVERITY_ERROR,
- messageId,
- null));
- }
-
- static void addErrorMessage(FacesContext facesContext,
- UIComponent component,
- String messageId, Object[] args)
- {
- facesContext.addMessage(component.getClientId(facesContext),
- getMessage(facesContext,
- facesContext.getViewRoot().getLocale(),
- FacesMessage.SEVERITY_ERROR,
- messageId,
- args));
- }
+ static void addErrorMessage(FacesContext facesContext,
+ UIComponent component,
+ String messageId)
+ {
+ facesContext.addMessage(component.getClientId(facesContext),
+ getMessage(facesContext,
+ facesContext.getViewRoot().getLocale(),
+ FacesMessage.SEVERITY_ERROR,
+ messageId,
+ null));
+ }
+
+ static void addErrorMessage(FacesContext facesContext,
+ UIComponent component,
+ String messageId, Object[] args)
+ {
+ facesContext.addMessage(component.getClientId(facesContext),
+ getMessage(facesContext,
+ facesContext.getViewRoot().getLocale(),
+ FacesMessage.SEVERITY_ERROR,
+ messageId,
+ args));
+ }
static void addErrorMessage(FacesContext facesContext,
UIComponent component, Throwable cause)
@@ -200,16 +200,16 @@
}
static String getLabel(FacesContext facesContext, UIComponent component) {
- Object label = component.getAttributes().get("label");
- if(label != null)
- return label.toString();
-
- ValueExpression expression = component.getValueExpression("label");
- if(expression != null)
- return expression.getExpressionString();
- //return (String)expression.getValue(facesContext.getELContext());
-
- //If no label is not specified, use clientId
- return component.getClientId( facesContext );
+ Object label = component.getAttributes().get("label");
+ if(label != null)
+ return label.toString();
+
+ ValueExpression expression = component.getValueExpression("label");
+ if(expression != null)
+ return expression.getExpressionString();
+ //return (String)expression.getValue(facesContext.getELContext());
+
+ //If no label is not specified, use clientId
+ return component.getClientId( facesContext );
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_SharedRendererUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_SharedRendererUtils.java Thu Jul 3 14:18:36 2008
@@ -34,7 +34,7 @@
*/
class _SharedRendererUtils
{
- static Converter findUIOutputConverter(FacesContext facesContext, UIOutput component)
+ static Converter findUIOutputConverter(FacesContext facesContext, UIOutput component)
{
// Attention!
// This code is duplicated in jsfapi component package.
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/context/ExternalContext.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/context/ExternalContext.java Thu Jul 3 14:18:36 2008
@@ -58,12 +58,12 @@
public String getRequestCharacterEncoding()
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
public String getRequestContentType()
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
public abstract String getRequestContextPath();
@@ -121,7 +121,7 @@
*/
public void setRequest(java.lang.Object request)
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
/**
@@ -131,9 +131,9 @@
* @throws java.io.UnsupportedEncodingException
*/
public void setRequestCharacterEncoding(java.lang.String encoding)
- throws java.io.UnsupportedEncodingException{
-
- throw new UnsupportedOperationException();
+ throws java.io.UnsupportedEncodingException{
+
+ throw new UnsupportedOperationException();
}
/**
@@ -143,7 +143,7 @@
*/
public void setResponse(java.lang.Object response)
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
/**
@@ -153,7 +153,7 @@
*/
public void setResponseCharacterEncoding(java.lang.String encoding)
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
public String getResponseCharacterEncoding()
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigDecimalConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigDecimalConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigDecimalConverter.java Thu Jul 3 14:18:36 2008
@@ -85,7 +85,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigIntegerConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigIntegerConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BigIntegerConverter.java Thu Jul 3 14:18:36 2008
@@ -83,7 +83,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BooleanConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BooleanConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BooleanConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/BooleanConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ByteConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ByteConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ByteConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ByteConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/CharacterConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/CharacterConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/CharacterConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/CharacterConverter.java Thu Jul 3 14:18:36 2008
@@ -48,13 +48,13 @@
value = value.trim();
if (value.length() > 0)
{
- try {
- return new Character(value.charAt(0));
- }catch(Exception e) {
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- CHARACTER_ID,
- new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}), e);
- }
+ try {
+ return new Character(value.charAt(0));
+ }catch(Exception e) {
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ CHARACTER_ID,
+ new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}), e);
+ }
}
}
return null;
@@ -79,7 +79,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DateTimeConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DateTimeConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DateTimeConverter.java Thu Jul 3 14:18:36 2008
@@ -87,21 +87,21 @@
}
catch (ParseException e)
{
- try {
- String type = getType();
- Object[] args = new Object[]{value,format.parse(new Date().toString()),_MessageUtils.getLabel(facesContext, uiComponent)};
-
- if(type.equals(TYPE_DATE))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATE_ID,args));
- else if (type.equals(TYPE_TIME))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,TIME_ID,args));
- else if (type.equals(TYPE_BOTH))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATETIME_ID,args));
- else
- throw new ConverterException("invalid type '" + _type + "'");
- }catch(ParseException exception) {
- throw new ConverterException(exception);
- }
+ try {
+ String type = getType();
+ Object[] args = new Object[]{value,format.parse(new Date().toString()),_MessageUtils.getLabel(facesContext, uiComponent)};
+
+ if(type.equals(TYPE_DATE))
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATE_ID,args));
+ else if (type.equals(TYPE_TIME))
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,TIME_ID,args));
+ else if (type.equals(TYPE_BOTH))
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,DATETIME_ID,args));
+ else
+ throw new ConverterException("invalid type '" + _type + "'");
+ }catch(ParseException exception) {
+ throw new ConverterException(exception);
+ }
}
}
}
@@ -134,7 +134,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DoubleConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DoubleConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DoubleConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/DoubleConverter.java Thu Jul 3 14:18:36 2008
@@ -55,7 +55,7 @@
catch (NumberFormatException e)
{
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- DOUBLE_ID,
+ DOUBLE_ID,
new Object[]{value,"4214",_MessageUtils.getLabel(facesContext, uiComponent)}), e);
}
}
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java Thu Jul 3 14:18:36 2008
@@ -80,14 +80,14 @@
}
}
- private void checkTargetClass(FacesContext facesContext, UIComponent uiComponent, Object value) {
- if (targetClass == null) {
+ private void checkTargetClass(FacesContext facesContext, UIComponent uiComponent, Object value) {
+ if (targetClass == null) {
Object[] params = new Object[]{value, _MessageUtils.getLabel(facesContext, uiComponent)};
throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
ENUM_NO_CLASS_ID,
params));
}
- }
+ }
// find the first constant value of the targetClass and return as a String
private String firstConstantOfEnum() {
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/FloatConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/FloatConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/FloatConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/FloatConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/IntegerConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/IntegerConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/IntegerConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/IntegerConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/LongConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/LongConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/LongConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/LongConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/NumberConverter.java Thu Jul 3 14:18:36 2008
@@ -114,22 +114,22 @@
catch (ParseException pe)
{
- if(getPattern() != null)
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- 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,"21",_MessageUtils.getLabel(facesContext, uiComponent)}));
- else if(getType().equals("currency"))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- CURRENCY_ID,
- new Object[]{value,"42.25",_MessageUtils.getLabel(facesContext, uiComponent)}));
- else if(getType().equals("percent"))
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
- PERCENT_ID,
- new Object[]{value,".90",_MessageUtils.getLabel(facesContext, uiComponent)}));
+ if(getPattern() != null)
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ 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,"21",_MessageUtils.getLabel(facesContext, uiComponent)}));
+ else if(getType().equals("currency"))
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ CURRENCY_ID,
+ new Object[]{value,"42.25",_MessageUtils.getLabel(facesContext, uiComponent)}));
+ else if(getType().equals("percent"))
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
+ PERCENT_ID,
+ new Object[]{value,".90",_MessageUtils.getLabel(facesContext, uiComponent)}));
}
}
}
@@ -164,7 +164,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ShortConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ShortConverter.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ShortConverter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/ShortConverter.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
}
catch (Exception e)
{
- throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
+ throw new ConverterException(_MessageUtils.getErrorMessage(facesContext, STRING_ID, new Object[]{value,_MessageUtils.getLabel(facesContext, uiComponent)}),e);
}
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_LabeledFacesMessage.java Thu Jul 3 14:18:36 2008
@@ -28,45 +28,45 @@
* @version $Revision$ $Date$
*/
class _LabeledFacesMessage extends FacesMessage{
-
- public _LabeledFacesMessage() {
- super();
- }
-
- public _LabeledFacesMessage(Severity severity, String summary,
- String detail, Object args[]) {
- super(severity, summary, detail);
-
- }
-
- public _LabeledFacesMessage(Severity severity, String summary,
- String detail) {
- super(severity, summary, detail);
- }
-
- public _LabeledFacesMessage(String summary, String detail) {
- super(summary, detail);
- }
-
- public _LabeledFacesMessage(String summary) {
- super(summary);
- }
-
- @Override
- public String getDetail() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
-
- @Override
- public String getSummary() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
-
+
+ public _LabeledFacesMessage() {
+ super();
+ }
+
+ public _LabeledFacesMessage(Severity severity, String summary,
+ String detail, Object args[]) {
+ super(severity, summary, detail);
+
+ }
+
+ public _LabeledFacesMessage(Severity severity, String summary,
+ String detail) {
+ super(severity, summary, detail);
+ }
+
+ public _LabeledFacesMessage(String summary, String detail) {
+ super(summary, detail);
+ }
+
+ public _LabeledFacesMessage(String summary) {
+ super(summary);
+ }
+
+ @Override
+ public String getDetail() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
+
+ @Override
+ public String getSummary() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
+
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_MessageUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_MessageUtils.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/convert/_MessageUtils.java Thu Jul 3 14:18:36 2008
@@ -179,17 +179,17 @@
}
static String getLabel(FacesContext facesContext, UIComponent component) {
- Object label = component.getAttributes().get("label");
- if(label != null)
- return label.toString();
-
- ValueExpression expression = component.getValueExpression("label");
- if(expression != null)
- return expression.getExpressionString();
- //return (String)expression.getValue(facesContext.getELContext());
-
- //If no label is not specified, use clientId
- return component.getClientId( facesContext );
+ Object label = component.getAttributes().get("label");
+ if(label != null)
+ return label.toString();
+
+ ValueExpression expression = component.getValueExpression("label");
+ if(expression != null)
+ return expression.getExpressionString();
+ //return (String)expression.getValue(facesContext.getELContext());
+
+ //If no label is not specified, use clientId
+ return component.getClientId( facesContext );
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/EvaluationException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/EvaluationException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/EvaluationException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/EvaluationException.java Thu Jul 3 14:18:36 2008
@@ -27,38 +27,38 @@
public class EvaluationException extends FacesException
{
private static final long serialVersionUID = 4668524591042216006L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
/**
* @deprecated
*/
- public EvaluationException()
+ public EvaluationException()
{
- super();
- }
+ super();
+ }
/**
* @deprecated
*/
- public EvaluationException(String message)
- {
- super(message);
- }
+ public EvaluationException(String message)
+ {
+ super(message);
+ }
/**
* @deprecated
*/
- public EvaluationException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public EvaluationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
/**
* @deprecated
*/
- public EvaluationException(Throwable cause)
- {
+ public EvaluationException(Throwable cause)
+ {
super(cause);
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodBinding.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodBinding.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodBinding.java Thu Jul 3 14:18:36 2008
@@ -27,26 +27,26 @@
public abstract class MethodBinding
{
- // FIELDS
+ // FIELDS
- // CONSTRUCTORS
+ // CONSTRUCTORS
/**
* @deprecated
*/
- public MethodBinding()
- {
- }
+ public MethodBinding()
+ {
+ }
- // METHODS
-
- /**
- * returns the <code>String</code> of your expression like <code>#{bean.foo}</code>.
+ // METHODS
+
+ /**
+ * returns the <code>String</code> of your expression like <code>#{bean.foo}</code>.
* @deprecated
- */
- public String getExpressionString()
- {
+ */
+ public String getExpressionString()
+ {
return null;
- }
+ }
/**
* @deprecated
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodNotFoundException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodNotFoundException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/MethodNotFoundException.java Thu Jul 3 14:18:36 2008
@@ -25,38 +25,38 @@
public class MethodNotFoundException extends EvaluationException
{
private static final long serialVersionUID = 7107789255726890536L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
/**
* @deprecated
*/
- public MethodNotFoundException()
- {
- super();
- }
+ public MethodNotFoundException()
+ {
+ super();
+ }
/**
* @deprecated
*/
- public MethodNotFoundException(String message)
- {
+ public MethodNotFoundException(String message)
+ {
super(message);
- }
+ }
/**
* @deprecated
*/
- public MethodNotFoundException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public MethodNotFoundException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
/**
* @deprecated
*/
- public MethodNotFoundException(Throwable cause)
- {
- super(cause);
- }
+ public MethodNotFoundException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/PropertyNotFoundException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/PropertyNotFoundException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/PropertyNotFoundException.java Thu Jul 3 14:18:36 2008
@@ -26,38 +26,38 @@
{
private static final long serialVersionUID = -7271529989175141594L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
/**
* @deprecated
*/
- public PropertyNotFoundException()
- {
- super();
- }
+ public PropertyNotFoundException()
+ {
+ super();
+ }
/**
* @deprecated
*/
- public PropertyNotFoundException(String message)
- {
- super(message);
- }
+ public PropertyNotFoundException(String message)
+ {
+ super(message);
+ }
/**
* @deprecated
*/
- public PropertyNotFoundException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public PropertyNotFoundException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
/**
* @deprecated
*/
- public PropertyNotFoundException(Throwable cause)
- {
- super(cause);
- }
+ public PropertyNotFoundException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java Thu Jul 3 14:18:36 2008
@@ -26,38 +26,38 @@
{
private static final long serialVersionUID = -2099185257291689817L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
/**
* @deprecated
*/
- public ReferenceSyntaxException()
- {
- super();
- }
+ public ReferenceSyntaxException()
+ {
+ super();
+ }
/**
* @deprecated
*/
- public ReferenceSyntaxException(String message)
- {
- super(message);
- }
+ public ReferenceSyntaxException(String message)
+ {
+ super(message);
+ }
/**
* @deprecated
*/
- public ReferenceSyntaxException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public ReferenceSyntaxException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
/**
* @deprecated
*/
- public ReferenceSyntaxException(Throwable cause)
- {
- super(cause);
- }
+ public ReferenceSyntaxException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/VariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/VariableResolver.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/VariableResolver.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/el/VariableResolver.java Thu Jul 3 14:18:36 2008
@@ -27,20 +27,20 @@
*/
public abstract class VariableResolver
{
- // FIELDS
+ // FIELDS
- // CONSTRUCTORS
+ // CONSTRUCTORS
/**
* @deprecated
*/
- public VariableResolver()
- {
- }
+ public VariableResolver()
+ {
+ }
- // METHODS
+ // METHODS
/**
* @deprecated
*/
- public abstract Object resolveVariable(FacesContext facesContext, String name)
+ public abstract Object resolveVariable(FacesContext facesContext, String name)
throws EvaluationException;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/AbortProcessingException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/AbortProcessingException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/AbortProcessingException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/AbortProcessingException.java Thu Jul 3 14:18:36 2008
@@ -26,26 +26,26 @@
public class AbortProcessingException extends FacesException
{
private static final long serialVersionUID = 612682812558934753L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public AbortProcessingException()
- {
- super();
- }
+ public AbortProcessingException()
+ {
+ super();
+ }
- public AbortProcessingException(String message)
- {
- super(message);
- }
+ public AbortProcessingException(String message)
+ {
+ super(message);
+ }
- public AbortProcessingException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public AbortProcessingException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
- public AbortProcessingException(Throwable cause)
- {
- super(cause);
- }
+ public AbortProcessingException(Throwable cause)
+ {
+ super(cause);
+ }
}