From 662a4955615d201f6d1525dcbf3cc08da3d546b4 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Sun, 9 Dec 2018 13:30:18 +0200 Subject: [docs] EnterIdle -> BecomeIdle --- .../mapbox/mapboxsdk/maps/MapChangeReceiver.java | 22 ++++++++--------- .../java/com/mapbox/mapboxsdk/maps/MapView.java | 14 +++++------ .../com/mapbox/mapboxsdk/maps/NativeMapView.java | 6 ++--- .../mapboxsdk/maps/MapChangeReceiverTest.java | 28 +++++++++++----------- 4 files changed, 35 insertions(+), 35 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK') diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java index f569ae3af9..7eebd27d62 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapChangeReceiver.java @@ -26,7 +26,7 @@ class MapChangeReceiver implements NativeMapView.StateCallback { = new CopyOnWriteArrayList<>(); private final List onDidFinishRenderingMapListenerList = new CopyOnWriteArrayList<>(); - private final List onDidEnterIdleListenerList + private final List onDidBecomeIdleListenerList = new CopyOnWriteArrayList<>(); private final List onDidFinishLoadingStyleListenerList = new CopyOnWriteArrayList<>(); @@ -173,15 +173,15 @@ class MapChangeReceiver implements NativeMapView.StateCallback { } @Override - public void onDidEnterIdle() { + public void onDidBecomeIdle() { try { - if (!onDidEnterIdleListenerList.isEmpty()) { - for (MapView.OnDidEnterIdleListener listener : onDidEnterIdleListenerList) { - listener.onDidEnterIdle(); + if (!onDidBecomeIdleListenerList.isEmpty()) { + for (MapView.OnDidBecomeIdleListener listener : onDidBecomeIdleListenerList) { + listener.onDidBecomeIdle(); } } } catch (Throwable err) { - Logger.e(TAG, "Exception in onDidEnterIdle", err); + Logger.e(TAG, "Exception in onDidBecomeIdle", err); throw err; } } @@ -294,12 +294,12 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onDidFinishRenderingMapListenerList.remove(listener); } - void addOnDidEnterIdleListener(MapView.OnDidEnterIdleListener listener) { - onDidEnterIdleListenerList.add(listener); + void addOnDidBecomeIdleListener(MapView.OnDidBecomeIdleListener listener) { + onDidBecomeIdleListenerList.add(listener); } - void removeOnDidEnterIdleListener(MapView.OnDidEnterIdleListener listener) { - onDidEnterIdleListenerList.remove(listener); + void removeOnDidBecomeIdleListener(MapView.OnDidBecomeIdleListener listener) { + onDidBecomeIdleListenerList.remove(listener); } void addOnDidFinishLoadingStyleListener(MapView.OnDidFinishLoadingStyleListener listener) { @@ -329,7 +329,7 @@ class MapChangeReceiver implements NativeMapView.StateCallback { onDidFinishRenderingFrameList.clear(); onWillStartRenderingMapListenerList.clear(); onDidFinishRenderingMapListenerList.clear(); - onDidEnterIdleListenerList.clear(); + onDidBecomeIdleListenerList.clear(); onDidFinishLoadingStyleListenerList.clear(); onSourceChangedListenerList.clear(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 8a29ae8070..83948efe4c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -702,8 +702,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { * * @param listener The callback that's invoked when the map has entered the idle state. */ - public void addOnDidEnterIdleListener(OnDidEnterIdleListener listener) { - mapChangeReceiver.addOnDidEnterIdleListener(listener); + public void addOnDidBecomeIdleListener(OnDidBecomeIdleListener listener) { + mapChangeReceiver.addOnDidBecomeIdleListener(listener); } /** @@ -711,8 +711,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { * * @param listener The callback that's invoked when the map has entered the idle state. */ - public void removeOnDidEnterIdleListener(OnDidEnterIdleListener listener) { - mapChangeReceiver.removeOnDidEnterIdleListener(listener); + public void removeOnDidBecomeIdleListener(OnDidBecomeIdleListener listener) { + mapChangeReceiver.removeOnDidBecomeIdleListener(listener); } /** @@ -893,14 +893,14 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { /** * Interface definition for a callback to be invoked when the map has entered the idle state. *

- * {@link MapView#addOnDidEnterIdleListener(OnDidEnterIdleListener)} + * {@link MapView#addOnDidBecomeIdleListener(OnDidBecomeIdleListener)} *

*/ - public interface OnDidEnterIdleListener { + public interface OnDidBecomeIdleListener { /** * Called when the map has entered the idle state. */ - void onDidEnterIdle(); + void onDidBecomeIdle(); } /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 59840f5bf3..b0137615d0 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -1010,8 +1010,8 @@ final class NativeMapView { } @Keep - private void onDidEnterIdle() { - stateCallback.onDidEnterIdle(); + private void onDidBecomeIdle() { + stateCallback.onDidBecomeIdle(); } @Keep @@ -1477,7 +1477,7 @@ final class NativeMapView { void onDidFinishRenderingMap(boolean fully); - void onDidEnterIdle(); + void onDidBecomeIdle(); void onSourceChanged(String sourceId); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java index 848cf4a804..025f06752c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapChangeReceiverTest.java @@ -56,7 +56,7 @@ public class MapChangeReceiverTest { private MapView.OnDidFinishRenderingMapListener onDidFinishRenderingMapListener; @Mock - private MapView.OnDidEnterIdleListener onDidEnterIdleListener; + private MapView.OnDidBecomeIdleListener onDidBecomeIdleListener; @Mock private MapView.OnDidFinishLoadingStyleListener onDidFinishLoadingStyleListener; @@ -495,29 +495,29 @@ public class MapChangeReceiverTest { } @Test - public void testOnDidEnterIdleListener() { - mapChangeEventManager.addOnDidEnterIdleListener(onDidEnterIdleListener); - mapChangeEventManager.onDidEnterIdle(); - verify(onDidEnterIdleListener).onDidEnterIdle(); - mapChangeEventManager.removeOnDidEnterIdleListener(onDidEnterIdleListener); - mapChangeEventManager.onDidEnterIdle(); - verify(onDidEnterIdleListener).onDidEnterIdle(); - - mapChangeEventManager.addOnDidEnterIdleListener(onDidEnterIdleListener); + public void testOnDidBecomeIdleListener() { + mapChangeEventManager.addOnDidBecomeIdleListener(onDidBecomeIdleListener); + mapChangeEventManager.onDidBecomeIdle(); + verify(onDidBecomeIdleListener).onDidBecomeIdle(); + mapChangeEventManager.removeOnDidBecomeIdleListener(onDidBecomeIdleListener); + mapChangeEventManager.onDidBecomeIdle(); + verify(onDidBecomeIdleListener).onDidBecomeIdle(); + + mapChangeEventManager.addOnDidBecomeIdleListener(onDidBecomeIdleListener); Logger.setLoggerDefinition(loggerDefinition); Exception exc = new RuntimeException(); - doThrow(exc).when(onDidEnterIdleListener).onDidEnterIdle(); + doThrow(exc).when(onDidBecomeIdleListener).onDidBecomeIdle(); try { - mapChangeEventManager.onDidEnterIdle(); + mapChangeEventManager.onDidBecomeIdle(); Assert.fail("The exception should've been re-thrown."); } catch (RuntimeException throwable) { verify(loggerDefinition).e(anyString(), anyString(), eq(exc)); } Error err = new ExecutionError("", new Error()); - doThrow(err).when(onDidEnterIdleListener).onDidEnterIdle(); + doThrow(err).when(onDidBecomeIdleListener).onDidBecomeIdle(); try { - mapChangeEventManager.onDidEnterIdle(); + mapChangeEventManager.onDidBecomeIdle(); Assert.fail("The exception should've been re-thrown."); } catch (ExecutionError throwable) { verify(loggerDefinition).e(anyString(), anyString(), eq(err)); -- cgit v1.2.1