Completed Lab Update

src/main/java/io/zipcoder/MonkeyTypewriter.java

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.ArrayList;
+
 public class MonkeyTypewriter {
     public static void main(String[] args) {
         String introduction = "It was the best of times,\n" +
@@ -38,6 +40,8 @@ public class MonkeyTypewriter {
         monkey5.start();
 
         SafeCopier safeCopier = new SafeCopier(introduction);
+
+        ArrayList<Thread>monkeys = new ArrayList<Thread>();
         Thread monkeySafe1 = new Thread(safeCopier);
         Thread monkeySafe2 = new Thread(safeCopier);
         Thread monkeySafe3 = new Thread(safeCopier);
@@ -51,6 +55,7 @@ public class MonkeyTypewriter {
         monkeySafe5.start();
 
 
+
         // This wait is here because main is still a thread and we want the main method to print the finished copies
         // after enough time has passed.
         try {
@@ -64,5 +69,6 @@ public class MonkeyTypewriter {
         System.out.println(unsafeCopier.copied);
         System.out.println("----------Safe----------");
         System.out.println(safeCopier.copied);
+
     }
 }

src/main/java/io/zipcoder/SafeCopier.java

@@ -1,18 +1,35 @@
 package io.zipcoder;
 
 
+import java.util.NoSuchElementException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * Make this extend the Copier like `UnsafeCopier`, except use locks to make sure that the actual intro gets printed
  * correctly every time.  Make the run method thread safe.
  */
 public class SafeCopier extends Copier {
+
+    Lock lock = new ReentrantLock();
+
     public SafeCopier(String toCopy) {
         super(toCopy);
     }
 
-    public synchronized void run() {
-        while (stringIterator.hasNext()) {
-            copied += stringIterator.next() + " ";
+    public void run() {
+            while (stringIterator.hasNext()) {
+                lock.lock();
+                try {
+                    copied += stringIterator.next() + " ";
+                }
+                catch(NoSuchElementException e){
+
+                }
+                finally {
+                    lock.unlock();
+                }
+            }
+
         }
-    }
-}
+    }