Merge 3ef00aae720ea1dccee3090f6082aa32ebcb8b9b into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -23,6 +23,23 @@ public class MonkeyTypewriter {
         // Do all of the Monkey / Thread building here
         // For each Copier(one safe and one unsafe), create and start 5 monkeys copying the introduction to
         // A Tale Of Two Cities.
+        UnsafeCopier unsafeCopier = new UnsafeCopier(introduction);
+        Thread[] unsafeArray = new Thread[5];
+        for (int i =0; i < unsafeArray.length; i++){
+            unsafeArray[i] = new Thread(unsafeCopier);
+        }
+        for (Thread thread: unsafeArray) {
+            thread.start();
+        }
+
+        SafeCopier safeCopier = new SafeCopier(introduction);
+        Thread[] safeArray = new Thread[5];
+        for (int i = 0; i < safeArray.length; i++){
+            safeArray[i] = new Thread(safeCopier);
+        }
+        for (Thread thread: safeArray){
+            thread.start();
+        }
 
 
         // This wait is here because main is still a thread and we want the main method to print the finished copies
@@ -34,5 +51,8 @@ public class MonkeyTypewriter {
         }
 
         // Print out the copied versions here.
+        System.out.println(unsafeCopier.copied);
+        System.out.println("\n\n\n");
+        System.out.println(safeCopier.copied);
     }
 }

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

@@ -1,8 +1,28 @@
 package io.zipcoder;
 
+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 {
+public class SafeCopier extends Copier {
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+
+    private Lock lock = new ReentrantLock();
+
+    public void run() {
+        while (stringIterator.hasNext()) {
+            lock.lock();
+            if (stringIterator.hasNext()) {
+                String word = stringIterator.next();
+                copied += word + " ";
+            }
+            lock.unlock();
+        }
+    }
 }

src/main/java/io/zipcoder/UnsafeCopier.java

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.NoSuchElementException;
+
 /**
  * Modify the run function so that the monkeys each grab the next word and write it to the copy.
  */
@@ -10,5 +12,11 @@ public class UnsafeCopier extends Copier {
     }
 
     public void run() {
+        try {
+            while (stringIterator.hasNext()) {
+                String word = stringIterator.next();
+                copied += word + " ";
+            }
+        } catch (NoSuchElementException e) { }
     }
 }