Keyed...: Rename all the things
Hooray for diamond interface inheritance. Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
+2
-2
@@ -14,8 +14,8 @@ import java.util.Objects;
|
||||
* operations, require O(n) time.
|
||||
*/
|
||||
|
||||
public class KeyedObservableArrayList<K, E extends Keyed<? extends K>>
|
||||
extends ObservableArrayList<E> implements KeyedObservableList<K, E> {
|
||||
public class ObservableKeyedArrayList<K, E extends Keyed<? extends K>>
|
||||
extends ObservableArrayList<E> implements ObservableKeyedList<K, E> {
|
||||
@Override
|
||||
public boolean add(final E e) {
|
||||
if (e == null)
|
||||
+1
-1
@@ -6,6 +6,6 @@ import android.databinding.ObservableList;
|
||||
* A list that is both keyed and observable.
|
||||
*/
|
||||
|
||||
public interface KeyedObservableList<K, E extends Keyed<? extends K>>
|
||||
public interface ObservableKeyedList<K, E extends Keyed<? extends K>>
|
||||
extends KeyedList<K, E>, ObservableList<E> {
|
||||
}
|
||||
+4
-5
@@ -14,9 +14,8 @@ import java.util.List;
|
||||
* key still require O(n) time.
|
||||
*/
|
||||
|
||||
public class SortedKeyedObservableArrayList<K extends Comparable<? super K>,
|
||||
E extends Keyed<? extends K>> extends KeyedObservableArrayList<K, E> {
|
||||
|
||||
public class ObservableSortedKeyedArrayList<K extends Comparable<? super K>,
|
||||
E extends Keyed<? extends K>> extends ObservableKeyedArrayList<K, E> {
|
||||
private final transient List<K> keyList = new KeyList<>(this);
|
||||
|
||||
@Override
|
||||
@@ -87,9 +86,9 @@ public class SortedKeyedObservableArrayList<K extends Comparable<? super K>,
|
||||
|
||||
private static final class KeyList<K extends Comparable<? super K>,
|
||||
E extends Keyed<? extends K>> extends AbstractList<K> {
|
||||
private final SortedKeyedObservableArrayList<K, E> list;
|
||||
private final ObservableSortedKeyedArrayList<K, E> list;
|
||||
|
||||
private KeyList(final SortedKeyedObservableArrayList<K, E> list) {
|
||||
private KeyList(final ObservableSortedKeyedArrayList<K, E> list) {
|
||||
this.list = list;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user