Merge 747e3ad9c59b3a53a3a82c3b64ead0197b281f8c into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -23,6 +23,30 @@ 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 monkeyTyping1 = new Thread(unsafeCopier);
+        Thread monkeyTyping2 = new Thread(unsafeCopier);
+        Thread monkeyTyping3 = new Thread(unsafeCopier);
+        Thread monkeyTyping4 = new Thread(unsafeCopier);
+        Thread monkeyTyping5 = new Thread(unsafeCopier);
+        monkeyTyping1.start();
+        monkeyTyping2.start();
+        monkeyTyping3.start();
+        monkeyTyping4.start();
+        monkeyTyping5.start();
+
+        SafeCopier safeCopier = new SafeCopier(introduction);
+        Thread monkeyTyping6 = new Thread(safeCopier);
+        Thread monkeyTyping7 = new Thread(safeCopier);
+        Thread monkeyTyping8 = new Thread(safeCopier);
+        Thread monkeyTyping9 = new Thread(safeCopier);
+        Thread monkeyTyping10 = new Thread(safeCopier);
+        monkeyTyping6.start();
+        monkeyTyping7.start();
+        monkeyTyping8.start();
+        monkeyTyping9.start();
+        monkeyTyping10.start();
+
 
 
         // This wait is here because main is still a thread and we want the main method to print the finished copies
@@ -32,7 +56,10 @@ public class MonkeyTypewriter {
         } catch(InterruptedException e) {
             System.out.println("MAIN INTERRUPTED");
         }
-
         // Print out the copied versions here.
+        System.out.println("UNSAFE\n");
+        System.out.println(unsafeCopier.copied);
+        System.out.println("\nSAFE\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.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);
+
+    }
+    ReentrantLock lock = new ReentrantLock();
+
+
+    public void run() {
+        lock.lock();
+        try{
+        while (stringIterator.hasNext()) {
+            copied += stringIterator.next() + " ";
+        }
+
+        }finally {
+            lock.unlock();
+        }
+    }
 }

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

@@ -7,8 +7,12 @@ public class UnsafeCopier extends Copier {
 
     public UnsafeCopier(String toCopy) {
         super(toCopy);
+
     }
 
     public void run() {
+        while (stringIterator.hasNext()){
+            copied += stringIterator.next() + " ";
+        }
     }
 }