You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/10/29 23:24:30 UTC
svn commit: r1813718 - in
/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component:
_ComponentFacetMap.java _DeltaStateHelper.java _EmptyIterator.java
Author: tandraschko
Date: Sun Oct 29 23:24:30 2017
New Revision: 1813718
URL: http://svn.apache.org/viewvc?rev=1813718&view=rev
Log:
added missing @Override
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_EmptyIterator.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java?rev=1813718&r1=1813717&r2=1813718&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_ComponentFacetMap.java Sun Oct 29 23:24:30 2017
@@ -40,11 +40,13 @@ class _ComponentFacetMap<V extends UICom
_component = component;
}
+ @Override
public int size()
{
return _map.size();
}
+ @Override
public void clear()
{
UIComponent[] values = _map.values().toArray(new UIComponent[_map.size()]);
@@ -57,23 +59,27 @@ class _ComponentFacetMap<V extends UICom
}
}
+ @Override
public boolean isEmpty()
{
return _map.isEmpty();
}
+ @Override
public boolean containsKey(Object key)
{
checkKey(key);
return _map.containsKey(key);
}
+ @Override
public boolean containsValue(Object value)
{
checkValue(value);
return _map.containsValue(value);
}
+ @Override
public Collection<V> values()
{
if (_valueCollection == null)
@@ -83,6 +89,7 @@ class _ComponentFacetMap<V extends UICom
return _valueCollection;
}
+ @Override
public void putAll(Map<? extends String, ? extends V> t)
{
for (Map.Entry<? extends String, ? extends V> entry : t.entrySet())
@@ -91,6 +98,7 @@ class _ComponentFacetMap<V extends UICom
}
}
+ @Override
public Set<Entry<String, V>> entrySet()
{
if (_entrySet == null)
@@ -100,6 +108,7 @@ class _ComponentFacetMap<V extends UICom
return _entrySet;
}
+ @Override
public Set<String> keySet()
{
if (_keySet == null)
@@ -109,12 +118,14 @@ class _ComponentFacetMap<V extends UICom
return _keySet;
}
+ @Override
public V get(Object key)
{
checkKey(key);
return _map.get(key);
}
+ @Override
public V remove(Object key)
{
checkKey(key);
@@ -126,6 +137,7 @@ class _ComponentFacetMap<V extends UICom
return facet;
}
+ @Override
public V put(String key, V value)
{
//checkKey(key);
@@ -204,36 +216,43 @@ class _ComponentFacetMap<V extends UICom
{
}
+ @Override
public int size()
{
return _map.size();
}
+ @Override
public boolean isEmpty()
{
return _map.isEmpty();
}
+ @Override
public boolean contains(Object o)
{
return _map.entrySet().contains(o);
}
+ @Override
public Iterator<java.util.Map.Entry<String, V>> iterator()
{
return new ComponentFacetEntryIterator(_map.entrySet().iterator());
}
+ @Override
public Object[] toArray()
{
return _map.entrySet().toArray();
}
+ @Override
public <T> T[] toArray(T[] a)
{
return _map.entrySet().toArray(a);
}
+ @Override
public boolean add(java.util.Map.Entry<String, V> o)
{
// Add over the entry set is not allowed, because this should be done
@@ -241,6 +260,7 @@ class _ComponentFacetMap<V extends UICom
throw new UnsupportedOperationException();
}
+ @Override
@SuppressWarnings("unchecked")
public boolean remove(Object o)
{
@@ -263,13 +283,14 @@ class _ComponentFacetMap<V extends UICom
}
}
+ @Override
public boolean containsAll(Collection<?> c)
{
return _map.entrySet().containsAll(c);
}
- public boolean addAll(
- Collection<? extends java.util.Map.Entry<String, V>> c)
+ @Override
+ public boolean addAll(Collection<? extends java.util.Map.Entry<String, V>> c)
{
// Add over the entry set is not allowed, because this should be done
// through the outer Map instance.
@@ -306,11 +327,13 @@ class _ComponentFacetMap<V extends UICom
_currentEntryValue = null;
}
+ @Override
public boolean hasNext()
{
return _delegate.hasNext();
}
+ @Override
public java.util.Map.Entry<String, V> next()
{
java.util.Map.Entry<String, V> next = _delegate.next();
@@ -318,6 +341,7 @@ class _ComponentFacetMap<V extends UICom
return new ComponentFacetEntry(next);
}
+ @Override
public void remove()
{
_delegate.remove();
@@ -341,16 +365,19 @@ class _ComponentFacetMap<V extends UICom
_entry = entry;
}
+ @Override
public String getKey()
{
return _entry.getKey();
}
+ @Override
public V getValue()
{
return _entry.getValue();
}
+ @Override
public V setValue(V value)
{
setNewParent(_entry.getKey(), value);
@@ -388,21 +415,25 @@ class _ComponentFacetMap<V extends UICom
{
}
+ @Override
public int size()
{
return _map.keySet().size();
}
+ @Override
public boolean isEmpty()
{
return _map.keySet().isEmpty();
}
+ @Override
public boolean contains(Object o)
{
return _map.keySet().contains(o);
}
+ @Override
public Iterator<String> iterator()
{
// Iterate over entrySet is equals to iterate over keySet, but
@@ -412,21 +443,25 @@ class _ComponentFacetMap<V extends UICom
return new ComponentFacetKeyIterator(_map.entrySet().iterator());
}
+ @Override
public Object[] toArray()
{
return _map.keySet().toArray();
}
+ @Override
public <T> T[] toArray(T[] a)
{
return _map.keySet().toArray(a);
}
+ @Override
public boolean add(String o)
{
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object o)
{
V previousValue = _map.get(o);
@@ -444,11 +479,13 @@ class _ComponentFacetMap<V extends UICom
}
}
+ @Override
public boolean containsAll(Collection<?> c)
{
return _map.keySet().containsAll(c);
}
+ @Override
public boolean addAll(Collection<? extends String> c)
{
throw new UnsupportedOperationException();
@@ -484,11 +521,13 @@ class _ComponentFacetMap<V extends UICom
_currentEntryValue = null;
}
+ @Override
public boolean hasNext()
{
return _delegate.hasNext();
}
+ @Override
public String next()
{
java.util.Map.Entry<String, V> next = _delegate.next();
@@ -496,6 +535,7 @@ class _ComponentFacetMap<V extends UICom
return next.getKey();
}
+ @Override
public void remove()
{
_delegate.remove();
@@ -512,36 +552,43 @@ class _ComponentFacetMap<V extends UICom
{
}
+ @Override
public int size()
{
return _map.values().size();
}
+ @Override
public boolean isEmpty()
{
return _map.values().isEmpty();
}
+ @Override
public boolean contains(Object o)
{
return _map.values().contains(o);
}
+ @Override
public Iterator<V> iterator()
{
return new ComponentFacetValueIterator(_map.entrySet().iterator());
}
+ @Override
public Object[] toArray()
{
return _map.values().toArray();
}
+ @Override
public <T> T[] toArray(T[] a)
{
return _map.values().toArray(a);
}
+ @Override
public boolean add(V o)
{
// Add over the entry set is not allowed, because this should be done
@@ -549,11 +596,13 @@ class _ComponentFacetMap<V extends UICom
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsAll(Collection<?> c)
{
return _map.values().containsAll(c);
}
+ @Override
public boolean addAll(Collection<? extends V> c)
{
// Add over the entry set is not allowed, because this should be done
@@ -591,11 +640,13 @@ class _ComponentFacetMap<V extends UICom
_currentEntryValue = null;
}
+ @Override
public boolean hasNext()
{
return _delegate.hasNext();
}
+ @Override
public V next()
{
java.util.Map.Entry<String, V> next = _delegate.next();
@@ -603,6 +654,7 @@ class _ComponentFacetMap<V extends UICom
return next.getValue();
}
+ @Override
public void remove()
{
_delegate.remove();
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_DeltaStateHelper.java?rev=1813718&r1=1813717&r2=1813718&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_DeltaStateHelper.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_DeltaStateHelper.java Sun Oct 29 23:24:30 2017
@@ -320,6 +320,7 @@ class _DeltaStateHelper implements State
return _component.initialStateMarked();
}
+ @Override
public void add(Serializable key, Object value)
{
if (_createDeltas(key))
@@ -346,6 +347,7 @@ class _DeltaStateHelper implements State
fullListValues.add(value);
}
+ @Override
public Object eval(Serializable key)
{
Object returnValue = _fullState.get(key);
@@ -363,6 +365,7 @@ class _DeltaStateHelper implements State
return null;
}
+ @Override
public Object eval(Serializable key, Object defaultValue)
{
Object returnValue = _fullState.get(key);
@@ -380,11 +383,13 @@ class _DeltaStateHelper implements State
return defaultValue;
}
+ @Override
public Object get(Serializable key)
{
return _fullState.get(key);
}
+ @Override
public Object put(Serializable key, Object value)
{
Object returnValue = null;
@@ -418,6 +423,7 @@ class _DeltaStateHelper implements State
return returnValue;
}
+ @Override
public Object put(Serializable key, String mapKey, Object value)
{
boolean returnSet = false;
@@ -462,6 +468,7 @@ class _DeltaStateHelper implements State
return returnValue;
}
+ @Override
public Object remove(Serializable key)
{
Object returnValue = null;
@@ -487,6 +494,7 @@ class _DeltaStateHelper implements State
return returnValue;
}
+ @Override
public Object remove(Serializable key, Object valueOrKey)
{
// Comment by lu4242 : The spec javadoc says if it is a Collection
@@ -597,6 +605,7 @@ class _DeltaStateHelper implements State
return returnValue;
}
+ @Override
public boolean isTransient()
{
return _transient;
@@ -614,6 +623,7 @@ class _DeltaStateHelper implements State
*
*
*/
+ @Override
public Object saveState(FacesContext context)
{
Map serializableMap = (isInitialStateMarked()) ? _deltas : _fullState;
@@ -748,6 +758,7 @@ class _DeltaStateHelper implements State
return retArr;
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
if (state == null)
@@ -878,6 +889,7 @@ class _DeltaStateHelper implements State
}
}
+ @Override
public void setTransient(boolean transientValue)
{
_transient = transientValue;
@@ -907,16 +919,19 @@ class _DeltaStateHelper implements State
super(initialSize);
}
+ @Override
public boolean isTransient()
{
return false;
}
+ @Override
public void setTransient(boolean newTransientValue)
{
// No op
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
Object[] listAsMap = (Object[]) state;
@@ -927,6 +942,7 @@ class _DeltaStateHelper implements State
}
}
+ @Override
public Object saveState(FacesContext context)
{
int cnt = 0;
@@ -996,15 +1012,18 @@ class _DeltaStateHelper implements State
super(initialSize);
}
+ @Override
public boolean isTransient()
{
return false;
}
+ @Override
public void setTransient(boolean newTransientValue)
{
}
+ @Override
public void restoreState(FacesContext context, Object state)
{
Object[] listAsArr = (Object[]) state;
@@ -1016,6 +1035,7 @@ class _DeltaStateHelper implements State
}
}
+ @Override
public Object saveState(FacesContext context)
{
Object[] values = new Object[size()];
@@ -1053,6 +1073,7 @@ class _DeltaStateHelper implements State
return defaultValue;
}
+ @Override
public Object putTransient(Object key, Object value)
{
if (_transientState == null)
@@ -1062,12 +1083,14 @@ class _DeltaStateHelper implements State
return _transientState.put(key, value);
}
+ @Override
@SuppressWarnings("unchecked")
public void restoreTransientState(FacesContext context, Object state)
{
_transientState = (Map<Object, Object>) state;
}
+ @Override
public Object saveTransientState(FacesContext context)
{
return _transientState;
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_EmptyIterator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_EmptyIterator.java?rev=1813718&r1=1813717&r2=1813718&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_EmptyIterator.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/_EmptyIterator.java Sun Oct 29 23:24:30 2017
@@ -23,17 +23,19 @@ import java.util.NoSuchElementException;
class _EmptyIterator<T> implements Iterator<T>
{
-
+ @Override
public boolean hasNext()
{
return false;
}
+ @Override
public T next()
{
throw new NoSuchElementException();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();