Move cloneMenuCellsList() to MenuReplaceOperation

2 files changed, 13 insertions, 12 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index 11bc93a0f..33f004171 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -32,6 +32,7 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.cloneMenuCellsList;
 import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.isSubMenuCell;
 
 import androidx.annotation.NonNull;
@@ -365,18 +366,6 @@ abstract class BaseMenuManager extends BaseSubManager {
         internalInterface.addOnRPCNotificationListener(FunctionID.ON_COMMAND, commandListener);
     }
 
-    private List<MenuCell> cloneMenuCellsList(List<MenuCell> originalList) {
-        if (originalList == null) {
-            return new ArrayList<>();
-        }
-
-        List<MenuCell> clone = new ArrayList<>();
-        for (MenuCell menuCell : originalList) {
-            clone.add(menuCell.clone());
-        }
-        return clone;
-    }
-
     private boolean callListenerForCells(List<MenuCell> cells, OnCommand command) {
         if (cells == null || cells.isEmpty() || command == null) {
             return false;
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
index d8e4ed635..5db56dec7 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
@@ -288,6 +288,18 @@ class MenuReplaceUtilities {
         return menuCell.getSubCells() != null;
     }
 
+    static List<MenuCell> cloneMenuCellsList(List<MenuCell> originalList) {
+        if (originalList == null) {
+            return new ArrayList<>();
+        }
+
+        List<MenuCell> clone = new ArrayList<>();
+        for (MenuCell menuCell : originalList) {
+            clone.add(menuCell.clone());
+        }
+        return clone;
+    }
+
     static void sendRPCs(final List<RPCRequest> requests, ISdl internalInterface, final SendingRPCsCompletionListener listener) {
         final Map<RPCRequest, String> errors = new HashMap<>();
         if (requests == null || requests.isEmpty()) {