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:07:48 UTC
svn commit: r673803 [1/4] - in /myfaces/core/trunk:
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/faces/convert/ api/src/main/java/javax/faces/el/
api/src/main...
Author: skitching
Date: Thu Jul 3 14:07:46 2008
New Revision: 673803
URL: http://svn.apache.org/viewvc?rev=673803&view=rev
Log:
Tabs to spaces only.
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/FacesException.java
myfaces/core/trunk/api/src/main/java/javax/faces/application/FacesMessage.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIParameter.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectItem.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/_MessageUtils.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/el/EvaluationException.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/AbortProcessingException.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/FacesEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseId.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeListener.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelEvent.java
myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelListener.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/ResponseStateManager.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/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/UIComponentTag.java
myfaces/core/trunk/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
myfaces/core/trunk/api/src/test/java/javax/faces/FacesExceptionTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/component/_MessageUtilsTest.java
myfaces/core/trunk/api/src/test/java/javax/faces/convert/DateTimeConverterTest.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/pss/ViewHandlerResponseWrapperHelperImpl.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/context/portlet/PortletExternalContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.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/PhaseExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.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/LoadBundleTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/MangedBeanExample.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/Myfaces889TestCase.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/TestConverter.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/el/ValueBindingImplCactus.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/InstrumentingPhaseListener.java
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/lifecycle/LifecycleImplCactus.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/FacesException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/FacesException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/FacesException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/FacesException.java Thu Jul 3 14:07:46 2008
@@ -28,7 +28,7 @@
public class FacesException
extends RuntimeException
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* The cause of this exception, i.e. the Throwable that caused this exception to be thrown.
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -30,9 +30,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/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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -317,7 +317,7 @@
}
catch (Exception e)
{
- //Object[] args = {getId()};
+ //Object[] args = {getId()};
context.getExternalContext().log(e.getMessage(), e);
_MessageUtils.addErrorMessage(context, this,CONVERSION_MESSAGE_ID,new Object[]{getId()});
setValid(false);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIParameter.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIParameter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIParameter.java Thu Jul 3 14:07:46 2008
@@ -75,7 +75,7 @@
}
public boolean isRendered() {
- return true;
+ return true;
}
public void setName(String name)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectItem.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectItem.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectItem.java Thu Jul 3 14:07:46 2008
@@ -80,7 +80,7 @@
}
public boolean isRendered() {
- return true;
+ return true;
}
public void setItemDescription(String itemDescription)
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -118,16 +118,16 @@
break;
} finally {
- try
- {
+ try
+ {
listiterator.remove();
- }
- catch(ConcurrentModificationException cme)
- {
- int eventIndex = listiterator.previousIndex();
- _events.remove(eventIndex);
- listiterator = _events.listIterator();
- }
+ }
+ catch(ConcurrentModificationException cme)
+ {
+ int eventIndex = listiterator.previousIndex();
+ _events.remove(eventIndex);
+ listiterator = _events.listIterator();
+ }
}
}
}
@@ -326,7 +326,7 @@
public boolean isRendered()
{
- return true;
+ return true;
}
/**
@@ -357,7 +357,7 @@
public String getId()
{
- // return null;
+ // return null;
// Re-enable for now.
return super.getId();
@@ -368,7 +368,7 @@
*/
public String getClientId(FacesContext context)
{
- return null;
+ return null;
}
public Object saveState(FacesContext context)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java Thu Jul 3 14:07:46 2008
@@ -28,8 +28,8 @@
class _AttachedListStateWrapper
implements Serializable
{
- private static final long serialVersionUID = -3958718149793179776L;
- private List _wrappedStateList;
+ private static final long serialVersionUID = -3958718149793179776L;
+ private List _wrappedStateList;
public _AttachedListStateWrapper(List wrappedStateList)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_AttachedStateWrapper.java Thu Jul 3 14:07:46 2008
@@ -27,8 +27,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/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java Thu Jul 3 14:07:46 2008
@@ -56,9 +56,9 @@
class _ComponentAttributesMap
implements Map, Serializable
{
- private static final long serialVersionUID = -9106832179394257866L;
+ private static final long serialVersionUID = -9106832179394257866L;
- private static final Object[] EMPTY_ARGS = new Object[0];
+ private static final Object[] EMPTY_ARGS = new Object[0];
// The component that is read/written via this map.
private UIComponent _component;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Thu Jul 3 14:07:46 2008
@@ -29,8 +29,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 _list = new ArrayList();
private Map _idIndexedMap = new HashMap();
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -28,8 +28,8 @@
class _ComponentFacetMap
implements Map, Serializable
{
- private static final long serialVersionUID = -3456937594422167629L;
- private UIComponent _component;
+ private static final long serialVersionUID = -3456937594422167629L;
+ private UIComponent _component;
private Map _map = new HashMap();
_ComponentFacetMap(UIComponent component)
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -36,29 +36,29 @@
private static final String DETAIL_SUFFIX = "_detail";
private static final Class[] NO_ARGS = new Class[0];
- 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)
@@ -67,16 +67,16 @@
while(cause != null)
{
- Throwable parentCause = getCause(cause);
- if (parentCause == cause)
- {
- break;
- }
+ Throwable parentCause = getCause(cause);
+ if (parentCause == cause)
+ {
+ break;
+ }
- if(buf.length()>0)
- {
+ if(buf.length()>0)
+ {
buf.append(", ");
- }
+ }
buf.append(cause.getLocalizedMessage());
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -42,21 +42,21 @@
* @version $Revision$ $Date$
*/
public class DateTimeConverter implements Converter, StateHolder {
- // API field
- public static final String CONVERTER_ID = "javax.faces.DateTime";
+ // API field
+ public static final String CONVERTER_ID = "javax.faces.DateTime";
- // internal constants
- private static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.DateTimeConverter.CONVERSION";
+ // internal constants
+ private static final String CONVERSION_MESSAGE_ID = "javax.faces.convert.DateTimeConverter.CONVERSION";
- private static final TimeZone TIMEZONE_DEFAULT = TimeZone.getTimeZone("GMT");
+ private static final TimeZone TIMEZONE_DEFAULT = TimeZone.getTimeZone("GMT");
- private String _dateStyle;
- private Locale _locale;
- private String _pattern;
- private String _timeStyle;
- private TimeZone _timeZone;
- private String _type;
- private boolean _transient;
+ private String _dateStyle;
+ private Locale _locale;
+ private String _pattern;
+ private String _timeStyle;
+ private TimeZone _timeZone;
+ private String _type;
+ private boolean _transient;
public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
if (context == null) {
@@ -106,106 +106,106 @@
}
}
- private DateFormat prepareDateFormat() {
- DateFormat format = getDateFormat();
- // format cannot be lenient (JSR-127)
- format.setLenient(false);
-
- TimeZone tz = getTimeZone();
- if (tz != null) {
- format.setTimeZone(tz);
- }
-
- return format;
- }
-
- private DateFormat getDateFormat() {
- if(_pattern != null) {
- try {
- return new SimpleDateFormat(_pattern, getLocale());
- } catch (IllegalArgumentException iae) {
- throw new ConverterException("Invalid pattern", iae);
- }
- }
-
- return Type.getType(getType()).getFormatter(calcDateStyle(), calcTimeStyle(), getLocale());
- }
-
- private int calcDateStyle() {
- return Style.getStyleFormat(getDateStyle());
- }
-
- private int calcTimeStyle() {
- return Style.getStyleFormat(getTimeStyle());
- }
-
- // STATE SAVE/RESTORE
- public void restoreState(FacesContext facesContext, Object state) {
- Object[] values = (Object[]) state;
- _dateStyle = (String) values[0];
- _locale = (Locale) values[1];
- _pattern = (String) values[2];
- _timeStyle = (String) values[3];
- _timeZone = (TimeZone) values[4];
- _type = (String) values[5];
- }
-
- public Object saveState(FacesContext facesContext) {
- Object[] values = new Object[6];
- values[0] = _dateStyle;
- values[1] = _locale;
- values[2] = _pattern;
- values[3] = _timeStyle;
- values[4] = _timeZone;
- values[5] = _type;
- return values;
- }
+ private DateFormat prepareDateFormat() {
+ DateFormat format = getDateFormat();
+ // format cannot be lenient (JSR-127)
+ format.setLenient(false);
+
+ TimeZone tz = getTimeZone();
+ if (tz != null) {
+ format.setTimeZone(tz);
+ }
+
+ return format;
+ }
+
+ private DateFormat getDateFormat() {
+ if(_pattern != null) {
+ try {
+ return new SimpleDateFormat(_pattern, getLocale());
+ } catch (IllegalArgumentException iae) {
+ throw new ConverterException("Invalid pattern", iae);
+ }
+ }
+
+ return Type.getType(getType()).getFormatter(calcDateStyle(), calcTimeStyle(), getLocale());
+ }
+
+ private int calcDateStyle() {
+ return Style.getStyleFormat(getDateStyle());
+ }
+
+ private int calcTimeStyle() {
+ return Style.getStyleFormat(getTimeStyle());
+ }
+
+ // STATE SAVE/RESTORE
+ public void restoreState(FacesContext facesContext, Object state) {
+ Object[] values = (Object[]) state;
+ _dateStyle = (String) values[0];
+ _locale = (Locale) values[1];
+ _pattern = (String) values[2];
+ _timeStyle = (String) values[3];
+ _timeZone = (TimeZone) values[4];
+ _type = (String) values[5];
+ }
+
+ public Object saveState(FacesContext facesContext) {
+ Object[] values = new Object[6];
+ values[0] = _dateStyle;
+ values[1] = _locale;
+ values[2] = _pattern;
+ values[3] = _timeStyle;
+ values[4] = _timeZone;
+ values[5] = _type;
+ return values;
+ }
- // GETTER & SETTER
-
+ // GETTER & SETTER
+
/**
* The style of the date. Values include: default, short, medium,
* long, and full.
*
* @JSFProperty
*/
- public String getDateStyle() {
- return _dateStyle != null ? _dateStyle : Style.DEFAULT.getName();
- }
-
- public void setDateStyle(String dateStyle) {
- //TODO: validate timeStyle
- _dateStyle = dateStyle;
- }
+ public String getDateStyle() {
+ return _dateStyle != null ? _dateStyle : Style.DEFAULT.getName();
+ }
+
+ public void setDateStyle(String dateStyle) {
+ //TODO: validate timeStyle
+ _dateStyle = dateStyle;
+ }
/**
* The name of the locale to be used, instead of the default.
*
* @JSFProperty
*/
- public Locale getLocale() {
- if (_locale != null)
- return _locale;
- FacesContext context = FacesContext.getCurrentInstance();
- return context.getViewRoot().getLocale();
- }
-
- public void setLocale(Locale locale) {
- _locale = locale;
- }
+ public Locale getLocale() {
+ if (_locale != null)
+ return _locale;
+ FacesContext context = FacesContext.getCurrentInstance();
+ return context.getViewRoot().getLocale();
+ }
+
+ public void setLocale(Locale locale) {
+ _locale = locale;
+ }
/**
* A custom Date formatting pattern, in the format used by java.text.SimpleDateFormat.
*
* @JSFProperty
*/
- public String getPattern() {
- return _pattern;
- }
-
- public void setPattern(String pattern) {
- _pattern = pattern;
- }
+ public String getPattern() {
+ return _pattern;
+ }
+
+ public void setPattern(String pattern) {
+ _pattern = pattern;
+ }
/**
* The style of the time. Values include: default, short, medium, long,
@@ -213,14 +213,14 @@
*
* @JSFProperty
*/
- public String getTimeStyle() {
- return _timeStyle != null ? _timeStyle : Style.DEFAULT.getName();
- }
-
- public void setTimeStyle(String timeStyle) {
- //TODO: validate timeStyle
- _timeStyle = timeStyle;
- }
+ public String getTimeStyle() {
+ return _timeStyle != null ? _timeStyle : Style.DEFAULT.getName();
+ }
+
+ public void setTimeStyle(String timeStyle) {
+ //TODO: validate timeStyle
+ _timeStyle = timeStyle;
+ }
/**
* The time zone to use instead of GMT (the default timezone). When
@@ -231,21 +231,21 @@
*
* @JSFProperty
*/
- public TimeZone getTimeZone() {
- return _timeZone != null ? _timeZone : TIMEZONE_DEFAULT;
- }
-
- public void setTimeZone(TimeZone timeZone) {
- _timeZone = timeZone;
- }
-
- public boolean isTransient() {
- return _transient;
- }
-
- public void setTransient(boolean aTransient) {
- _transient = aTransient;
- }
+ public TimeZone getTimeZone() {
+ return _timeZone != null ? _timeZone : TIMEZONE_DEFAULT;
+ }
+
+ public void setTimeZone(TimeZone timeZone) {
+ _timeZone = timeZone;
+ }
+
+ public boolean isTransient() {
+ return _transient;
+ }
+
+ public void setTransient(boolean aTransient) {
+ _transient = aTransient;
+ }
/**
* Specifies whether the date, time, or both should be
@@ -254,96 +254,96 @@
*
* @JSFProperty
*/
- public String getType() {
- return _type != null ? _type : Type.DATE.getName();
- }
-
- public void setType(String type) {
- //TODO: validate type
- _type = type;
- }
-
- private static class Style {
-
- private static final Style DEFAULT = new Style("default", DateFormat.DEFAULT);
- private static final Style MEDIUM = new Style("medium", DateFormat.MEDIUM);
- private static final Style SHORT = new Style("short", DateFormat.SHORT);
- private static final Style LONG = new Style("long", DateFormat.LONG);
- private static final Style FULL = new Style("full", DateFormat.FULL);
-
- private static final Style[] values = new Style[] {DEFAULT, MEDIUM, SHORT, LONG, FULL};
-
- public static Style getStyle(String name) {
- for(int i = 0;i < values.length;i++) {
- if(values[i]._name.equals(name)) {
- return values[i];
- }
- }
-
- throw new ConverterException("invalid style '" + name + "'");
- }
-
- private static int getStyleFormat(String name) {
- return getStyle(name).getFormat();
- }
-
- private String _name;
- private int _format;
-
- private Style(String name, int format) {
- this._name = name;
- this._format = format;
- }
-
- public String getName() {
- return _name;
- }
-
- public int getFormat() {
- return _format;
- }
- }
-
- private abstract static class Type {
-
- private static final Type DATE = new Type("date") {
- public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
- return DateFormat.getDateInstance(dateStyle, locale);
- }
- };
- private static final Type TIME = new Type("time") {
- public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
- return DateFormat.getTimeInstance(timeStyle, locale);
- }
- };
- private static final Type BOTH = new Type("both") {
- public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
- return DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
- }
- };
-
- private static final Type[] values = new Type[] {DATE, TIME, BOTH};
-
- public static Type getType(String name) {
- for(int i = 0;i < values.length;i++) {
- if(values[i]._name.equals(name)) {
- return values[i];
- }
- }
-
- throw new ConverterException("invalid type '" + name + "'");
- }
-
- private String _name;
-
- private Type(String name) {
- this._name = name;
- }
-
- public String getName() {
- return _name;
- }
+ public String getType() {
+ return _type != null ? _type : Type.DATE.getName();
+ }
+
+ public void setType(String type) {
+ //TODO: validate type
+ _type = type;
+ }
+
+ private static class Style {
+
+ private static final Style DEFAULT = new Style("default", DateFormat.DEFAULT);
+ private static final Style MEDIUM = new Style("medium", DateFormat.MEDIUM);
+ private static final Style SHORT = new Style("short", DateFormat.SHORT);
+ private static final Style LONG = new Style("long", DateFormat.LONG);
+ private static final Style FULL = new Style("full", DateFormat.FULL);
+
+ private static final Style[] values = new Style[] {DEFAULT, MEDIUM, SHORT, LONG, FULL};
+
+ public static Style getStyle(String name) {
+ for(int i = 0;i < values.length;i++) {
+ if(values[i]._name.equals(name)) {
+ return values[i];
+ }
+ }
+
+ throw new ConverterException("invalid style '" + name + "'");
+ }
+
+ private static int getStyleFormat(String name) {
+ return getStyle(name).getFormat();
+ }
+
+ private String _name;
+ private int _format;
+
+ private Style(String name, int format) {
+ this._name = name;
+ this._format = format;
+ }
- public abstract DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale);
- }
+ public String getName() {
+ return _name;
+ }
+
+ public int getFormat() {
+ return _format;
+ }
+ }
+
+ private abstract static class Type {
+
+ private static final Type DATE = new Type("date") {
+ public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
+ return DateFormat.getDateInstance(dateStyle, locale);
+ }
+ };
+ private static final Type TIME = new Type("time") {
+ public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
+ return DateFormat.getTimeInstance(timeStyle, locale);
+ }
+ };
+ private static final Type BOTH = new Type("both") {
+ public DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale) {
+ return DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
+ }
+ };
+
+ private static final Type[] values = new Type[] {DATE, TIME, BOTH};
+
+ public static Type getType(String name) {
+ for(int i = 0;i < values.length;i++) {
+ if(values[i]._name.equals(name)) {
+ return values[i];
+ }
+ }
+
+ throw new ConverterException("invalid type '" + name + "'");
+ }
+
+ private String _name;
+
+ private Type(String name) {
+ this._name = name;
+ }
+
+ public String getName() {
+ return _name;
+ }
+
+ public abstract DateFormat getFormatter(int dateStyle, int timeStyle, Locale locale);
+ }
}
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -33,7 +33,7 @@
implements Converter
{
// API FIELDS
- // the wrong string javax.faces.DoubleTime is required to be compatible with JSF RI and its TCK tests
+ // the wrong string javax.faces.DoubleTime is required to be compatible with JSF RI and its TCK tests
public static final String CONVERTER_ID = "javax.faces.DoubleTime";
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/EvaluationException.java Thu Jul 3 14:07:46 2008
@@ -29,26 +29,26 @@
public class EvaluationException extends FacesException
{
private static final long serialVersionUID = 4668524591042216006L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public EvaluationException()
+ public EvaluationException()
{
- super();
- }
+ super();
+ }
- public EvaluationException(String message)
- {
- super(message);
- }
+ public EvaluationException(String message)
+ {
+ super(message);
+ }
- public EvaluationException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public EvaluationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
- public EvaluationException(Throwable cause)
- {
+ public EvaluationException(Throwable cause)
+ {
super(cause);
- }
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodBinding.java Thu Jul 3 14:07:46 2008
@@ -29,22 +29,22 @@
public abstract class MethodBinding
{
- // FIELDS
+ // FIELDS
- // CONSTRUCTORS
- public MethodBinding()
- {
- }
+ // CONSTRUCTORS
+ public MethodBinding()
+ {
+ }
- // METHODS
-
- /**
- * returns the <code>String</code> of your expression like <code>#{bean.foo}</code>.
- */
- public String getExpressionString()
- {
+ // METHODS
+
+ /**
+ * returns the <code>String</code> of your expression like <code>#{bean.foo}</code>.
+ */
+ public String getExpressionString()
+ {
return null;
- }
+ }
public abstract Class getType(FacesContext facescontext) throws MethodNotFoundException;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/MethodNotFoundException.java Thu Jul 3 14:07:46 2008
@@ -27,26 +27,26 @@
public class MethodNotFoundException extends EvaluationException
{
private static final long serialVersionUID = 7107789255726890536L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public MethodNotFoundException()
- {
- super();
- }
+ public MethodNotFoundException()
+ {
+ super();
+ }
- public MethodNotFoundException(String message)
- {
+ public MethodNotFoundException(String message)
+ {
super(message);
- }
+ }
- public MethodNotFoundException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public MethodNotFoundException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
- public MethodNotFoundException(Throwable cause)
- {
- super(cause);
- }
+ public MethodNotFoundException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/PropertyNotFoundException.java Thu Jul 3 14:07:46 2008
@@ -28,26 +28,26 @@
{
private static final long serialVersionUID = -7271529989175141594L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public PropertyNotFoundException()
- {
- super();
- }
+ public PropertyNotFoundException()
+ {
+ super();
+ }
- public PropertyNotFoundException(String message)
- {
- super(message);
- }
+ public PropertyNotFoundException(String message)
+ {
+ super(message);
+ }
- public PropertyNotFoundException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public PropertyNotFoundException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
- public PropertyNotFoundException(Throwable cause)
- {
- super(cause);
- }
+ public PropertyNotFoundException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/ReferenceSyntaxException.java Thu Jul 3 14:07:46 2008
@@ -28,26 +28,26 @@
{
private static final long serialVersionUID = -2099185257291689817L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public ReferenceSyntaxException()
- {
- super();
- }
+ public ReferenceSyntaxException()
+ {
+ super();
+ }
- public ReferenceSyntaxException(String message)
- {
- super(message);
- }
+ public ReferenceSyntaxException(String message)
+ {
+ super(message);
+ }
- public ReferenceSyntaxException(String message, Throwable cause)
- {
- super(message, cause);
- }
+ public ReferenceSyntaxException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
- public ReferenceSyntaxException(Throwable cause)
- {
- super(cause);
- }
+ public ReferenceSyntaxException(Throwable cause)
+ {
+ super(cause);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/el/VariableResolver.java Thu Jul 3 14:07:46 2008
@@ -28,14 +28,14 @@
*/
public abstract class VariableResolver
{
- // FIELDS
+ // FIELDS
- // CONSTRUCTORS
- public VariableResolver()
- {
- }
+ // CONSTRUCTORS
+ public VariableResolver()
+ {
+ }
- // METHODS
- public abstract Object resolveVariable(FacesContext facesContext, String name)
+ // METHODS
+ public abstract Object resolveVariable(FacesContext facesContext, String name)
throws EvaluationException;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/AbortProcessingException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/AbortProcessingException.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/AbortProcessingException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/AbortProcessingException.java Thu Jul 3 14:07:46 2008
@@ -29,26 +29,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);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionEvent.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionEvent.java Thu Jul 3 14:07:46 2008
@@ -30,25 +30,25 @@
{
private static final long serialVersionUID = 3693030212414392259L;
- // FIELDS
+ // FIELDS
// CONSTRUCTORS
- public ActionEvent(UIComponent uiComponent)
- {
+ public ActionEvent(UIComponent uiComponent)
+ {
super(uiComponent);
if (uiComponent == null) throw new IllegalArgumentException("uiComponent");
- }
+ }
- // METHODS
- public boolean isAppropriateListener(FacesListener facesListeners)
- {
- return facesListeners instanceof ActionListener;
- }
-
- public void processListener(FacesListener facesListeners)
- {
- ((ActionListener)facesListeners).processAction(this);
- }
+ // METHODS
+ public boolean isAppropriateListener(FacesListener facesListeners)
+ {
+ return facesListeners instanceof ActionListener;
+ }
+
+ public void processListener(FacesListener facesListeners)
+ {
+ ((ActionListener)facesListeners).processAction(this);
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionListener.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ActionListener.java Thu Jul 3 14:07:46 2008
@@ -26,5 +26,5 @@
*/
public interface ActionListener extends FacesListener
{
- void processAction(ActionEvent actionEvent) throws AbortProcessingException;
+ void processAction(ActionEvent actionEvent) throws AbortProcessingException;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/FacesEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/FacesEvent.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/FacesEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/FacesEvent.java Thu Jul 3 14:07:46 2008
@@ -31,31 +31,31 @@
*/
public abstract class FacesEvent extends EventObject
{
- // FIELDS
+ // FIELDS
private PhaseId _phaseId;
- // CONSTRUCTORS
- public FacesEvent(UIComponent uiComponent)
- {
+ // CONSTRUCTORS
+ public FacesEvent(UIComponent uiComponent)
+ {
super(uiComponent);
if (uiComponent == null) throw new IllegalArgumentException("uiComponent");
_phaseId = PhaseId.ANY_PHASE;
- }
+ }
- // METHODS
+ // METHODS
public abstract boolean isAppropriateListener(FacesListener faceslistener);
public abstract void processListener(FacesListener faceslistener);
- public UIComponent getComponent()
- {
+ public UIComponent getComponent()
+ {
return (UIComponent)getSource();
- }
+ }
- public void queue()
- {
+ public void queue()
+ {
((UIComponent)getSource()).queueEvent(this);
- }
+ }
public PhaseId getPhaseId()
{
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -35,27 +35,27 @@
private FacesContext _facesContext;
private PhaseId _phaseId;
- // CONSTRUCTORS
- public PhaseEvent(FacesContext facesContext, PhaseId phaseId, Lifecycle lifecycle)
- {
- super(lifecycle);
+ // CONSTRUCTORS
+ public PhaseEvent(FacesContext facesContext, PhaseId phaseId, Lifecycle lifecycle)
+ {
+ 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;
- }
+ }
- // METHODS
- public FacesContext getFacesContext()
- {
- return _facesContext;
- }
+ // METHODS
+ public FacesContext getFacesContext()
+ {
+ return _facesContext;
+ }
- public PhaseId getPhaseId()
- {
- return _phaseId;
- }
+ public PhaseId getPhaseId()
+ {
+ return _phaseId;
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseId.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseId.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseId.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseId.java Thu Jul 3 14:07:46 2008
@@ -29,15 +29,15 @@
*/
public class PhaseId implements Comparable{
- // FIELDS
- public static final javax.faces.event.PhaseId ANY_PHASE;
- public static final javax.faces.event.PhaseId APPLY_REQUEST_VALUES;
- public static final javax.faces.event.PhaseId INVOKE_APPLICATION;
- public static final javax.faces.event.PhaseId PROCESS_VALIDATIONS;
- public static final javax.faces.event.PhaseId RENDER_RESPONSE;
- public static final javax.faces.event.PhaseId RESTORE_VIEW;
- public static final javax.faces.event.PhaseId UPDATE_MODEL_VALUES;
- public static final java.util.List VALUES;
+ // FIELDS
+ public static final javax.faces.event.PhaseId ANY_PHASE;
+ public static final javax.faces.event.PhaseId APPLY_REQUEST_VALUES;
+ public static final javax.faces.event.PhaseId INVOKE_APPLICATION;
+ public static final javax.faces.event.PhaseId PROCESS_VALIDATIONS;
+ public static final javax.faces.event.PhaseId RENDER_RESPONSE;
+ public static final javax.faces.event.PhaseId RESTORE_VIEW;
+ public static final javax.faces.event.PhaseId UPDATE_MODEL_VALUES;
+ public static final java.util.List VALUES;
static
{
@@ -65,27 +65,27 @@
private final String _name;
private final int _ordinal;
- // CONSTRUCTORS
+ // CONSTRUCTORS
private PhaseId(String name, int ordinal)
{
this._name = name;
this._ordinal = ordinal;
}
- // METHODS
- public int compareTo(Object other)
- {
- return _ordinal - ((PhaseId)other)._ordinal;
- }
-
- public int getOrdinal()
- {
- return _ordinal;
- }
-
- public String toString()
- {
- return _name + "(" + _ordinal + ")";
- }
+ // METHODS
+ public int compareTo(Object other)
+ {
+ return _ordinal - ((PhaseId)other)._ordinal;
+ }
+
+ public int getOrdinal()
+ {
+ return _ordinal;
+ }
+
+ public String toString()
+ {
+ return _name + "(" + _ordinal + ")";
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseListener.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseListener.java Thu Jul 3 14:07:46 2008
@@ -26,9 +26,9 @@
*/
public interface PhaseListener extends java.util.EventListener, java.io.Serializable
{
- void afterPhase(PhaseEvent event);
+ void afterPhase(PhaseEvent event);
- void beforePhase(PhaseEvent event);
+ void beforePhase(PhaseEvent event);
- PhaseId getPhaseId();
+ PhaseId getPhaseId();
}
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=673803&r1=673802&r2=673803&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 Thu Jul 3 14:07:46 2008
@@ -32,28 +32,28 @@
private Object _oldValue;
private Object _newValue;
- // CONSTRUCTORS
- public ValueChangeEvent(UIComponent uiComponent, Object oldValue, Object newValue)
- {
+ // CONSTRUCTORS
+ public ValueChangeEvent(UIComponent uiComponent, Object oldValue, Object newValue)
+ {
super(uiComponent);
if (uiComponent == null) throw new IllegalArgumentException("uiComponent");
_oldValue = oldValue;
_newValue = newValue;
- }
+ }
- // METHODS
- public Object getNewValue()
- {
- return _newValue;
- }
+ // METHODS
+ public Object getNewValue()
+ {
+ return _newValue;
+ }
- public Object getOldValue()
- {
- return _oldValue;
- }
+ public Object getOldValue()
+ {
+ return _oldValue;
+ }
- public boolean isAppropriateListener(FacesListener facesListeners)
- {
+ public boolean isAppropriateListener(FacesListener facesListeners)
+ {
return facesListeners instanceof ValueChangeListener;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeListener.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ValueChangeListener.java Thu Jul 3 14:07:46 2008
@@ -26,6 +26,6 @@
*/
public interface ValueChangeListener extends FacesListener
{
- public void processValueChange(javax.faces.event.ValueChangeEvent event)
+ public void processValueChange(javax.faces.event.ValueChangeEvent event)
throws AbortProcessingException;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/ArrayDataModel.java Thu Jul 3 14:07:46 2008
@@ -26,35 +26,35 @@
*/
public class ArrayDataModel extends DataModel
{
- // FIELDS
+ // FIELDS
private int _rowIndex = -1;
private Object[] _data;
- // CONSTRUCTORS
- public ArrayDataModel()
- {
- super();
- }
+ // CONSTRUCTORS
+ public ArrayDataModel()
+ {
+ super();
+ }
- public ArrayDataModel(Object[] array)
- {
+ public ArrayDataModel(Object[] array)
+ {
if (array == null) throw new NullPointerException("array");
- setWrappedData(array);
- }
+ setWrappedData(array);
+ }
- // METHODS
- public int getRowCount()
- {
+ // METHODS
+ public int getRowCount()
+ {
if (_data == null)
{
return -1;
}
return _data.length;
- }
+ }
- public Object getRowData()
- {
- if (_data == null)
+ public Object getRowData()
+ {
+ if (_data == null)
{
return null;
}
@@ -62,36 +62,36 @@
{
throw new IllegalArgumentException("row is unavailable");
}
- return _data[_rowIndex];
- }
+ return _data[_rowIndex];
+ }
+
+ public int getRowIndex()
+ {
+ return _rowIndex;
+ }
+
+ public Object getWrappedData()
+ {
+ return _data;
+ }
- public int getRowIndex()
- {
- return _rowIndex;
- }
-
- public Object getWrappedData()
- {
- return _data;
- }
-
- public boolean isRowAvailable()
- {
- if (_data == null)
+ public boolean isRowAvailable()
+ {
+ if (_data == null)
{
return false;
}
return _rowIndex >= 0 && _rowIndex < _data.length;
- }
+ }
- public void setRowIndex(int rowIndex)
- {
- if (rowIndex < -1)
+ public void setRowIndex(int rowIndex)
+ {
+ if (rowIndex < -1)
{
throw new IllegalArgumentException("illegal rowIndex " + rowIndex);
}
int oldRowIndex = _rowIndex;
- _rowIndex = rowIndex;
+ _rowIndex = rowIndex;
if (_data != null && oldRowIndex != _rowIndex)
{
Object data = isRowAvailable() ? getRowData() : null;
@@ -102,13 +102,13 @@
listeners[i].rowSelected(event);
}
}
- }
+ }
- public void setWrappedData(Object data)
- {
+ public void setWrappedData(Object data)
+ {
_data = (Object[])data;
- int rowIndex = _data != null ? 0 : -1;
+ int rowIndex = _data != null ? 0 : -1;
setRowIndex(rowIndex);
- }
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelEvent.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelEvent.java Thu Jul 3 14:07:46 2008
@@ -40,20 +40,20 @@
}
- // METHODS
- public DataModel getDataModel()
- {
- return (DataModel) getSource();
- }
+ // METHODS
+ public DataModel getDataModel()
+ {
+ return (DataModel) getSource();
+ }
- public Object getRowData()
- {
- return _data;
- }
+ public Object getRowData()
+ {
+ return _data;
+ }
- public int getRowIndex()
- {
- return _index;
- }
+ public int getRowIndex()
+ {
+ return _index;
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelListener.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelListener.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/DataModelListener.java Thu Jul 3 14:07:46 2008
@@ -26,5 +26,5 @@
*/
public interface DataModelListener extends java.util.EventListener
{
- void rowSelected(DataModelEvent event);
+ void rowSelected(DataModelEvent event);
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultSetDataModel.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/ResultSetDataModel.java Thu Jul 3 14:07:46 2008
@@ -85,7 +85,7 @@
{
if (_resultSet == null)
{
- return null;
+ return null;
}
else if (!isRowAvailable())
{
@@ -117,7 +117,7 @@
{
if (_resultSet == null)
{
- return false;
+ return false;
}
else if (_currentIndex < 0)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItem.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItem.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItem.java Thu Jul 3 14:07:46 2008
@@ -35,7 +35,7 @@
private String _description;
private boolean _disabled;
- // CONSTRUCTORS
+ // CONSTRUCTORS
public SelectItem()
{
}
@@ -79,7 +79,7 @@
_disabled = disabled;
}
- // METHODS
+ // METHODS
public String getDescription()
{
return _description;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItemGroup.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItemGroup.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItemGroup.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/model/SelectItemGroup.java Thu Jul 3 14:07:46 2008
@@ -33,35 +33,35 @@
// FIELDS
private SelectItem[] _selectItems;
- // CONSTRUCTORS
- public SelectItemGroup()
- {
+ // CONSTRUCTORS
+ public SelectItemGroup()
+ {
super();
_selectItems = EMPTY_SELECT_ITEMS;
- }
+ }
- public SelectItemGroup(String label)
- {
- super("", label, null, false);
+ public SelectItemGroup(String label)
+ {
+ super("", label, null, false);
_selectItems = EMPTY_SELECT_ITEMS;
- }
+ }
- public SelectItemGroup(String label, String description, boolean disabled, SelectItem[] selectItems)
- {
+ public SelectItemGroup(String label, String description, boolean disabled, SelectItem[] selectItems)
+ {
super("", label, description, disabled);
if (selectItems == null) throw new NullPointerException("selectItems");
- _selectItems = selectItems;
- }
+ _selectItems = selectItems;
+ }
- // METHODS
- public SelectItem[] getSelectItems()
- {
- return _selectItems;
- }
+ // METHODS
+ public SelectItem[] getSelectItems()
+ {
+ return _selectItems;
+ }
- public void setSelectItems(SelectItem[] selectItems)
- {
- if (selectItems == null) throw new NullPointerException("selectItems");
- _selectItems = selectItems;
- }
+ public void setSelectItems(SelectItem[] selectItems)
+ {
+ if (selectItems == null) throw new NullPointerException("selectItems");
+ _selectItems = selectItems;
+ }
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/render/ResponseStateManager.java Thu Jul 3 14:07:46 2008
@@ -30,7 +30,7 @@
*/
public abstract class ResponseStateManager
{
-
+
public abstract void writeState(FacesContext context,
StateManager.SerializedView state)
throws IOException;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Thu Jul 3 14:07:46 2008
@@ -129,7 +129,7 @@
}
catch (NumberFormatException e)
{
- Object[] args = {uiComponent.getId()};
+ Object[] args = {uiComponent.getId()};
throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java Thu Jul 3 14:07:46 2008
@@ -47,9 +47,9 @@
implements Validator, StateHolder
{
// FIELDS
- public static final String MAXIMUM_MESSAGE_ID = "javax.faces.validator.LengthValidator.MAXIMUM";
- public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.LengthValidator.MINIMUM";
- public static final String VALIDATOR_ID = "javax.faces.Length";
+ public static final String MAXIMUM_MESSAGE_ID = "javax.faces.validator.LengthValidator.MAXIMUM";
+ public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.LengthValidator.MINIMUM";
+ public static final String VALIDATOR_ID = "javax.faces.Length";
private Integer _minimum = null;
private Integer _maximum = null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java Thu Jul 3 14:07:46 2008
@@ -46,9 +46,9 @@
{
// FIELDS
public static final String MAXIMUM_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.MAXIMUM";
- public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.MINIMUM";
- public static final String TYPE_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.TYPE";
- public static final String VALIDATOR_ID = "javax.faces.LongRange";
+ public static final String MINIMUM_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.MINIMUM";
+ public static final String TYPE_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.TYPE";
+ public static final String VALIDATOR_ID = "javax.faces.LongRange";
private Long _minimum = null;
private Long _maximum = null;
@@ -128,7 +128,7 @@
}
catch (NumberFormatException e)
{
- Object[] args = {uiComponent.getId()};
+ Object[] args = {uiComponent.getId()};
throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/AttributeTag.java Thu Jul 3 14:07:46 2008
@@ -102,16 +102,16 @@
String name = getName();
if (component.getAttributes().get(name) == null)
{
- if (UIComponentTag.isValueReference(_value))
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueBinding vb = facesContext.getApplication().createValueBinding(_value);
- component.setValueBinding(name, vb);
- }
- else
- {
- if(_value != null) component.getAttributes().put(name, _value);
- }
+ if (UIComponentTag.isValueReference(_value))
+ {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueBinding vb = facesContext.getApplication().createValueBinding(_value);
+ component.setValueBinding(name, vb);
+ }
+ else
+ {
+ if(_value != null) component.getAttributes().put(name, _value);
+ }
}
return Tag.SKIP_BODY;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/FacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/FacesServlet.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/FacesServlet.java Thu Jul 3 14:07:46 2008
@@ -72,7 +72,7 @@
_servletConfig = null;
_facesContextFactory = null;
_lifecycle = null;
- if(log.isTraceEnabled()) log.trace("destroy");
+ if(log.isTraceEnabled()) log.trace("destroy");
}
public ServletConfig getServletConfig()
@@ -94,7 +94,7 @@
public void init(ServletConfig servletConfig)
throws ServletException
{
- if(log.isTraceEnabled()) log.trace("init begin");
+ if(log.isTraceEnabled()) log.trace("init begin");
_servletConfig = servletConfig;
_facesContextFactory = (FacesContextFactory)FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
//TODO: null-check for Weblogic, that tries to initialize Servlet before ContextListener
@@ -103,7 +103,7 @@
//So we can acquire it here once:
LifecycleFactory lifecycleFactory = (LifecycleFactory)FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
_lifecycle = lifecycleFactory.getLifecycle(getLifecycleId());
- if(log.isTraceEnabled()) log.trace("init end");
+ if(log.isTraceEnabled()) log.trace("init end");
}
public void service(ServletRequest request,
@@ -137,16 +137,16 @@
return;
}
- if(log.isTraceEnabled()) log.trace("service begin");
+ if(log.isTraceEnabled()) log.trace("service begin");
FacesContext facesContext = prepareFacesContext(request, response);
try {
- _lifecycle.execute(facesContext);
+ _lifecycle.execute(facesContext);
if (!handleQueuedExceptions(facesContext))
{
_lifecycle.render(facesContext);
}
- }
+ }
catch (Exception e)
{
handleLifecycleException(facesContext, e);
@@ -155,7 +155,7 @@
{
facesContext.release();
}
- if(log.isTraceEnabled()) log.trace("service end");
+ if(log.isTraceEnabled()) log.trace("service end");
}
/**This method makes sure we see an exception page also
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTag.java Thu Jul 3 14:07:46 2008
@@ -389,20 +389,20 @@
private void addOutputComponentAfterComponent(UIComponentTag parentTag,
UIComponent outputComponent,
UIComponent component) {
- int indexOfComponentInParent = 0;
- UIComponent parent = component.getParent();
+ int indexOfComponentInParent = 0;
+ UIComponent parent = component.getParent();
- if (null == parent) {
- return;
- }
- List children = parent.getChildren();
- indexOfComponentInParent = children.indexOf(component);
- if (children.size() - 1 == indexOfComponentInParent) {
- children.add(outputComponent);
- }
- else {
- children.add(indexOfComponentInParent + 1, outputComponent);
- }
+ if (null == parent) {
+ return;
+ }
+ List children = parent.getChildren();
+ indexOfComponentInParent = children.indexOf(component);
+ if (children.size() - 1 == indexOfComponentInParent) {
+ children.add(outputComponent);
+ }
+ else {
+ children.add(indexOfComponentInParent + 1, outputComponent);
+ }
parentTag.addChildIdToParentTag(parentTag,outputComponent.getId());
}
@@ -530,14 +530,14 @@
{
if (!isSuppressed())
{
- // Note that encodeBegin is inside this if-clause because for components that do
- // NOT render their children, begin was already called during the doStartTag method.
- // However for components that do render their children, we want those children to
- // exist before the begin method gets called, so delay until here. Of course that
- // causes nasty problems when this tag has non-JSF stuff inside it, eg plain text.
- // That plain text will be output before encodeBegin is invoked. The spec authors
- // presumably decided this was an acceptable tradeoff to allow encodeBegin to have
- // access to the children.
+ // Note that encodeBegin is inside this if-clause because for components that do
+ // NOT render their children, begin was already called during the doStartTag method.
+ // However for components that do render their children, we want those children to
+ // exist before the begin method gets called, so delay until here. Of course that
+ // causes nasty problems when this tag has non-JSF stuff inside it, eg plain text.
+ // That plain text will be output before encodeBegin is invoked. The spec authors
+ // presumably decided this was an acceptable tradeoff to allow encodeBegin to have
+ // access to the children.
if (component.getRendersChildren())
{
encodeBegin();
@@ -732,17 +732,17 @@
_componentInstance = parent.getFacet(facetName);
if (_componentInstance == null)
{
- _componentInstance = createComponentInstance(context, id);
+ _componentInstance = createComponentInstance(context, id);
setProperties(_componentInstance);
parent.getFacets().put(facetName, _componentInstance);
}
else
{
- if (checkFacetNameOnParentExists(parentTag, facetName))
- {
- throw new IllegalStateException("facet '" + facetName + "' already has a child associated. current associated component id: "
- + _componentInstance.getClientId(context) + " class: " + _componentInstance.getClass().getName());
- }
+ if (checkFacetNameOnParentExists(parentTag, facetName))
+ {
+ throw new IllegalStateException("facet '" + facetName + "' already has a child associated. current associated component id: "
+ + _componentInstance.getClientId(context) + " class: " + _componentInstance.getClass().getName());
+ }
}
addFacetNameToParentTag(parentTag, facetName);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java Thu Jul 3 14:07:46 2008
@@ -120,11 +120,11 @@
public static void writeCause(Writer writer, Throwable ex) throws IOException {
String msg = ex.getMessage();
for(;;) {
- Throwable t = getCause(ex);
- if (t == null)
- break;
-
- ex = t;
+ Throwable t = getCause(ex);
+ if (t == null)
+ break;
+
+ ex = t;
if (ex.getMessage()!=null) msg = ex.getMessage();
}
@@ -152,10 +152,10 @@
} else if ("now".equals(ERROR_PARTS[i])) {
writer.write(DateFormat.getDateTimeInstance().format(now));
} else if ("tree".equals(ERROR_PARTS[i])) {
- if (faces.getViewRoot() != null) {
- writeComponent(writer, faces.getViewRoot(), getErrorId(e));
- }
- } else if ("vars".equals(ERROR_PARTS[i])) {
+ if (faces.getViewRoot() != null) {
+ writeComponent(writer, faces.getViewRoot(), getErrorId(e));
+ }
+ } else if ("vars".equals(ERROR_PARTS[i])) {
writeVariables(writer, faces);
} else if ("cause".equals(ERROR_PARTS[i])) {
writeCause(writer, e);
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/FacesExceptionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/FacesExceptionTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/FacesExceptionTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/FacesExceptionTest.java Thu Jul 3 14:07:46 2008
@@ -23,64 +23,64 @@
public class FacesExceptionTest extends TestCase {
- public static void main(String[] args) {
- junit.textui.TestRunner.run(FacesExceptionTest.class);
- }
-
- public FacesExceptionTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /*
- * Test method for 'javax.faces.FacesException.FacesException()'
- */
- public void testFacesException() {
- FacesException e = new FacesException();
- assertNull(e.getCause());
- }
-
- /*
- * Test method for 'javax.faces.FacesException.FacesException(Throwable)'
- */
- public void testFacesExceptionThrowable() {
- Throwable t = new Throwable();
- FacesException fe = new FacesException(t);
- assertEquals(t, fe.getCause());
- }
-
- /*
- * Test method for 'javax.faces.FacesException.FacesException(String)'
- */
- public void testFacesExceptionString() {
- String m = "Message";
- FacesException e = new FacesException(m);
- assertEquals(e.getMessage(), m);
- }
-
- /*
- * Test method for 'javax.faces.FacesException.FacesException(String, Throwable)'
- */
- public void testFacesExceptionStringThrowable() {
- String m = "Message";
- Throwable t = new Throwable();
- FacesException fe = new FacesException(m, t);
- assertEquals(t, fe.getCause());
- assertEquals(fe.getMessage(), m);
- }
-
- /*
- * Test method for 'javax.faces.FacesException.getCause()'
- */
- public void testGetCause() {
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(FacesExceptionTest.class);
+ }
+
+ public FacesExceptionTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /*
+ * Test method for 'javax.faces.FacesException.FacesException()'
+ */
+ public void testFacesException() {
+ FacesException e = new FacesException();
+ assertNull(e.getCause());
+ }
+
+ /*
+ * Test method for 'javax.faces.FacesException.FacesException(Throwable)'
+ */
+ public void testFacesExceptionThrowable() {
+ Throwable t = new Throwable();
+ FacesException fe = new FacesException(t);
+ assertEquals(t, fe.getCause());
+ }
+
+ /*
+ * Test method for 'javax.faces.FacesException.FacesException(String)'
+ */
+ public void testFacesExceptionString() {
+ String m = "Message";
+ FacesException e = new FacesException(m);
+ assertEquals(e.getMessage(), m);
+ }
+
+ /*
+ * Test method for 'javax.faces.FacesException.FacesException(String, Throwable)'
+ */
+ public void testFacesExceptionStringThrowable() {
+ String m = "Message";
+ Throwable t = new Throwable();
+ FacesException fe = new FacesException(m, t);
+ assertEquals(t, fe.getCause());
+ assertEquals(fe.getMessage(), m);
+ }
+
+ /*
+ * Test method for 'javax.faces.FacesException.getCause()'
+ */
+ public void testGetCause() {
- }
+ }
}