Merge remote-tracking branch 'upstream/master'

1 files changed, 16 insertions, 5 deletions

diff --git a/challenge-186/ziameraj16/java/ZipList.java b/challenge-186/ziameraj16/java/ZipList.java
index 289e9c7507..8c54c048dc 100755
--- a/challenge-186/ziameraj16/java/ZipList.java
+++ b/challenge-186/ziameraj16/java/ZipList.java
@@ -1,13 +1,24 @@
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Scanner;
 
 public class ZipList {
 
     public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
-        System.out.println("Enter Mac address");
-        String macAddress = scanner.nextLine();
-        System.out.println(String.format("%s:%s:%s:%s:%s:%s", macAddress.substring(0, 2)
-                , macAddress.substring(2, 4), macAddress.substring(5, 7), macAddress.substring(7, 9)
-                , macAddress.substring(10, 12), macAddress.substring(12)));
+        System.out.println("Enter first comma separated list");
+        String[] arr1 = scanner.nextLine().split(",");
+        System.out.println("Enter second comma separated list");
+        String[] arr2 = scanner.nextLine().split(",");
+        List<String> mergedList1 = new ArrayList<>(arr1.length*2);
+        List<String> mergedList2 = new ArrayList<>(arr1.length*2);
+        for (int i = 0; i < arr1.length; i++) {
+            mergedList1.add(arr1[i]);
+            mergedList1.add(arr2[i]);
+            mergedList2.add(arr2[i]);
+            mergedList2.add(arr1[i]);
+        }
+        System.out.println("zip(@a, @b)" + mergedList1);
+        System.out.print("zip(@b, @a)" + mergedList2);
     }
 }