From b78aa7eb424b455df310dfb88f5c8850bdb5e905 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 12 May 2020 09:50:03 +0200
Subject: [PATCH] Changes getListFromCommaSeparatedStringList to reduce its
 responsibility

---
 .../net/knarcraft/ffmpegconverter/Main.java     |  8 ++++----
 .../ffmpegconverter/utility/ListUtil.java       | 17 +++++++----------
 .../ffmpegconverter/utility/ListUtilTest.java   |  6 +++---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/knarcraft/ffmpegconverter/Main.java b/src/main/java/net/knarcraft/ffmpegconverter/Main.java
index 7c234cc..c902109 100644
--- a/src/main/java/net/knarcraft/ffmpegconverter/Main.java
+++ b/src/main/java/net/knarcraft/ffmpegconverter/Main.java
@@ -111,11 +111,11 @@ class Main {
         String[] subtitleLang = new String[]{"eng", "*"};
         boolean toStereo = true;
         boolean preventSigns = true;
-        if (input.size() > 0 && ListUtil.getListFromCommaSeparatedStringList(input, 0) != null) {
-            audioLang = ListUtil.getListFromCommaSeparatedStringList(input, 0);
+        if (input.size() > 0 && ListUtil.getListFromCommaSeparatedString(input.get(0)) != null) {
+            audioLang = ListUtil.getListFromCommaSeparatedString(input.get(0));
         }
-        if (input.size() > 1 && ListUtil.getListFromCommaSeparatedStringList(input, 1) != null) {
-            subtitleLang = ListUtil.getListFromCommaSeparatedStringList(input, 1);
+        if (input.size() > 1 && ListUtil.getListFromCommaSeparatedString(input.get(1)) != null) {
+            subtitleLang = ListUtil.getListFromCommaSeparatedString(input.get(1));
         }
         if (input.size() > 2) {
             toStereo = Boolean.parseBoolean(input.get(2));
diff --git a/src/main/java/net/knarcraft/ffmpegconverter/utility/ListUtil.java b/src/main/java/net/knarcraft/ffmpegconverter/utility/ListUtil.java
index a945216..6fd361a 100644
--- a/src/main/java/net/knarcraft/ffmpegconverter/utility/ListUtil.java
+++ b/src/main/java/net/knarcraft/ffmpegconverter/utility/ListUtil.java
@@ -65,18 +65,15 @@ public final class ListUtil {
     /**
      * Gets a list from a comma separated string at index in list
      *
-     * @param list  <p>A list of tokens.</p>
-     * @param index <p>The index of the token containing comma separated entries.</p>
+     * @param string <p>A string which may include commas.</p>
      * @return <p>A string list.</p>
      */
-    public static String[] getListFromCommaSeparatedStringList(List<String> list, int index) {
-        String[] result = null;
-        if (list.size() > index) {
-            if (list.get(index).contains(",")) {
-                result = list.get(index).split(",");
-            } else {
-                result = new String[]{list.get(index)};
-            }
+    public static String[] getListFromCommaSeparatedString(String string) {
+        String[] result;
+        if (string.contains(",")) {
+            result = string.split(",");
+        } else {
+            result = new String[]{string};
         }
         return result;
     }
diff --git a/src/test/java/net/knarcraft/ffmpegconverter/utility/ListUtilTest.java b/src/test/java/net/knarcraft/ffmpegconverter/utility/ListUtilTest.java
index e159831..df97a1b 100644
--- a/src/test/java/net/knarcraft/ffmpegconverter/utility/ListUtilTest.java
+++ b/src/test/java/net/knarcraft/ffmpegconverter/utility/ListUtilTest.java
@@ -78,9 +78,9 @@ public class ListUtilTest {
         inputList.add("some test string");
         inputList.add("some,test,string");
         inputList.add("some te,st string");
-        String[] result1 = ListUtil.getListFromCommaSeparatedStringList(inputList, 0);
-        String[] result2 = ListUtil.getListFromCommaSeparatedStringList(inputList, 1);
-        String[] result3 = ListUtil.getListFromCommaSeparatedStringList(inputList, 2);
+        String[] result1 = ListUtil.getListFromCommaSeparatedString(inputList.get(0));
+        String[] result2 = ListUtil.getListFromCommaSeparatedString(inputList.get(1));
+        String[] result3 = ListUtil.getListFromCommaSeparatedString(inputList.get(2));
         assertArrayEquals(new String[]{"some test string"}, result1);
         assertArrayEquals(new String[]{"some", "test", "string"}, result2);
         assertArrayEquals(new String[]{"some te", "st string"}, result3);