From 609194fae2332e6f2ccd7a4464bfa492ad661a6f Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 1 Jan 2018 02:06:37 -0600
Subject: Serviceless rewrite, part 1

Signed-off-by: Samuel Holland <samuel@sholland.org>
---
 .../android/databinding/ObservableTreeMap.java          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java')

diff --git a/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
index dc5f705b..074e122c 100644
--- a/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
+++ b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java
@@ -12,15 +12,9 @@ import java.util.TreeMap;
  * views. This behavior is in line with that of ObservableArrayMap.
  */
 
-public class ObservableTreeMap<K, V> extends TreeMap<K, V> implements ObservableSortedMap<K, V> {
+public class ObservableTreeMap<K, V> extends TreeMap<K, V> implements ObservableNavigableMap<K, V> {
     private transient MapChangeRegistry listeners;
 
-    @Override
-    public void clear() {
-        super.clear();
-        notifyChange(null);
-    }
-
     @Override
     public void addOnMapChangedCallback(
             final OnMapChangedCallback<? extends ObservableMap<K, V>, K, V> listener) {
@@ -29,6 +23,12 @@ public class ObservableTreeMap<K, V> extends TreeMap<K, V> implements Observable
         listeners.add(listener);
     }
 
+    @Override
+    public void clear() {
+        super.clear();
+        notifyChange(null);
+    }
+
     private void notifyChange(final K key) {
         if (listeners != null)
             listeners.notifyChange(this, key);
@@ -51,8 +51,7 @@ public class ObservableTreeMap<K, V> extends TreeMap<K, V> implements Observable
     @Override
     public V remove(final Object key) {
         final V oldValue = super.remove(key);
-        @SuppressWarnings("unchecked")
-        final K k = (K) key;
+        @SuppressWarnings("unchecked") final K k = (K) key;
         notifyChange(k);
         return oldValue;
     }
-- 
cgit v1.3-18-gd494