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 [2/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...
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionEvent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionEvent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionEvent.java Thu Jul 3 14:18:36 2008
@@ -27,25 +27,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_1.2.x/api/src/main/java/javax/faces/event/ActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionListener.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ActionListener.java Thu Jul 3 14:18:36 2008
@@ -23,5 +23,5 @@
*/
public interface ActionListener extends FacesListener
{
- void processAction(ActionEvent actionEvent) throws AbortProcessingException;
+ void processAction(ActionEvent actionEvent) throws AbortProcessingException;
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/FacesEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/FacesEvent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/FacesEvent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/FacesEvent.java Thu Jul 3 14:18:36 2008
@@ -28,31 +28,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_1.2.x/api/src/main/java/javax/faces/event/PhaseEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseEvent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseEvent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseEvent.java Thu Jul 3 14:18:36 2008
@@ -32,28 +32,28 @@
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;
- }
-
- public PhaseId getPhaseId()
- {
- return _phaseId;
- }
+ // METHODS
+ public FacesContext getFacesContext()
+ {
+ return _facesContext;
+ }
+
+ public PhaseId getPhaseId()
+ {
+ return _phaseId;
+ }
@Override
public int hashCode()
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseId.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseId.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseId.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseId.java Thu Jul 3 14:18:36 2008
@@ -26,15 +26,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
{
@@ -62,27 +62,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_1.2.x/api/src/main/java/javax/faces/event/PhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseListener.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/PhaseListener.java Thu Jul 3 14:18:36 2008
@@ -23,9 +23,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_1.2.x/api/src/main/java/javax/faces/event/ValueChangeEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeEvent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeEvent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeEvent.java Thu Jul 3 14:18:36 2008
@@ -29,28 +29,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_1.2.x/api/src/main/java/javax/faces/event/ValueChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeListener.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/event/ValueChangeListener.java Thu Jul 3 14:18:36 2008
@@ -23,6 +23,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_1.2.x/api/src/main/java/javax/faces/model/ArrayDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ArrayDataModel.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ArrayDataModel.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ArrayDataModel.java Thu Jul 3 14:18:36 2008
@@ -23,35 +23,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;
}
@@ -59,36 +59,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;
@@ -99,13 +99,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_1.2.x/api/src/main/java/javax/faces/model/DataModelEvent.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelEvent.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelEvent.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelEvent.java Thu Jul 3 14:18:36 2008
@@ -37,20 +37,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_1.2.x/api/src/main/java/javax/faces/model/DataModelListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelListener.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelListener.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/DataModelListener.java Thu Jul 3 14:18:36 2008
@@ -23,5 +23,5 @@
*/
public interface DataModelListener extends java.util.EventListener
{
- void rowSelected(DataModelEvent event);
+ void rowSelected(DataModelEvent event);
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ResultSetDataModel.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/ResultSetDataModel.java Thu Jul 3 14:18:36 2008
@@ -82,7 +82,7 @@
{
if (_resultSet == null)
{
- return null;
+ return null;
}
else if (!isRowAvailable())
{
@@ -114,7 +114,7 @@
{
if (_resultSet == null)
{
- return false;
+ return false;
}
else if (_currentIndex < 0)
{
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItem.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItem.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItem.java Thu Jul 3 14:18:36 2008
@@ -33,7 +33,7 @@
private boolean _disabled;
private boolean escape;
- // CONSTRUCTORS
+ // CONSTRUCTORS
public SelectItem()
{
}
@@ -79,7 +79,7 @@
this.escape = escape;
}
- // METHODS
+ // METHODS
public String getDescription()
{
return _description;
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItemGroup.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItemGroup.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItemGroup.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/model/SelectItemGroup.java Thu Jul 3 14:18:36 2008
@@ -30,35 +30,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_1.2.x/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Thu Jul 3 14:18:36 2008
@@ -109,11 +109,11 @@
try
{
- return Double.parseDouble(value.toString());
+ return Double.parseDouble(value.toString());
}
catch (NumberFormatException e)
{
- Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
+ Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LengthValidator.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LengthValidator.java Thu Jul 3 14:18:36 2008
@@ -30,9 +30,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_1.2.x/api/src/main/java/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LongRangeValidator.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/LongRangeValidator.java Thu Jul 3 14:18:36 2008
@@ -31,9 +31,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";
public static final String NOT_IN_RANGE_MESSAGE_ID = "javax.faces.validator.LongRangeValidator.NOT_IN_RANGE";
private Long _minimum = null;
@@ -113,7 +113,7 @@
}
catch (NumberFormatException e)
{
- Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
+ Object[] args = {_MessageUtils.getLabel(facesContext, uiComponent)};
throw new ValidatorException(_MessageUtils.getErrorMessage(facesContext, TYPE_MESSAGE_ID, args));
}
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/Validator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/Validator.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/Validator.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/Validator.java Thu Jul 3 14:18:36 2008
@@ -29,9 +29,9 @@
public interface Validator
extends EventListener
{
- /**
- * @deprecated
- */
+ /**
+ * @deprecated
+ */
public static final String NOT_IN_RANGE_MESSAGE_ID = "javax.faces.validator.NOT_IN_RANGE";
public void validate(FacesContext context,
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/ValidatorException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/ValidatorException.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/ValidatorException.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/ValidatorException.java Thu Jul 3 14:18:36 2008
@@ -53,9 +53,9 @@
private static String facesMessageToString(FacesMessage message)
{
final String summary = message.getSummary();
- final String detail = message.getDetail();
-
- if (summary != null)
+ final String detail = message.getDetail();
+
+ if (summary != null)
{
if (detail != null)
{
Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_LabeledFacesMessage.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_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/validator/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_MessageUtils.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_MessageUtils.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/validator/_MessageUtils.java Thu Jul 3 14:18:36 2008
@@ -185,17 +185,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/webapp/FacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/FacesServlet.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/FacesServlet.java Thu Jul 3 14:18:36 2008
@@ -70,7 +70,7 @@
_servletConfig = null;
_facesContextFactory = null;
_lifecycle = null;
- if(log.isTraceEnabled()) log.trace("destroy");
+ if(log.isTraceEnabled()) log.trace("destroy");
}
public ServletConfig getServletConfig()
@@ -97,7 +97,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
@@ -106,7 +106,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,
@@ -140,18 +140,18 @@
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);
@@ -160,7 +160,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_1.2.x/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java Thu Jul 3 14:18:36 2008
@@ -45,7 +45,7 @@
public abstract class UIComponentClassicTagBase extends UIComponentTagBase
implements BodyTag, JspIdConsumer
{
-
+
// do not change this w/out doing likewise in UIComponentTag
private static final String COMPONENT_STACK_ATTR = "org.apache.myfaces.COMPONENT_STACK";
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/FacesExceptionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/FacesExceptionTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/FacesExceptionTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/FacesExceptionTest.java Thu Jul 3 14:18:36 2008
@@ -20,65 +20,65 @@
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());
+ 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());
assertNull(e.getMessage());
- }
+ }
- /*
- * 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() {
+ /*
+ * 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() {
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/application/FacesMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/application/FacesMessageTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/application/FacesMessageTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/application/FacesMessageTest.java Thu Jul 3 14:18:36 2008
@@ -20,149 +20,149 @@
public class FacesMessageTest extends TestCase {
- public static void main(String[] args) {
- junit.textui.TestRunner.run(FacesMessageTest.class);
- }
-
- public FacesMessageTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.FacesMessage()'
- */
- public void testFacesMessage() {
- FacesMessage msg = new FacesMessage();
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertNull(msg.getSummary());
- assertNull(msg.getDetail());
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String)'
- */
- public void testFacesMessageString() {
- String summary = "summary";
- FacesMessage msg = new FacesMessage(summary);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), summary);
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String, String)'
- */
- public void testFacesMessageStringString() {
- String summary = "summary";
- String detail = "detail";
- FacesMessage msg = new FacesMessage(summary, detail);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), detail);
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
- */
- public void testFacesMessageSeverityStringString() {
- String summary = "summary";
- String detail = "detail";
- FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), detail);
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
- */
- public void testFacesMessageNullSeverityStringString() {
- String summary = "summary";
- String detail = "detail";
- try {
- new FacesMessage(null, summary, detail);
- fail("Should have thrown an exception");
- } catch (NullPointerException e) {
- }
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
- */
- public void testSetSeverity() {
- FacesMessage msg = new FacesMessage();
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
- msg.setSeverity(FacesMessage.SEVERITY_FATAL);
- assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
- */
- public void testSetNullSeverity() {
- FacesMessage msg = new FacesMessage();
- try {
- msg.setSeverity(null);
- fail("Should have thrown an exception");
- } catch (NullPointerException e) {
- }
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.setSummary(String)'
- */
- public void testSetSummary() {
- FacesMessage msg = new FacesMessage();
- String summary = "summary";
- msg.setSummary(summary);
- assertEquals(msg.getSummary(), summary);
- assertEquals(msg.getDetail(), summary);
- }
-
- /*
- * Test method for 'javax.faces.application.FacesMessage.setDetail(String)'
- */
- public void testSetDetail() {
- FacesMessage msg = new FacesMessage();
- String detail = "detail";
- msg.setDetail(detail);
- assertEquals(msg.getSummary(), null);
- assertEquals(msg.getDetail(), detail);
- }
-
- public void testSeverityOrdering() {
- // make sure they are ordered correctly from least to worst
- assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
- assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
- assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
- // make sure they are ordered correctly from worts to least
- assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
- assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
- assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
- }
-
- public void testSeverityCompareWithString() {
- // make sure the compare fails when it should
- try {
- FacesMessage.SEVERITY_ERROR.compareTo("Hello There");
- fail("should throw");
- } catch(IllegalArgumentException e) {
- }
- }
-
- public void testSeverityEquality() {
- // make sure they all respond as equals when they should
- assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
- assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
- assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
- assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
- }
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(FacesMessageTest.class);
+ }
+
+ public FacesMessageTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.FacesMessage()'
+ */
+ public void testFacesMessage() {
+ FacesMessage msg = new FacesMessage();
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ assertNull(msg.getSummary());
+ assertNull(msg.getDetail());
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String)'
+ */
+ public void testFacesMessageString() {
+ String summary = "summary";
+ FacesMessage msg = new FacesMessage(summary);
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ assertEquals(msg.getSummary(), summary);
+ assertEquals(msg.getDetail(), summary);
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String, String)'
+ */
+ public void testFacesMessageStringString() {
+ String summary = "summary";
+ String detail = "detail";
+ FacesMessage msg = new FacesMessage(summary, detail);
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ assertEquals(msg.getSummary(), summary);
+ assertEquals(msg.getDetail(), detail);
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
+ */
+ public void testFacesMessageSeverityStringString() {
+ String summary = "summary";
+ String detail = "detail";
+ FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
+ assertEquals(msg.getSummary(), summary);
+ assertEquals(msg.getDetail(), detail);
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
+ */
+ public void testFacesMessageNullSeverityStringString() {
+ String summary = "summary";
+ String detail = "detail";
+ try {
+ new FacesMessage(null, summary, detail);
+ fail("Should have thrown an exception");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
+ */
+ public void testSetSeverity() {
+ FacesMessage msg = new FacesMessage();
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+ msg.setSeverity(FacesMessage.SEVERITY_FATAL);
+ assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
+ */
+ public void testSetNullSeverity() {
+ FacesMessage msg = new FacesMessage();
+ try {
+ msg.setSeverity(null);
+ fail("Should have thrown an exception");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.setSummary(String)'
+ */
+ public void testSetSummary() {
+ FacesMessage msg = new FacesMessage();
+ String summary = "summary";
+ msg.setSummary(summary);
+ assertEquals(msg.getSummary(), summary);
+ assertEquals(msg.getDetail(), summary);
+ }
+
+ /*
+ * Test method for 'javax.faces.application.FacesMessage.setDetail(String)'
+ */
+ public void testSetDetail() {
+ FacesMessage msg = new FacesMessage();
+ String detail = "detail";
+ msg.setDetail(detail);
+ assertEquals(msg.getSummary(), null);
+ assertEquals(msg.getDetail(), detail);
+ }
+
+ public void testSeverityOrdering() {
+ // make sure they are ordered correctly from least to worst
+ assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
+ assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
+ assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
+ // make sure they are ordered correctly from worts to least
+ assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
+ assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
+ assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
+ }
+
+ public void testSeverityCompareWithString() {
+ // make sure the compare fails when it should
+ try {
+ FacesMessage.SEVERITY_ERROR.compareTo("Hello There");
+ fail("should throw");
+ } catch(IllegalArgumentException e) {
+ }
+ }
+
+ public void testSeverityEquality() {
+ // make sure they all respond as equals when they should
+ assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
+ assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
+ assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
+ assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UIInputTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UIInputTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UIInputTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UIInputTest.java Thu Jul 3 14:18:36 2008
@@ -33,23 +33,23 @@
import org.apache.shale.test.el.MockValueExpression;
public class UIInputTest extends AbstractJsfTestCase{
-
- private Converter mockConverter;
- private Validator mockValidator;
- private UIInput input;
+
+ private Converter mockConverter;
+ private Validator mockValidator;
+ private UIInput input;
- public UIInputTest(String name) {
- super(name);
- }
+ public UIInputTest(String name) {
+ super(name);
+ }
- protected void setUp() throws Exception {
- super.setUp();
- input = new UIInput();
- input.setId("testId");
- mockConverter = createMock(Converter.class);
- mockValidator = createMock(Validator.class);
- }
-
+ protected void setUp() throws Exception {
+ super.setUp();
+ input = new UIInput();
+ input.setId("testId");
+ mockConverter = createMock(Converter.class);
+ mockValidator = createMock(Validator.class);
+ }
+
protected void tearDown() throws Exception {
super.tearDown();
input = null;
@@ -57,52 +57,52 @@
mockValidator = null;
}
- public void testWhenSpecifiedConverterMessageIsUsedInCaseConverterExceptionOccurs() {
- input.setConverterMessage("Cannot convert");
-
- input.setConverter(mockConverter);
- expect(mockConverter.getAsObject(facesContext, input, "xxx")).andThrow(new ConverterException());
- replay(mockConverter);
-
- input.getConvertedValue(facesContext, "xxx");
- verify(mockConverter);
-
- assertFalse(input.isValid());
- assertNotNull(facesContext.getMessages("testId"));
-
- FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
- assertEquals(message.getDetail(), "Cannot convert");
- assertEquals(message.getSummary(), "Cannot convert");
- }
-
- public void testWhenSpecifiedValidatorMessageIsUsedInCaseValidatorExceptionOccurs() {
- input.setValidatorMessage("Cannot validate");
-
- input.addValidator(mockValidator);
- mockValidator.validate(facesContext, input, "xxx");
- expectLastCall().andThrow(new ValidatorException(new FacesMessage()));
- replay(mockValidator);
-
- input.validateValue(facesContext, "xxx");
- verify(mockValidator);
-
- assertFalse(input.isValid());
- assertNotNull(facesContext.getMessages("testId"));
-
- FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
- assertEquals(message.getDetail(), "Cannot validate");
- assertEquals(message.getSummary(), "Cannot validate");
- }
-
- public void testUpdateModelSetsTheLocalValueToModelValue() {
- input.setValue("testValue");
-
- ValueExpression expression = new MockValueExpression("#{requestScope.id}",String.class);
- input.setValueExpression("value", expression);
-
- input.updateModel(facesContext);
-
- String updatedValue = expression.getValue(facesContext.getELContext()).toString();
- assertEquals("testValue", updatedValue);
- }
+ public void testWhenSpecifiedConverterMessageIsUsedInCaseConverterExceptionOccurs() {
+ input.setConverterMessage("Cannot convert");
+
+ input.setConverter(mockConverter);
+ expect(mockConverter.getAsObject(facesContext, input, "xxx")).andThrow(new ConverterException());
+ replay(mockConverter);
+
+ input.getConvertedValue(facesContext, "xxx");
+ verify(mockConverter);
+
+ assertFalse(input.isValid());
+ assertNotNull(facesContext.getMessages("testId"));
+
+ FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
+ assertEquals(message.getDetail(), "Cannot convert");
+ assertEquals(message.getSummary(), "Cannot convert");
+ }
+
+ public void testWhenSpecifiedValidatorMessageIsUsedInCaseValidatorExceptionOccurs() {
+ input.setValidatorMessage("Cannot validate");
+
+ input.addValidator(mockValidator);
+ mockValidator.validate(facesContext, input, "xxx");
+ expectLastCall().andThrow(new ValidatorException(new FacesMessage()));
+ replay(mockValidator);
+
+ input.validateValue(facesContext, "xxx");
+ verify(mockValidator);
+
+ assertFalse(input.isValid());
+ assertNotNull(facesContext.getMessages("testId"));
+
+ FacesMessage message = (FacesMessage) facesContext.getMessages("testId").next();
+ assertEquals(message.getDetail(), "Cannot validate");
+ assertEquals(message.getSummary(), "Cannot validate");
+ }
+
+ public void testUpdateModelSetsTheLocalValueToModelValue() {
+ input.setValue("testValue");
+
+ ValueExpression expression = new MockValueExpression("#{requestScope.id}",String.class);
+ input.setValueExpression("value", expression);
+
+ input.updateModel(facesContext);
+
+ String updatedValue = expression.getValue(facesContext.getELContext()).toString();
+ assertEquals("testValue", updatedValue);
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UISelectManyTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UISelectManyTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UISelectManyTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/component/UISelectManyTest.java Thu Jul 3 14:18:36 2008
@@ -86,8 +86,8 @@
public void testValidateIntArray() {
- facesContext.getViewRoot().setLocale(_TEST_LOCALE);
-
+ facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+
UISelectMany selectMany = new UISelectMany();
selectMany.setId("selectMany");
selectMany.setRendererType(null);
@@ -112,7 +112,7 @@
public void testValidateStringArray() {
- facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+ facesContext.getViewRoot().setLocale(_TEST_LOCALE);
UISelectMany selectMany = new UISelectMany();
selectMany.setId("selectMany");
@@ -138,8 +138,8 @@
public void testValidateStringList() {
- facesContext.getViewRoot().setLocale(_TEST_LOCALE);
-
+ facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+
UISelectMany selectMany = new UISelectMany();
selectMany.setId("selectMany");
selectMany.setRendererType(null);
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java Thu Jul 3 14:18:36 2008
@@ -28,13 +28,13 @@
* @version $Revision$ $Date$
*/
public class EnumConverterTest extends AbstractJsfTestCase {
- private enum testEnum {ITEM1, ITEM2};
- private EnumConverter converter;
-
- public EnumConverterTest(String name) {
- super(name);
- }
-
+ private enum testEnum {ITEM1, ITEM2};
+ private EnumConverter converter;
+
+ public EnumConverterTest(String name) {
+ super(name);
+ }
+
protected void setUp() throws Exception {
super.setUp();
converter = new EnumConverter(testEnum.class);
@@ -50,9 +50,9 @@
* {@link javax.faces.convert.EnumConverter#getAsObject(FacesContext, javax.faces.component.UIComponent, String)}.
*/
public void testGetAsObject() {
- UIInput input = new UIInput();
- Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
- assertEquals(convertedObj, testEnum.ITEM2);
+ UIInput input = new UIInput();
+ Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
+ assertEquals(convertedObj, testEnum.ITEM2);
}
/**
@@ -60,9 +60,9 @@
* {@link javax.faces.convert.EnumConverter#getAsObject(FacesContext, javax.faces.component.UIComponent, String)}.
*/
public void testGetAsObjectNull() {
- UIInput input = new UIInput();
- Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, null);
- assertNull(convertedObj);
+ UIInput input = new UIInput();
+ Object convertedObj = converter.getAsObject(FacesContext.getCurrentInstance(), input, null);
+ assertNull(convertedObj);
}
/**
@@ -70,13 +70,13 @@
* {@link javax.faces.convert.EnumConverter#getAsObject(FacesContext, javax.faces.component.UIComponent, String)}.
*/
public void testGetAsObjectNoEnum() {
- UIInput input = new UIInput();
- try {
- converter.getAsObject(FacesContext.getCurrentInstance(), input, "NO_ENUM_CONST");
- fail("Converter exception should be thrown");
- } catch (ConverterException e) {
- // should be thrown
- }
+ UIInput input = new UIInput();
+ try {
+ converter.getAsObject(FacesContext.getCurrentInstance(), input, "NO_ENUM_CONST");
+ fail("Converter exception should be thrown");
+ } catch (ConverterException e) {
+ // should be thrown
+ }
}
/**
@@ -84,14 +84,14 @@
* {@link javax.faces.convert.EnumConverter#getAsObject(FacesContext, javax.faces.component.UIComponent, String)}.
*/
public void testGetAsObjectNoClassSet() {
- Converter testConverter = new EnumConverter();
- UIInput input = new UIInput();
- try {
- testConverter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
- fail("Converter exception should be thrown");
- } catch (ConverterException e) {
- // should be thrown
- }
+ Converter testConverter = new EnumConverter();
+ UIInput input = new UIInput();
+ try {
+ testConverter.getAsObject(FacesContext.getCurrentInstance(), input, "ITEM2");
+ fail("Converter exception should be thrown");
+ } catch (ConverterException e) {
+ // should be thrown
+ }
}
/**
@@ -99,9 +99,9 @@
* {@link javax.faces.convert.EnumConverter#getAsString(FacesContext, javax.faces.component.UIComponent, Object)}.
*/
public void testGetAsString() {
- UIInput input = new UIInput();
- String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- assertEquals(convertedStr, testEnum.ITEM1.toString());
+ UIInput input = new UIInput();
+ String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
+ assertEquals(convertedStr, testEnum.ITEM1.toString());
}
/**
@@ -109,9 +109,9 @@
* {@link javax.faces.convert.EnumConverter#getAsString(FacesContext, javax.faces.component.UIComponent, Object)}.
*/
public void testGetAsStringNull() {
- UIInput input = new UIInput();
- String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, null);
- assertEquals(convertedStr, "");
+ UIInput input = new UIInput();
+ String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, null);
+ assertEquals(convertedStr, "");
}
/**
@@ -119,9 +119,9 @@
* {@link javax.faces.convert.EnumConverter#getAsString(FacesContext, javax.faces.component.UIComponent, Object)}.
*/
public void testGetAsStringNoEnum() {
- UIInput input = new UIInput();
- String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, "HALLO");
- assertEquals(convertedStr, "HALLO");
+ UIInput input = new UIInput();
+ String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, "HALLO");
+ assertEquals(convertedStr, "HALLO");
}
/**
@@ -129,13 +129,13 @@
* {@link javax.faces.convert.EnumConverter#getAsString(FacesContext, javax.faces.component.UIComponent, Object)}.
*/
public void testGetAsStringNoClassSet() {
- Converter testConverter = new EnumConverter();
- UIInput input = new UIInput();
- try {
- testConverter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- fail("Converter exception should be thrown");
- } catch (ConverterException e) {
- // should be thrown
- }
+ Converter testConverter = new EnumConverter();
+ UIInput input = new UIInput();
+ try {
+ testConverter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
+ fail("Converter exception should be thrown");
+ } catch (ConverterException e) {
+ // should be thrown
+ }
}
}
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/MessageUtilsTest.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/MessageUtilsTest.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/javax/faces/convert/MessageUtilsTest.java Thu Jul 3 14:18:36 2008
@@ -24,40 +24,40 @@
import org.apache.shale.test.el.MockValueExpression;
public class MessageUtilsTest extends AbstractJsfTestCase {
-
- public MessageUtilsTest(String name) {
- super(name);
- }
+
+ public MessageUtilsTest(String name) {
+ super(name);
+ }
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
protected void tearDown() throws Exception {
super.tearDown();
}
- public void testGetLabelFromAttributesMap() {
- HtmlInputText inputText = new HtmlInputText();
- inputText.getAttributes().put("label", "testLabel");
- String label = _MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testLabel", label);
- }
-
- public void testGetLabelFromValueExpression() {
- facesContext.getExternalContext().getRequestMap().put("lbl", "testLabel");
- HtmlInputText inputText = new HtmlInputText();
- ValueExpression expression = new MockValueExpression("#{requestScope.lbl}",String.class);
- inputText.setValueExpression("label", expression);
-
- String label = _MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testLabel", label);
- }
-
- public void testGetLabelReturnsClientIdWhenLabelIsNotSpecified() {
- HtmlInputText inputText = new HtmlInputText();
- inputText.setId("testId");
- String label = _MessageUtils.getLabel(facesContext, inputText);
- assertEquals("testId", label);
- }
+ public void testGetLabelFromAttributesMap() {
+ HtmlInputText inputText = new HtmlInputText();
+ inputText.getAttributes().put("label", "testLabel");
+ String label = _MessageUtils.getLabel(facesContext, inputText);
+ assertEquals("testLabel", label);
+ }
+
+ public void testGetLabelFromValueExpression() {
+ facesContext.getExternalContext().getRequestMap().put("lbl", "testLabel");
+ HtmlInputText inputText = new HtmlInputText();
+ ValueExpression expression = new MockValueExpression("#{requestScope.lbl}",String.class);
+ inputText.setValueExpression("label", expression);
+
+ String label = _MessageUtils.getLabel(facesContext, inputText);
+ assertEquals("testLabel", label);
+ }
+
+ public void testGetLabelReturnsClientIdWhenLabelIsNotSpecified() {
+ HtmlInputText inputText = new HtmlInputText();
+ inputText.setId("testId");
+ String label = _MessageUtils.getLabel(facesContext, inputText);
+ assertEquals("testId", label);
+ }
}
\ No newline at end of file
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java Thu Jul 3 14:18:36 2008
@@ -23,22 +23,22 @@
* Necessary for testing application-factory-setup with to application-factories;
*/
public class Mock2ApplicationFactory extends ApplicationFactory {
- private Application app = null;
- private ApplicationFactory factory = null;
+ private Application app = null;
+ private ApplicationFactory factory = null;
- public Mock2ApplicationFactory() {
- }
+ public Mock2ApplicationFactory() {
+ }
- public Mock2ApplicationFactory(ApplicationFactory factory) {
- this.factory = factory;
- }
+ public Mock2ApplicationFactory(ApplicationFactory factory) {
+ this.factory = factory;
+ }
- public Application getApplication() {
- return app;
- }
+ public Application getApplication() {
+ return app;
+ }
- public void setApplication(Application application) {
- this.app = application;
- }
+ public void setApplication(Application application) {
+ this.app = application;
+ }
}
Modified: myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java Thu Jul 3 14:18:36 2008
@@ -20,22 +20,22 @@
import javax.faces.application.ApplicationFactory;
public class MockApplicationFactory extends ApplicationFactory {
- private Application app = null;
- private ApplicationFactory factory;
+ private Application app = null;
+ private ApplicationFactory factory;
- public MockApplicationFactory() {
- }
+ public MockApplicationFactory() {
+ }
- public MockApplicationFactory(ApplicationFactory factory) {
- this.factory = factory;
- }
-
- public Application getApplication() {
- return app;
- }
+ public MockApplicationFactory(ApplicationFactory factory) {
+ this.factory = factory;
+ }
+
+ public Application getApplication() {
+ return app;
+ }
- public void setApplication(Application application) {
- this.app = application;
- }
+ public void setApplication(Application application) {
+ this.app = application;
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java Thu Jul 3 14:18:36 2008
@@ -36,7 +36,7 @@
implements ActionListener
{
- public void processAction(ActionEvent actionEvent) throws AbortProcessingException
+ public void processAction(ActionEvent actionEvent) throws AbortProcessingException
{
FacesContext facesContext = FacesContext.getCurrentInstance();
Application application = facesContext.getApplication();
@@ -79,8 +79,8 @@
navigationHandler.handleNavigation(facesContext,
fromAction,
outcome);
- //Render Response if needed
- facesContext.renderResponse();
+ //Render Response if needed
+ facesContext.renderResponse();
}
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Thu Jul 3 14:18:36 2008
@@ -721,7 +721,7 @@
throw new FacesException("Could not find any registered converter-class by converterId : "+converterId);
}
- try
+ try
{
Converter converter = (Converter) converterClass.newInstance();
@@ -752,7 +752,7 @@
// Get EnumConverter for enum classes with no special converter, check
// here as recursive call with java.lang.Enum will not work
if (converterClassName == null && targetClass.isEnum()) {
- converterClassName = _converterClassNameToClassMap.get(Enum.class);
+ converterClassName = _converterClassNameToClassMap.get(Enum.class);
}
// Locate a Converter registered for interfaces that are
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Thu Jul 3 14:18:36 2008
@@ -338,8 +338,8 @@
else
{
return prefix + "/*";
- }
- }
+ }
+ }
- }
+ }
}
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=673811&r1=673810&r2=673811&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Thu Jul 3 14:18:36 2008
@@ -97,7 +97,7 @@
private static final int UNCOMPRESSED_FLAG = 0;
private static final int COMPRESSED_FLAG = 1;
- private static final int JSF_SEQUENCE_INDEX = 0;
+ private static final int JSF_SEQUENCE_INDEX = 0;
private RenderKitFactory _renderKitFactory = null;
@@ -158,10 +158,10 @@
// first, locate the saved state information
//===========================================
- RenderKit renderKit = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
- ResponseStateManager responseStateManager = renderKit.getResponseStateManager();
+ RenderKit renderKit = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
+ ResponseStateManager responseStateManager = renderKit.getResponseStateManager();
- Object serializedComponentStates;
+ Object serializedComponentStates;
if (isSavingStateInClient(facesContext))
{
if (isLegacyResponseStateManager(responseStateManager))
@@ -182,9 +182,9 @@
}
else
{
- Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, uiViewRoot.getViewId()));
+ Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, uiViewRoot.getViewId()));
- Object[] stateObj = (Object[]) getSerializedViewFromServletSession(facesContext, uiViewRoot.getViewId(), serverStateId);
+ Object[] stateObj = (Object[]) getSerializedViewFromServletSession(facesContext, uiViewRoot.getViewId(), serverStateId);
if (stateObj == null)
{
log.error("No serialized view found in server session!");
@@ -213,8 +213,8 @@
if (log.isTraceEnabled()) log.trace("Exiting restoreComponentState");
}
- protected Integer getServerStateId(Object[] state)
- {
+ protected Integer getServerStateId(Object[] state)
+ {
if (state != null)
{
Object serverStateId = state[JSF_SEQUENCE_INDEX];
@@ -226,7 +226,7 @@
return null;
}
- /**
+ /**
* See getTreeStructureToSave.
*/
protected UIViewRoot restoreTreeStructure(FacesContext facesContext,
@@ -235,10 +235,10 @@
{
if (log.isTraceEnabled()) log.trace("Entering restoreTreeStructure");
- RenderKit rk = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
- ResponseStateManager responseStateManager = rk.getResponseStateManager();
+ RenderKit rk = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
+ ResponseStateManager responseStateManager = rk.getResponseStateManager();
- UIViewRoot uiViewRoot;
+ UIViewRoot uiViewRoot;
if (isSavingStateInClient(facesContext))
{
//reconstruct tree structure from request
@@ -256,9 +256,9 @@
else
{
//reconstruct tree structure from ServletSession
- Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, viewId));
+ Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, viewId));
- Object[] stateObj = (Object[]) getSerializedViewFromServletSession(facesContext, viewId, serverStateId);
+ Object[] stateObj = (Object[]) getSerializedViewFromServletSession(facesContext, viewId, serverStateId);
if (stateObj == null)
{
if (log.isDebugEnabled()) log.debug("Exiting restoreTreeStructure - No serialized view found in server session!");
@@ -286,10 +286,10 @@
{
if (log.isTraceEnabled()) log.trace("Entering restoreView - viewId: "+viewId+" ; renderKitId: "+renderKitId);
- RenderKit renderKit = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
- ResponseStateManager responseStateManager = renderKit.getResponseStateManager();
+ RenderKit renderKit = getRenderKitFactory().getRenderKit(facesContext, renderKitId);
+ ResponseStateManager responseStateManager = renderKit.getResponseStateManager();
- Object state;
+ Object state;
if (isSavingStateInClient(facesContext))
{
if (log.isTraceEnabled()) log.trace("Restoring view from client");
@@ -300,9 +300,9 @@
{
if (log.isTraceEnabled()) log.trace("Restoring view from session");
- Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, viewId));
+ Integer serverStateId = getServerStateId((Object[]) responseStateManager.getState(facesContext, viewId));
- state = getSerializedViewFromServletSession(facesContext, viewId, serverStateId);
+ state = getSerializedViewFromServletSession(facesContext, viewId, serverStateId);
}
UIViewRoot uiViewRoot = null;
@@ -452,13 +452,13 @@
responseStateManager.writeState(facesContext, serializedView);
}
else if (!isSavingStateInClient(facesContext))
- {
- Object[] state = new Object[2];
- state[JSF_SEQUENCE_INDEX] = Integer.toString(getNextViewSequence(facesContext), Character.MAX_RADIX);
- responseStateManager.writeState(facesContext, state);
- }
- else
- {
+ {
+ Object[] state = new Object[2];
+ state[JSF_SEQUENCE_INDEX] = Integer.toString(getNextViewSequence(facesContext), Character.MAX_RADIX);
+ responseStateManager.writeState(facesContext, state);
+ }
+ else
+ {
Object[] state = new Object[2];
state[0] = serializedView.getStructure();
state[1] = serializedView.getState();
@@ -544,8 +544,8 @@
.getSessionMap().get(SERIALIZED_VIEW_SESSION_ATTR);
if (viewCollection != null)
{
- /*
- String sequenceStr = externalContext.getRequestParameterMap().get(
+ /*
+ String sequenceStr = externalContext.getRequestParameterMap().get(
RendererUtils.SEQUENCE_PARAM);
Integer sequence = null;
if (sequenceStr == null)
@@ -574,20 +574,20 @@
return serializedView;
}
- protected int getNextViewSequence(FacesContext context)
- {
- ExternalContext externalContext = context.getExternalContext();
-
- if (!externalContext.getRequestMap().containsKey(RendererUtils.SEQUENCE_PARAM))
- {
- nextViewSequence(context);
- }
-
- Integer sequence = (Integer) externalContext.getRequestMap().get(RendererUtils.SEQUENCE_PARAM);
- return sequence.intValue();
- }
+ protected int getNextViewSequence(FacesContext context)
+ {
+ ExternalContext externalContext = context.getExternalContext();
+
+ if (!externalContext.getRequestMap().containsKey(RendererUtils.SEQUENCE_PARAM))
+ {
+ nextViewSequence(context);
+ }
+
+ Integer sequence = (Integer) externalContext.getRequestMap().get(RendererUtils.SEQUENCE_PARAM);
+ return sequence.intValue();
+ }
- protected void nextViewSequence(FacesContext facescontext)
+ protected void nextViewSequence(FacesContext facescontext)
{
ExternalContext externalContext = facescontext.getExternalContext();
Object sessionObj = externalContext.getSession(true);
@@ -655,7 +655,7 @@
if (log.isTraceEnabled())
- log.trace("Exiting serializeView - do not serialize state in session.");
+ log.trace("Exiting serializeView - do not serialize state in session.");
return serializedView;