Keyed...: Rename all the things

Hooray for diamond interface inheritance.

Signed-off-by: Samuel Holland <samuel@sholland.org>

3 files changed, 7 insertions, 8 deletions

diff --git a/app/src/main/java/com/wireguard/android/util/KeyedObservableArrayList.java b/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java
index 101f0ba7..6ba76207 100644
--- a/app/src/main/java/com/wireguard/android/util/KeyedObservableArrayList.java
+++ b/app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java
@@ -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)
diff --git a/app/src/main/java/com/wireguard/android/util/KeyedObservableList.java b/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java
index 15df0bba..af9fd34d 100644
--- a/app/src/main/java/com/wireguard/android/util/KeyedObservableList.java
+++ b/app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java
@@ -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> {
 }
diff --git a/app/src/main/java/com/wireguard/android/util/SortedKeyedObservableArrayList.java b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
index 21fcccd3..9ccc1c10 100644
--- a/app/src/main/java/com/wireguard/android/util/SortedKeyedObservableArrayList.java
+++ b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
@@ -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;
         }