You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/24 20:09:11 UTC
svn commit: r1188267 [2/2] - in /myfaces/core/trunk/api/src:
main/java/javax/faces/application/ main/java/javax/faces/component/
main/java/javax/faces/component/behavior/ main/java/javax/faces/convert/
main/java/javax/faces/event/ main/java/javax/faces...
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java Mon Oct 24 18:09:08 2011
@@ -189,7 +189,7 @@ class _MethodBindingToMethodExpression e
@Override
public int hashCode()
{
- final int PRIME = 31;
+ int PRIME = 31;
int result = 1;
result = PRIME * result + ((methodBinding == null) ? 0 : methodBinding.hashCode());
return result;
@@ -210,7 +210,7 @@ class _MethodBindingToMethodExpression e
{
return false;
}
- final _MethodBindingToMethodExpression other = (_MethodBindingToMethodExpression)obj;
+ _MethodBindingToMethodExpression other = (_MethodBindingToMethodExpression)obj;
if (methodBinding == null)
{
if (other.methodBinding != null)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_MethodExpressionToMethodBinding.java Mon Oct 24 18:09:08 2011
@@ -21,7 +21,6 @@ package javax.faces.component;
import javax.el.ELException;
import javax.el.MethodExpression;
-import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsIterator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsIterator.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsIterator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_SelectItemsIterator.java Mon Oct 24 18:09:08 2011
@@ -58,7 +58,7 @@ class _SelectItemsIterator implements It
private static final String NO_SELECTION_VALUE_ATTR = "noSelectionValue";
private final Iterator<UIComponent> _children;
- private Iterator<? extends Object> _nestedItems;
+ private Iterator<?> _nestedItems;
private SelectItem _nextItem;
private UISelectItems _currentUISelectItems;
private FacesContext _facesContext;
@@ -151,7 +151,7 @@ class _SelectItemsIterator implements It
{
// value is any kind of array (primitive or non-primitive)
// --> we have to use class Array to get the values
- final int length = Array.getLength(value);
+ int length = Array.getLength(value);
Collection<Object> items = new ArrayList<Object>(length);
for (int i = 0; i < length; i++)
{
@@ -230,7 +230,7 @@ class _SelectItemsIterator implements It
// write the current item into the request map under the key listed in var, if available
boolean wroteRequestMapVarValue = false;
Object oldRequestMapVarValue = null;
- final String var = (String) attributeMap.get(VAR_ATTR);
+ String var = (String) attributeMap.get(VAR_ATTR);
if(var != null && !"".equals(var))
{
// save the current value of the key listed in var from the request map
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java Mon Oct 24 18:09:08 2011
@@ -139,7 +139,7 @@ class _ValueBindingToValueExpression ext
@Override
public int hashCode()
{
- final int PRIME = 31;
+ int PRIME = 31;
int result = 1;
result = PRIME * result + (_transient ? 1231 : 1237);
result = PRIME * result + ((_valueBinding == null) ? 0 : _valueBinding.hashCode());
@@ -161,7 +161,7 @@ class _ValueBindingToValueExpression ext
{
return false;
}
- final _ValueBindingToValueExpression other = (_ValueBindingToValueExpression)obj;
+ _ValueBindingToValueExpression other = (_ValueBindingToValueExpression)obj;
if (_transient != other._transient)
{
return false;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java Mon Oct 24 18:09:08 2011
@@ -50,7 +50,7 @@ class _ValueExpressionToValueBinding ext
@Override
public int hashCode()
{
- final int PRIME = 31;
+ int PRIME = 31;
int result = 1;
result = PRIME * result + ((_valueExpression == null) ? 0 : _valueExpression.hashCode());
result = PRIME * result + (isTransient ? 1231 : 1237);
@@ -72,7 +72,7 @@ class _ValueExpressionToValueBinding ext
{
return false;
}
- final _ValueExpressionToValueBinding other = (_ValueExpressionToValueBinding) obj;
+ _ValueExpressionToValueBinding other = (_ValueExpressionToValueBinding) obj;
if (_valueExpression == null)
{
if (other._valueExpression != null)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java Mon Oct 24 18:09:08 2011
@@ -31,7 +31,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
- /**
+/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*
@@ -39,12 +39,13 @@ import java.util.Map;
* behavior delta states, cross ported
* from our generic delta state, due to limitations
* in the spec (sorry for the somewhat dirty code here maybe
- * we can unify both implementations by isolating a common protected interface)
+ * we can unify both implementations by isolating a common protected interface)
*
* @since 2.0
*/
-class _AjaxBehaviorDeltaStateHelper <A extends AjaxBehavior> implements StateHelper {
- /**
+class _AjaxBehaviorDeltaStateHelper<A extends AjaxBehavior> implements StateHelper
+{
+ /**
* We need to hold a component instance because:
* <p/>
* - The component is the one who knows if we are on initial or delta mode
@@ -70,7 +71,8 @@ class _AjaxBehaviorDeltaStateHelper <A e
private boolean _transient = false;
- public _AjaxBehaviorDeltaStateHelper(A component) {
+ public _AjaxBehaviorDeltaStateHelper(A component)
+ {
super();
this._target = component;
_fullState = new HashMap<Serializable, Object>();
@@ -83,9 +85,12 @@ class _AjaxBehaviorDeltaStateHelper <A e
*
* @return
*/
- private boolean _createDeltas() {
- if (isInitialStateMarked()) {
- if (_deltas == null) {
+ private boolean _createDeltas()
+ {
+ if (isInitialStateMarked())
+ {
+ if (_deltas == null)
+ {
_deltas = new HashMap<Serializable, Object>(2);
}
return true;
@@ -94,16 +99,20 @@ class _AjaxBehaviorDeltaStateHelper <A e
return false;
}
- protected boolean isInitialStateMarked() {
+ protected boolean isInitialStateMarked()
+ {
return _target.initialStateMarked();
}
- public void add(Serializable key, Object value) {
- if (_createDeltas()) {
+ public void add(Serializable key, Object value)
+ {
+ if (_createDeltas())
+ {
//Track delta case
Map<Object, Boolean> deltaListMapValues = (Map<Object, Boolean>) _deltas
.get(key);
- if (deltaListMapValues == null) {
+ if (deltaListMapValues == null)
+ {
deltaListMapValues = new InternalDeltaListMap<Object, Boolean>(
3);
_deltas.put(key, deltaListMapValues);
@@ -113,56 +122,71 @@ class _AjaxBehaviorDeltaStateHelper <A e
//Handle change on full map
List<Object> fullListValues = (List<Object>) _fullState.get(key);
- if (fullListValues == null) {
+ if (fullListValues == null)
+ {
fullListValues = new InternalList<Object>(3);
_fullState.put(key, fullListValues);
}
fullListValues.add(value);
}
- public Object eval(Serializable key) {
+ public Object eval(Serializable key)
+ {
Object returnValue = _fullState.get(key);
- if (returnValue != null) {
+ if (returnValue != null)
+ {
return returnValue;
}
ValueExpression expression = _target.getValueExpression(key
.toString());
- if (expression != null) {
+ if (expression != null)
+ {
return expression.getValue(FacesContext.getCurrentInstance()
.getELContext());
}
return null;
}
- public Object eval(Serializable key, Object defaultValue) {
+ public Object eval(Serializable key, Object defaultValue)
+ {
Object returnValue = _fullState.get(key);
- if (returnValue != null) {
+ if (returnValue != null)
+ {
return returnValue;
}
ValueExpression expression = _target.getValueExpression(key
.toString());
- if (expression != null) {
+ if (expression != null)
+ {
return expression.getValue(FacesContext.getCurrentInstance()
.getELContext());
}
return defaultValue;
}
- public Object get(Serializable key) {
+ public Object get(Serializable key)
+ {
return _fullState.get(key);
}
- public Object put(Serializable key, Object value) {
+ public Object put(Serializable key, Object value)
+ {
Object returnValue = null;
- if (_createDeltas()) {
- if (_deltas.containsKey(key)) {
+ if (_createDeltas())
+ {
+ if (_deltas.containsKey(key))
+ {
returnValue = _deltas.put(key, value);
_fullState.put(key, value);
- } else {
+ }
+ else
+ {
_deltas.put(key, value);
returnValue = _fullState.put(key, value);
}
- } else {
+ }
+ else
+ {
/*
if (value instanceof StateHolder)
{
@@ -174,21 +198,27 @@ class _AjaxBehaviorDeltaStateHelper <A e
return returnValue;
}
- public Object put(Serializable key, String mapKey, Object value) {
+ public Object put(Serializable key, String mapKey, Object value)
+ {
boolean returnSet = false;
Object returnValue = null;
- if (_createDeltas()) {
+ if (_createDeltas())
+ {
//Track delta case
Map<String, Object> mapValues = (Map<String, Object>) _deltas
.get(key);
- if (mapValues == null) {
+ if (mapValues == null)
+ {
mapValues = new InternalMap<String, Object>();
_deltas.put(key, mapValues);
}
- if (mapValues.containsKey(mapKey)) {
+ if (mapValues.containsKey(mapKey))
+ {
returnValue = mapValues.put(mapKey, value);
returnSet = true;
- } else {
+ }
+ else
+ {
mapValues.put(mapKey, value);
}
}
@@ -196,37 +226,49 @@ class _AjaxBehaviorDeltaStateHelper <A e
//Handle change on full map
Map<String, Object> mapValues = (Map<String, Object>) _fullState
.get(key);
- if (mapValues == null) {
+ if (mapValues == null)
+ {
mapValues = new InternalMap<String, Object>();
_fullState.put(key, mapValues);
}
- if (returnSet) {
+ if (returnSet)
+ {
mapValues.put(mapKey, value);
- } else {
+ }
+ else
+ {
returnValue = mapValues.put(mapKey, value);
}
return returnValue;
}
- public Object remove(Serializable key) {
+ public Object remove(Serializable key)
+ {
Object returnValue = null;
- if (_createDeltas()) {
- if (_deltas.containsKey(key)) {
+ if (_createDeltas())
+ {
+ if (_deltas.containsKey(key))
+ {
// Keep track of the removed values using key/null pair on the delta map
returnValue = _deltas.put(key, null);
_fullState.remove(key);
- } else {
+ }
+ else
+ {
// Keep track of the removed values using key/null pair on the delta map
_deltas.put(key, null);
returnValue = _fullState.remove(key);
}
- } else {
+ }
+ else
+ {
returnValue = _fullState.remove(key);
}
return returnValue;
}
- public Object remove(Serializable key, Object valueOrKey) {
+ public Object remove(Serializable key, Object valueOrKey)
+ {
// Comment by lu4242 : The spec javadoc says if it is a Collection
// or Map deal with it. But the intention of this method is work
// with add(?,?) and put(?,?,?), this ones return instances of
@@ -235,23 +277,32 @@ class _AjaxBehaviorDeltaStateHelper <A e
Object collectionOrMap = _fullState.get(key);
Object returnValue = null;
- if (collectionOrMap instanceof InternalMap) {
- if (_createDeltas()) {
+ if (collectionOrMap instanceof InternalMap)
+ {
+ if (_createDeltas())
+ {
returnValue = _removeValueOrKeyFromMap(_deltas, key,
- valueOrKey, true);
+ valueOrKey, true);
_removeValueOrKeyFromMap(_fullState, key, valueOrKey, false);
- } else {
+ }
+ else
+ {
returnValue = _removeValueOrKeyFromMap(_fullState, key,
- valueOrKey, false);
+ valueOrKey, false);
}
- } else if (collectionOrMap instanceof InternalList) {
- if (_createDeltas()) {
+ }
+ else if (collectionOrMap instanceof InternalList)
+ {
+ if (_createDeltas())
+ {
returnValue = _removeValueOrKeyFromCollectionDelta(_deltas,
- key, valueOrKey);
+ key, valueOrKey);
_removeValueOrKeyFromCollection(_fullState, key, valueOrKey);
- } else {
+ }
+ else
+ {
returnValue = _removeValueOrKeyFromCollection(_fullState, key,
- valueOrKey);
+ valueOrKey);
}
}
return returnValue;
@@ -259,11 +310,14 @@ class _AjaxBehaviorDeltaStateHelper <A e
private static Object _removeValueOrKeyFromCollectionDelta(
Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey) {
+ Object valueOrKey)
+ {
Object returnValue = null;
Map<Object, Boolean> c = (Map<Object, Boolean>) stateMap.get(key);
- if (c != null) {
- if (c.containsKey(valueOrKey)) {
+ if (c != null)
+ {
+ if (c.containsKey(valueOrKey))
+ {
returnValue = valueOrKey;
}
c.put(valueOrKey, Boolean.FALSE);
@@ -273,14 +327,18 @@ class _AjaxBehaviorDeltaStateHelper <A e
private static Object _removeValueOrKeyFromCollection(
Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey) {
+ Object valueOrKey)
+ {
Object returnValue = null;
Collection c = (Collection) stateMap.get(key);
- if (c != null) {
- if (c.remove(valueOrKey)) {
+ if (c != null)
+ {
+ if (c.remove(valueOrKey))
+ {
returnValue = valueOrKey;
}
- if (c.isEmpty()) {
+ if (c.isEmpty())
+ {
stateMap.remove(key);
}
}
@@ -289,22 +347,29 @@ class _AjaxBehaviorDeltaStateHelper <A e
private static Object _removeValueOrKeyFromMap(
Map<Serializable, Object> stateMap, Serializable key,
- Object valueOrKey, boolean delta) {
- if (valueOrKey == null) {
+ Object valueOrKey, boolean delta)
+ {
+ if (valueOrKey == null)
+ {
return null;
}
Object returnValue = null;
Map<String, Object> map = (Map<String, Object>) stateMap.get(key);
- if (map != null) {
- if (delta) {
+ if (map != null)
+ {
+ if (delta)
+ {
// Keep track of the removed values using key/null pair on the delta map
returnValue = map.put((String) valueOrKey, null);
- } else {
+ }
+ else
+ {
returnValue = map.remove(valueOrKey);
}
- if (map.isEmpty()) {
+ if (map.isEmpty())
+ {
//stateMap.remove(key);
stateMap.put(key, null);
}
@@ -312,7 +377,8 @@ class _AjaxBehaviorDeltaStateHelper <A e
return returnValue;
}
- public boolean isTransient() {
+ public boolean isTransient()
+ {
return _transient;
}
@@ -327,10 +393,12 @@ class _AjaxBehaviorDeltaStateHelper <A e
* the internal Map again is then mapped to a map with key value pairs
*/
- public Object saveState(FacesContext context) {
+ public Object saveState(FacesContext context)
+ {
Map serializableMap = (isInitialStateMarked()) ? _deltas : _fullState;
- if (serializableMap == null || serializableMap.size() == 0) {
+ if (serializableMap == null || serializableMap.size() == 0)
+ {
return null;
}
@@ -353,10 +421,10 @@ class _AjaxBehaviorDeltaStateHelper <A e
Object[] retArr = new Object[serializableMap.entrySet().size() * 2];
//Object[] retArr = new Object[serializableMap.entrySet().size() * 2 + stateHolderKeyCount];
- Iterator<Map.Entry<Serializable, Object>> it = serializableMap
- .entrySet().iterator();
+ Iterator<Map.Entry<Serializable, Object>> it = serializableMap.entrySet().iterator();
int cnt = 0;
- while (it.hasNext()) {
+ while (it.hasNext())
+ {
entry = it.next();
retArr[cnt] = entry.getKey();
@@ -366,12 +434,15 @@ class _AjaxBehaviorDeltaStateHelper <A e
// is to handle List, StateHolder or non Serializable instances.
// we check it here, to prevent unnecessary calls.
if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable)) {
+ value instanceof List ||
+ !(value instanceof Serializable))
+ {
Object savedValue = UIComponentBase.saveAttachedState(context,
- value);
+ value);
retArr[cnt + 1] = savedValue;
- } else {
+ }
+ else
+ {
retArr[cnt + 1] = value;
}
cnt += 2;
@@ -414,7 +485,8 @@ class _AjaxBehaviorDeltaStateHelper <A e
}
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(FacesContext context, Object state)
+ {
if (state == null)
{
return;
@@ -422,28 +494,38 @@ class _AjaxBehaviorDeltaStateHelper <A e
Object[] serializedState = (Object[]) state;
- for (int cnt = 0; cnt < serializedState.length; cnt += 2) {
+ for (int cnt = 0; cnt < serializedState.length; cnt += 2)
+ {
Serializable key = (Serializable) serializedState[cnt];
Object savedValue = UIComponentBase.restoreAttachedState(context,
- serializedState[cnt + 1]);
+ serializedState[cnt + 1]);
- if (isInitialStateMarked()) {
- if (savedValue instanceof InternalDeltaListMap) {
+ if (isInitialStateMarked())
+ {
+ if (savedValue instanceof InternalDeltaListMap)
+ {
for (Map.Entry<Object, Boolean> mapEntry : ((Map<Object, Boolean>) savedValue)
- .entrySet()) {
+ .entrySet())
+ {
boolean addOrRemove = mapEntry.getValue();
- if (addOrRemove) {
+ if (addOrRemove)
+ {
//add
this.add(key, mapEntry.getKey());
- } else {
+ }
+ else
+ {
//remove
this.remove(key, mapEntry.getKey());
}
}
- } else if (savedValue instanceof InternalMap) {
+ }
+ else if (savedValue instanceof InternalMap)
+ {
for (Map.Entry<String, Object> mapEntry : ((Map<String, Object>) savedValue)
- .entrySet()) {
+ .entrySet())
+ {
this.put(key, mapEntry.getKey(), mapEntry.getValue());
}
}
@@ -457,66 +539,84 @@ class _AjaxBehaviorDeltaStateHelper <A e
_stateHolderKeys.add(key);
}
*/
- else {
+ else
+ {
put(key, savedValue);
}
- } else {
+ }
+ else
+ {
put(key, savedValue);
}
}
}
- public void setTransient(boolean transientValue) {
+ public void setTransient(boolean transientValue)
+ {
_transient = transientValue;
}
//We use our own data structures just to make sure
//nothing gets mixed up internally
- static class InternalMap<K, V> extends HashMap<K, V> implements StateHolder {
- public InternalMap() {
+ static class InternalMap<K, V> extends HashMap<K, V> implements StateHolder
+ {
+ public InternalMap()
+ {
super();
}
- public InternalMap(int initialCapacity, float loadFactor) {
+ public InternalMap(int initialCapacity, float loadFactor)
+ {
super(initialCapacity, loadFactor);
}
- public InternalMap(Map<? extends K, ? extends V> m) {
+ public InternalMap(Map<? extends K, ? extends V> m)
+ {
super(m);
}
- public InternalMap(int initialSize) {
+ public InternalMap(int initialSize)
+ {
super(initialSize);
}
- public boolean isTransient() {
+ public boolean isTransient()
+ {
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(boolean newTransientValue)
+ {
// No op
}
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(FacesContext context, Object state)
+ {
Object[] listAsMap = (Object[]) state;
- for (int cnt = 0; cnt < listAsMap.length; cnt += 2) {
+ for (int cnt = 0; cnt < listAsMap.length; cnt += 2)
+ {
this.put((K) listAsMap[cnt], (V) UIComponentBase
.restoreAttachedState(context, listAsMap[cnt + 1]));
}
}
- public Object saveState(FacesContext context) {
+ public Object saveState(FacesContext context)
+ {
int cnt = 0;
Object[] mapArr = new Object[this.size() * 2];
- for (Map.Entry<K, V> entry : this.entrySet()) {
+ for (Map.Entry<K, V> entry : this.entrySet())
+ {
mapArr[cnt] = entry.getKey();
Object value = entry.getValue();
if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable)) {
+ value instanceof List ||
+ !(value instanceof Serializable))
+ {
mapArr[cnt + 1] = UIComponentBase.saveAttachedState(context, value);
- } else {
+ }
+ else
+ {
mapArr[cnt + 1] = value;
}
cnt += 2;
@@ -528,64 +628,82 @@ class _AjaxBehaviorDeltaStateHelper <A e
/**
* Map used to keep track of list changes
*/
- static class InternalDeltaListMap<K, V> extends InternalMap<K, V> {
+ static class InternalDeltaListMap<K, V> extends InternalMap<K, V>
+ {
- public InternalDeltaListMap() {
+ public InternalDeltaListMap()
+ {
super();
}
- public InternalDeltaListMap(int initialCapacity, float loadFactor) {
+ public InternalDeltaListMap(int initialCapacity, float loadFactor)
+ {
super(initialCapacity, loadFactor);
}
- public InternalDeltaListMap(int initialSize) {
+ public InternalDeltaListMap(int initialSize)
+ {
super(initialSize);
}
- public InternalDeltaListMap(Map<? extends K, ? extends V> m) {
+ public InternalDeltaListMap(Map<? extends K, ? extends V> m)
+ {
super(m);
}
}
- static class InternalList<T> extends ArrayList<T> implements StateHolder {
- public InternalList() {
+ static class InternalList<T> extends ArrayList<T> implements StateHolder
+ {
+ public InternalList()
+ {
super();
}
- public InternalList(Collection<? extends T> c) {
+ public InternalList(Collection<? extends T> c)
+ {
super(c);
}
- public InternalList(int initialSize) {
+ public InternalList(int initialSize)
+ {
super(initialSize);
}
- public boolean isTransient() {
+ public boolean isTransient()
+ {
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(boolean newTransientValue)
+ {
}
- public void restoreState(FacesContext context, Object state) {
+ public void restoreState(FacesContext context, Object state)
+ {
Object[] listAsArr = (Object[]) state;
//since all other options would mean dual iteration
//we have to do it the hard way
- for (Object elem : listAsArr) {
+ for (Object elem : listAsArr)
+ {
add((T) UIComponentBase.restoreAttachedState(context, elem));
}
}
- public Object saveState(FacesContext context) {
+ public Object saveState(FacesContext context)
+ {
Object[] values = new Object[size()];
- for (int i = 0; i < size(); i++) {
+ for (int i = 0; i < size(); i++)
+ {
Object value = get(i);
if (value instanceof StateHolder ||
- value instanceof List ||
- !(value instanceof Serializable)) {
+ value instanceof List ||
+ !(value instanceof Serializable))
+ {
values[i] = UIComponentBase.saveAttachedState(context, value);
- } else {
+ }
+ else
+ {
values[i] = value;
}
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java Mon Oct 24 18:09:08 2011
@@ -603,7 +603,6 @@ public class NumberConverter
{
java14 = 2;
}
- ;
default:
idx = 0;
version = null;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/_MessageUtils.java Mon Oct 24 18:09:08 2011
@@ -27,7 +27,6 @@ import javax.faces.context.FacesContext;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/ListenerFor.java Mon Oct 24 18:09:08 2011
@@ -38,5 +38,5 @@ public @interface ListenerFor
public Class<? extends SystemEvent> systemEventClass();
// FIXME: Spec is not Java 5 compliant, specified signature is Class sourceClass()
- public Class sourceClass() default Void.class;;
+ public Class sourceClass() default Void.class;
}
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=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/event/PhaseEvent.java Mon Oct 24 18:09:08 2011
@@ -70,7 +70,7 @@ public class PhaseEvent extends EventObj
@Override
public int hashCode()
{
- final int PRIME = 31;
+ int PRIME = 31;
int result = 1;
result = PRIME * result + ((source == null) ? 0 : source.hashCode());
result = PRIME * result + ((_facesContext == null) ? 0 : _facesContext.hashCode());
@@ -93,7 +93,7 @@ public class PhaseEvent extends EventObj
{
return false;
}
- final PhaseEvent other = (PhaseEvent) obj;
+ PhaseEvent other = (PhaseEvent) obj;
if (source == null)
{
if (other.source != null)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Mon Oct 24 18:09:08 2011
@@ -147,18 +147,18 @@ public class BeanValidator implements Va
}
// Obtain a reference to the to-be-validated object and the property name.
- final _ValueReferenceWrapper reference = getValueReference(valueExpression, context);
+ _ValueReferenceWrapper reference = getValueReference(valueExpression, context);
if (reference == null)
{
return;
}
- final Object base = reference.getBase();
+ Object base = reference.getBase();
if (base == null)
{
return;
}
- final Class<?> valueBaseClass = base.getClass();
+ Class<?> valueBaseClass = base.getClass();
if (valueBaseClass == null)
{
return;
@@ -172,31 +172,31 @@ public class BeanValidator implements Va
// can exit bean validation here
return;
}
- final String valueProperty = (String) referenceProperty;
+ String valueProperty = (String) referenceProperty;
// Initialize Bean Validation.
- final ValidatorFactory validatorFactory = createValidatorFactory(context);
- final javax.validation.Validator validator = createValidator(validatorFactory);
- final BeanDescriptor beanDescriptor = validator.getConstraintsForClass(valueBaseClass);
+ ValidatorFactory validatorFactory = createValidatorFactory(context);
+ javax.validation.Validator validator = createValidator(validatorFactory);
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass(valueBaseClass);
if (!beanDescriptor.isBeanConstrained())
{
return;
}
// Note that validationGroupsArray was initialized when createValidator was called
- final Class[] validationGroupsArray = this.validationGroupsArray;
+ Class[] validationGroupsArray = this.validationGroupsArray;
// Delegate to Bean Validation.
- final Set constraintViolations = validator.validateValue(valueBaseClass, valueProperty, value, validationGroupsArray);
+ Set constraintViolations = validator.validateValue(valueBaseClass, valueProperty, value, validationGroupsArray);
if (!constraintViolations.isEmpty())
{
- final Set<FacesMessage> messages = new LinkedHashSet<FacesMessage>(constraintViolations.size());
+ Set<FacesMessage> messages = new LinkedHashSet<FacesMessage>(constraintViolations.size());
for (Object violation: constraintViolations)
{
- final ConstraintViolation constraintViolation = (ConstraintViolation) violation;
- final String message = constraintViolation.getMessage();
- final Object[] args = new Object[]{ message, _MessageUtils.getLabel(context, component) };
- final FacesMessage msg = _MessageUtils.getErrorMessage(context, MESSAGE_ID, args);
+ ConstraintViolation constraintViolation = (ConstraintViolation) violation;
+ String message = constraintViolation.getMessage();
+ Object[] args = new Object[]{ message, _MessageUtils.getLabel(context, component) };
+ FacesMessage msg = _MessageUtils.getErrorMessage(context, MESSAGE_ID, args);
messages.add(msg);
}
throw new ValidatorException(messages);
@@ -232,13 +232,13 @@ public class BeanValidator implements Va
private _ValueReferenceWrapper getValueReference(
final ValueExpression valueExpression, final FacesContext context)
{
- final ELContext elCtx = context.getELContext();
+ ELContext elCtx = context.getELContext();
if (_ExternalSpecifications.isUnifiedELAvailable())
{
// unified el 2.2 is available --> we can use ValueExpression.getValueReference()
// we can't access ValueExpression.getValueReference() directly here, because
// Class loading would fail in applications with el-api versions prior to 2.2
- final _ValueReferenceWrapper wrapper = _BeanValidatorUELUtils.getUELValueReferenceWrapper(valueExpression, elCtx);
+ _ValueReferenceWrapper wrapper = _BeanValidatorUELUtils.getUELValueReferenceWrapper(valueExpression, elCtx);
if (wrapper != null)
{
if (wrapper.getProperty() == null)
@@ -291,7 +291,7 @@ public class BeanValidator implements Va
{
if (_ExternalSpecifications.isBeanValidationAvailable())
{
- final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+ ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
applicationMap.put(VALIDATOR_FACTORY_KEY, attr);
return factory;
}
@@ -315,8 +315,8 @@ public class BeanValidator implements Va
}
else
{
- final String[] classes = this.validationGroups.split(VALIDATION_GROUPS_DELIMITER);
- final List<Class<?>> validationGroupsList = new ArrayList<Class<?>>(classes.length);
+ String[] classes = this.validationGroups.split(VALIDATION_GROUPS_DELIMITER);
+ List<Class<?>> validationGroupsList = new ArrayList<Class<?>>(classes.length);
for (String clazz : classes)
{
@@ -477,7 +477,7 @@ final class _FacesMessageInterpolatorHol
_FacesMessageInterpolatorHolder.FacesMessageInterpolator ret = instance;
if (ret == null)
{
- final MessageInterpolator interpolator = validatorFactory.getMessageInterpolator();
+ MessageInterpolator interpolator = validatorFactory.getMessageInterpolator();
instance = ret = new FacesMessageInterpolator(interpolator);
}
return ret;
@@ -497,7 +497,7 @@ final class _FacesMessageInterpolatorHol
public String interpolate(final String s, final Context context)
{
- final Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
+ Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
return interpolator.interpolate(s, context, locale);
}
@@ -585,8 +585,8 @@ final class _ValueReferenceResolver exte
*/
public static _ValueReferenceWrapper resolve(ValueExpression valueExpression, final ELContext elCtx)
{
- final _ValueReferenceResolver resolver = new _ValueReferenceResolver(elCtx.getELResolver());
- final ELContext elCtxDecorator = new _ELContextDecorator(elCtx, resolver);
+ _ValueReferenceResolver resolver = new _ValueReferenceResolver(elCtx.getELResolver());
+ ELContext elCtxDecorator = new _ELContextDecorator(elCtx, resolver);
valueExpression.getValue(elCtxDecorator);
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=1188267&r1=1188266&r2=1188267&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 Mon Oct 24 18:09:08 2011
@@ -231,7 +231,7 @@ public class DoubleRangeValidator
return false;
}
- final DoubleRangeValidator doubleRangeValidator = (DoubleRangeValidator)o;
+ DoubleRangeValidator doubleRangeValidator = (DoubleRangeValidator)o;
if (_maximum != null ? !_maximum.equals(doubleRangeValidator._maximum) : doubleRangeValidator._maximum != null)
{
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=1188267&r1=1188266&r2=1188267&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 Mon Oct 24 18:09:08 2011
@@ -203,7 +203,7 @@ public class LengthValidator
return false;
}
- final LengthValidator lengthValidator = (LengthValidator)o;
+ LengthValidator lengthValidator = (LengthValidator)o;
if (_maximum != null ? !_maximum.equals(lengthValidator._maximum) : lengthValidator._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=1188267&r1=1188266&r2=1188267&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 Mon Oct 24 18:09:08 2011
@@ -230,7 +230,7 @@ public class LongRangeValidator
return false;
}
- final LongRangeValidator longRangeValidator = (LongRangeValidator)o;
+ LongRangeValidator longRangeValidator = (LongRangeValidator)o;
if (_maximum != null ? !_maximum.equals(longRangeValidator._maximum) : longRangeValidator._maximum != null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/ValidatorException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/ValidatorException.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/ValidatorException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/ValidatorException.java Mon Oct 24 18:09:08 2011
@@ -74,8 +74,8 @@ public class ValidatorException
private static String facesMessageToString(FacesMessage message)
{
- final String summary = message.getSummary();
- final String detail = message.getDetail();
+ String summary = message.getSummary();
+ String detail = message.getDetail();
if (summary != null)
{
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/AttributeHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/AttributeHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/AttributeHandler.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletContext;
-
/**
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ComponentHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ComponentHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ComponentHandler.java Mon Oct 24 18:09:08 2011
@@ -19,7 +19,6 @@
package javax.faces.view.facelets;
import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
/**
* Implementation of the tag logic used in the JSF specification. This is your golden hammer for wiring UIComponents to
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/CompositeFaceletHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/CompositeFaceletHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/CompositeFaceletHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/CompositeFaceletHandler.java Mon Oct 24 18:09:08 2011
@@ -21,8 +21,6 @@ package javax.faces.view.facelets;
import java.io.IOException;
import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.FaceletHandler;
/**
* @author Simon Lessard (latest modification by $Author$)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/DelegatingMetaTagHandler.java Mon Oct 24 18:09:08 2011
@@ -22,7 +22,6 @@ import java.io.IOException;
import javax.faces.FactoryFinder;
import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
/**
* @author Simon Lessard (latest modification by $Author$)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FacetHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FacetHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/FacetHandler.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletContext;
-
/**
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/MetaTagHandler.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletContext;
-
/**
* A base tag for wiring state to an object instance based on rules populated at the time of creating a MetaRuleset.
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Metadata.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Metadata.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Metadata.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/Metadata.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletContext;
-
/**
* External information on how to wire dynamic or literal state to the passed Object instance.
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttribute.java Mon Oct 24 18:09:08 2011
@@ -22,7 +22,6 @@ import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.view.Location;
-import javax.faces.view.facelets.FaceletContext;
/**
* Representation of a Tag's attribute in a Facelet File
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttributeException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttributeException.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttributeException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagAttributeException.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletException;
-
/**
* An Exception caused by a TagAttribute
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagConfig.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagConfig.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagConfig.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletHandler;
-
/**
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagException.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagException.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagException.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagException.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletException;
-
/**
* An Exception caused by a Tag
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandler.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletHandler;
-
/**
* Foundation class for FaceletHandlers associated with markup in a Facelet document.
*
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TagHandlerDelegate.java Mon Oct 24 18:09:08 2011
@@ -21,7 +21,6 @@ package javax.faces.view.facelets;
import java.io.IOException;
import javax.faces.component.UIComponent;
-import javax.faces.view.facelets.FaceletContext;
/**
* @author Simon Lessard (latest modification by $Author$)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TextHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TextHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TextHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/TextHandler.java Mon Oct 24 18:09:08 2011
@@ -18,8 +18,6 @@
*/
package javax.faces.view.facelets;
-import javax.faces.view.facelets.FaceletContext;
-
/**
* @author Simon Lessard (latest modification by $Author$)
* @version $Revision$ $Date$
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ValidatorHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ValidatorHandler.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ValidatorHandler.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/view/facelets/ValidatorHandler.java Mon Oct 24 18:09:08 2011
@@ -19,7 +19,6 @@
package javax.faces.view.facelets;
import javax.faces.view.EditableValueHolderAttachedObjectHandler;
-import javax.faces.view.facelets.FaceletContext;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/webapp/UIComponentTagBase.java Mon Oct 24 18:09:08 2011
@@ -31,7 +31,7 @@ import javax.servlet.jsp.tagext.JspTag;
* @since 1.2
*/
-public abstract class UIComponentTagBase extends Object implements JspTag
+public abstract class UIComponentTagBase implements JspTag
{
protected static Logger log = Logger.getLogger("javax.faces.webapp");
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java Mon Oct 24 18:09:08 2011
@@ -214,8 +214,8 @@ public class FacesMessageTest extends Te
public void testSerialization() throws Exception
{
- final String summary = "summary";
- final String detail = "detail";
+ String summary = "summary";
+ String detail = "detail";
FacesMessage msg = new FacesMessage(summary, detail);
// check if properties are set correctly
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/AbstractUIComponentPropertyTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/AbstractUIComponentPropertyTest.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/AbstractUIComponentPropertyTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/AbstractUIComponentPropertyTest.java Mon Oct 24 18:09:08 2011
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public abstract class AbstractUIComponentPropertyTest<T extends Object>
+public abstract class AbstractUIComponentPropertyTest<T>
{
private final String _property;
private final T _defaultValue;
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseGetClientIdTest.java Mon Oct 24 18:09:08 2011
@@ -79,7 +79,7 @@ public class UIComponentBaseGetClientIdT
public void testWithRenderer() throws Exception
{
- final String id = "testId";
+ String id = "testId";
final String expectedClientId = "convertedClientId";
_testImpl = new UIOutput()
{
@@ -101,8 +101,8 @@ public class UIComponentBaseGetClientIdT
public void testWithParentNamingContainer() throws Exception
{
- final String id = "testId";
- final String containerClientId = "containerClientId";
+ String id = "testId";
+ String containerClientId = "containerClientId";
String expectedClientId = containerClientId + NamingContainer.SEPARATOR_CHAR + id;
UIComponent namingContainer = new UINamingContainer();
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java Mon Oct 24 18:09:08 2011
@@ -65,7 +65,7 @@ public class UIComponentInvokeOnComponen
@Test
public void testInvokeOnComponentWithSameClientId() throws Exception
{
- final UIComponent testimpl = new UIOutput();
+ UIComponent testimpl = new UIOutput();
testimpl.setId("xxxId");
//EasyMock.expect(_testimpl.getClientId(EasyMock.same(facesContext))).andReturn("xxxId");
@@ -99,7 +99,7 @@ public class UIComponentInvokeOnComponen
public void testInvokeOnComponentAndNotFindComponentWithClientId() throws Exception
{
//List<UIComponent> emptyList = Collections.emptyList();
- final UIComponent testimpl = new UIPanel();
+ UIComponent testimpl = new UIPanel();
testimpl.setId("xxxId");
//EasyMock.expect(_testimpl.getClientId(EasyMock.same(facesContext))).andReturn("xxxId");
@@ -112,7 +112,7 @@ public class UIComponentInvokeOnComponen
@Test
public void testInvokeOnComponentOnChild() throws Exception
{
- final UIComponent testimpl = new UIPanel();
+ UIComponent testimpl = new UIPanel();
testimpl.setId("xxxId");
//EasyMock.expect(_testimpl.getClientId(EasyMock.same(facesContext))).andReturn("xxxId");
String childId = "childId";
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIViewParameterTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIViewParameterTest.java?rev=1188267&r1=1188266&r2=1188267&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIViewParameterTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIViewParameterTest.java Mon Oct 24 18:09:08 2011
@@ -75,7 +75,7 @@ public class UIViewParameterTest extends
*/
public void testDecodeSetOnlyNonNullSubmittedValue()
{
- final String notNull = "not null";
+ String notNull = "not null";
viewParameter.setSubmittedValue(notNull);
// explicitly set the value in the request parameter map to null