refactor: Refactor MarkerModifier to use a withLock method

This commit refactors the `MarkerModifier` class to use a `withLock` method. This reduces code repetition and improves readability.

Author: dkhawk

library/src/main/java/com/google/maps/android/clustering/view/ClusterRendererMultipleItems.java

@@ -117,6 +117,11 @@ public void setAnimationType(AnimationType type) {
         };
     }
 
+    /**
+     * Sets the interpolator for the animation.
+     *
+     * @param interpolator the interpolator to use for the animation.
+     */
     public void setAnimationInterpolator(TimeInterpolator interpolator) {
         animationInterp = interpolator;
     }
@@ -665,6 +670,15 @@ private class MarkerModifier extends Handler implements MessageQueue.IdleHandler
          */
         private boolean mListenerAdded;
 
+        private void withLock(Runnable runnable) {
+            lock.lock();
+            try {
+                runnable.run();
+            } finally {
+                lock.unlock();
+            }
+        }
+
         private MarkerModifier() {
             super(Looper.getMainLooper());
         }
@@ -675,17 +689,14 @@ private MarkerModifier() {
          * @param priority whether this operation should have priority.
          */
         public void add(boolean priority, CreateMarkerTask c) {
-            lock.lock();
-            try {
+            withLock(() -> {
                 sendEmptyMessage(BLANK);
                 if (priority) {
                     mOnScreenCreateMarkerTasks.add(c);
                 } else {
                     mCreateMarkerTasks.add(c);
                 }
-            } finally {
-                lock.unlock();
-            }
+            });
         }
 
         /**
@@ -695,17 +706,14 @@ public void add(boolean priority, CreateMarkerTask c) {
          * @param m        the markerWithPosition to remove.
          */
         public void remove(boolean priority, Marker m) {
-            lock.lock();
-            try {
+            withLock(() -> {
                 sendEmptyMessage(BLANK);
                 if (priority) {
                     mOnScreenRemoveMarkerTasks.add(m);
                 } else {
                     mRemoveMarkerTasks.add(m);
                 }
-            } finally {
-                lock.unlock();
-            }
+            });
         }
 
         /**
@@ -716,8 +724,7 @@ public void remove(boolean priority, Marker m) {
          * @param to     the position to animate to.
          */
         public void animate(MarkerWithPosition marker, LatLng from, LatLng to) {
-            lock.lock();
-            try {
+            withLock(() -> {
                 AnimationTask task = new AnimationTask(marker, from, to, lock);
 
                 for (AnimationTask existingTask : ongoingAnimations) {
@@ -729,9 +736,7 @@ public void animate(MarkerWithPosition marker, LatLng from, LatLng to) {
 
                 mAnimationTasks.add(task);
                 ongoingAnimations.add(task);
-            } finally {
-                lock.unlock();
-            }
+            });
         }
 
         /**
@@ -743,8 +748,7 @@ public void animate(MarkerWithPosition marker, LatLng from, LatLng to) {
          * @param to     the position to animate to.
          */
         public void animateThenRemove(MarkerWithPosition marker, LatLng from, LatLng to) {
-            lock.lock();
-            try {
+            withLock(() -> {
                 AnimationTask animationTask = new AnimationTask(marker, from, to, lock);
                 for (AnimationTask existingTask : ongoingAnimations) {
                     if (existingTask.marker.getId().equals(animationTask.marker.getId())) {
@@ -756,9 +760,7 @@ public void animateThenRemove(MarkerWithPosition marker, LatLng from, LatLng to)
                 ongoingAnimations.add(animationTask);
                 animationTask.removeOnAnimationComplete(mClusterManager.getMarkerManager());
                 mAnimationTasks.add(animationTask);
-            } finally {
-                lock.unlock();
-            }
+            });
         }
 
         @Override