You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/09/01 11:19:56 UTC
svn commit: r809919 - in /incubator/pivot/trunk/core/src/org/apache/pivot:
beans/BeanDictionary.java collections/adapter/ListAdapter.java
collections/adapter/MapAdapter.java collections/adapter/SetAdapter.java
Author: smartini
Date: Tue Sep 1 09:19:56 2009
New Revision: 809919
URL: http://svn.apache.org/viewvc?rev=809919&view=rev
Log:
add some missing override, in some cases on methods of inner classes (not shown in eclipse warnings)
Modified:
incubator/pivot/trunk/core/src/org/apache/pivot/beans/BeanDictionary.java
incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java
incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java
incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/beans/BeanDictionary.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/beans/BeanDictionary.java?rev=809919&r1=809918&r2=809919&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/beans/BeanDictionary.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/beans/BeanDictionary.java Tue Sep 1 09:19:56 2009
@@ -55,10 +55,12 @@
nextProperty();
}
+ @Override
public boolean hasNext() {
return (nextProperty != null);
}
+ @Override
public String next() {
if (!hasNext()) {
throw new NoSuchElementException();
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java?rev=809919&r1=809918&r2=809919&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/ListAdapter.java Tue Sep 1 09:19:56 2009
@@ -52,6 +52,7 @@
return list;
}
+ @Override
public int add(T item) {
int index = -1;
@@ -72,6 +73,7 @@
return index;
}
+ @Override
public void insert(T item, int index) {
if (comparator != null
&& Collections.binarySearch(list, item, comparator) != -(index + 1)) {
@@ -82,6 +84,7 @@
listListeners.itemInserted(this, index);
}
+ @Override
public T update(int index, T item) {
if (comparator != null
&& Collections.binarySearch(list, item, comparator) != index) {
@@ -98,6 +101,7 @@
return previousItem;
}
+ @Override
public int remove(T item) {
int index = indexOf(item);
if (index == -1) {
@@ -110,6 +114,7 @@
}
@SuppressWarnings("unchecked")
+ @Override
public Sequence<T> remove(int index, int count) {
java.util.List<T> removedList = null;
try {
@@ -133,6 +138,7 @@
return removed;
}
+ @Override
public void clear() {
if (getLength() > 0) {
list.clear();
@@ -140,22 +146,27 @@
}
}
+ @Override
public T get(int index) {
return list.get(index);
}
+ @Override
public int indexOf(T item) {
return list.indexOf(item);
}
+ @Override
public int getLength() {
return list.size();
}
+ @Override
public Comparator<T> getComparator() {
return comparator;
}
+ @Override
public void setComparator(Comparator<T> comparator) {
Comparator<T> previousComparator = this.comparator;
@@ -170,14 +181,17 @@
}
}
+ @Override
public Iterator<T> iterator() {
return new ImmutableIterator<T>(list.iterator());
}
+ @Override
public ListenerList<ListListener<T>> getListListeners() {
return listListeners;
}
+ @Override
public String toString() {
return list.toString();
}
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java?rev=809919&r1=809918&r2=809919&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/MapAdapter.java Tue Sep 1 09:19:56 2009
@@ -50,10 +50,12 @@
return map;
}
+ @Override
public V get(K key) {
return map.get(key);
}
+ @Override
public V put(K key, V value) {
boolean update = containsKey(key);
V previousValue = map.put(key, value);
@@ -67,6 +69,7 @@
return previousValue;
}
+ @Override
public V remove(K key) {
V value = null;
@@ -78,6 +81,7 @@
return value;
}
+ @Override
public void clear() {
if (!isEmpty()) {
map.clear();
@@ -85,19 +89,23 @@
}
}
+ @Override
public boolean containsKey(K key) {
return map.containsKey(key);
}
+ @Override
public boolean isEmpty() {
return map.isEmpty();
}
+ @Override
public int getCount() {
return map.size();
}
@SuppressWarnings("unchecked")
+ @Override
public Comparator<K> getComparator() {
if (this.map instanceof SortedMap) {
return ((SortedMap) this.map).comparator();
@@ -106,6 +114,7 @@
}
@SuppressWarnings("unchecked")
+ @Override
public void setComparator(Comparator<K> comparator) {
// If the adapted map supports it, implement setComparator by
// constructing a new map
@@ -134,14 +143,17 @@
throw new UnsupportedOperationException();
}
+ @Override
public Iterator<K> iterator() {
return new ImmutableIterator<K>(map.keySet().iterator());
}
+ @Override
public ListenerList<MapListener<K, V>> getMapListeners() {
return mapListeners;
}
+ @Override
public String toString() {
return map.toString();
}
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java?rev=809919&r1=809918&r2=809919&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/adapter/SetAdapter.java Tue Sep 1 09:19:56 2009
@@ -49,6 +49,7 @@
return set;
}
+ @Override
public boolean add(E element) {
boolean added = false;
@@ -62,6 +63,7 @@
return added;
}
+ @Override
public boolean remove(E element) {
boolean removed = false;
@@ -75,6 +77,7 @@
return removed;
}
+ @Override
public void clear() {
if (!isEmpty()) {
set.clear();
@@ -82,19 +85,23 @@
}
}
+ @Override
public boolean contains(E element) {
return set.contains(element);
}
+ @Override
public boolean isEmpty() {
return set.isEmpty();
}
+ @Override
public int getCount() {
return set.size();
}
@SuppressWarnings("unchecked")
+ @Override
public Comparator<E> getComparator() {
if (this.set instanceof java.util.SortedSet) {
return ((java.util.SortedSet) this.set).comparator();
@@ -103,6 +110,7 @@
}
@SuppressWarnings("unchecked")
+ @Override
public void setComparator(Comparator<E> comparator) {
// If the adapted set supports it, implement setComparator by
// constructing a new set
@@ -131,14 +139,17 @@
throw new UnsupportedOperationException();
}
+ @Override
public Iterator<E> iterator() {
return new ImmutableIterator<E>(set.iterator());
}
+ @Override
public ListenerList<SetListener<E>> getSetListeners() {
return setListeners;
}
+ @Override
public String toString() {
return set.toString();
}