Align method signatures to other libs

Author: Henigan

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java

@@ -195,8 +195,8 @@ public void onExecute() {
             finishOperation(false);
         }
 
-        assignIdsToCells();
-        makeCellsToUploadUnique();
+        assignIdsToCells(this.cellsToUpload);
+        makeCellsToUploadUnique(this.cellsToUpload);
 
         if (this.choiceSet != null) {
             updateChoiceSet(this.choiceSet, this.loadedCells, new HashSet<>(this.cellsToUpload));
@@ -538,7 +538,7 @@ PerformInteraction getPerformInteraction() {
         return pi;
     }
 
-    private void assignIdsToCells() {
+    private void assignIdsToCells(ArrayList<ChoiceCell> cells) {
         ArrayList<Integer> usedIds = new ArrayList<>();
         for (ChoiceCell cell : loadedCells) {
             usedIds.add(cell.getChoiceId());
@@ -547,9 +547,9 @@ private void assignIdsToCells() {
         ArrayList<Integer> sortedUsedIds = (ArrayList<Integer>) usedIds.clone();
 
         //Loop through the cells we need ids for. Get and assign those ids
-        for (int i = 0; i < this.cellsToUpload.size(); i++) {
+        for (int i = 0; i < cells.size(); i++) {
             int cellId = nextChoiceIdBasedOnUsedIds(sortedUsedIds);
-            this.cellsToUpload.get(i).setChoiceId(cellId);
+            cells.get(i).setChoiceId(cellId);
 
             //Insert the ids into the usedIds sorted array in the correct position
             for (int j = 0; j < sortedUsedIds.size(); j++) {
@@ -610,12 +610,12 @@ private int nextChoiceIdBasedOnUsedIds(ArrayList<Integer> usedIds) {
     }
 
     // Choice Uniqueness
-    void makeCellsToUploadUnique() {
-        if (this.cellsToUpload.size() == 0) {
+    void makeCellsToUploadUnique(ArrayList<ChoiceCell> cellsToUpload) {
+        if (cellsToUpload.size() == 0) {
             return;
         }
 
-        ArrayList<ChoiceCell> strippedCellsToUpload = cloneChoiceCellList(this.cellsToUpload);
+        ArrayList<ChoiceCell> strippedCellsToUpload = cloneChoiceCellList(cellsToUpload);
         ArrayList<ChoiceCell> strippedLoadedCells = cloneChoiceCellList(new ArrayList<>(loadedCells));
         boolean supportsChoiceUniqueness = !(sdlMsgVersion.getMajorVersion() < 7 || (sdlMsgVersion.getMajorVersion() == 7 && sdlMsgVersion.getMinorVersion() == 0));
         if (supportsChoiceUniqueness) {
@@ -624,7 +624,7 @@ void makeCellsToUploadUnique() {
         }
 
         addUniqueNamesToCells(strippedCellsToUpload, strippedLoadedCells, supportsChoiceUniqueness);
-        transferUniqueNamesFromCells(strippedCellsToUpload, this.cellsToUpload);
+        transferUniqueNamesFromCells(strippedCellsToUpload, cellsToUpload);
     }
 
     private void updateChoiceSet(ChoiceSet choiceSet, HashSet<ChoiceCell> loadedCells, HashSet<ChoiceCell> cellsToUpload) {