Merge 6522e5a6ffdbcb590ca175d06ec69106924d51c7 into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -1,9 +1,11 @@
 package io.zipcoder;
 
-public class MonkeyTypewriter {
-    public static void main(String[] args) {
+
+public class MonkeyTypewriter{
+
+    public static void main(String[] args) throws InterruptedException {
         String introduction = "It was the best of times,\n" +
-                "it was the blurst of times,\n" +
+                "it was the worst of times,\n" +
                 "it was the age of wisdom,\n" +
                 "it was the age of foolishness,\n" +
                 "it was the epoch of belief,\n" +
@@ -20,9 +22,32 @@ public class MonkeyTypewriter {
                 "its noisiest authorities insisted on its being received, for good or for\n" +
                 "evil, in the superlative degree of comparison only.";
 
+
+
         // 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.
+        // A Tale Of Two Cities by Charles Dickens.
+
+        UnsafeCopier notSafe = new UnsafeCopier(introduction);
+        Thread[] notSafeThreads = new Thread[5];
+        for(int i=0; i<notSafeThreads.length; i++){
+            notSafeThreads[i] = new Thread(notSafe);
+            notSafeThreads[i].start();
+        }
+        for(Thread threads: notSafeThreads){
+            threads.join();
+        }
+
+
+        SafeCopier safe = new SafeCopier(introduction);
+        Thread[] safeThread = new Thread[5];
+        for(int i = 0; i<safeThread.length; i++){
+            safeThread[i] = new Thread(safe);
+            safeThread[i].start();
+        }
+        for(Thread threads: safeThread){
+            threads.join();
+       }
 
 
         // This wait is here because main is still a thread and we want the main method to print the finished copies
@@ -34,5 +59,11 @@ public class MonkeyTypewriter {
         }
 
         // Print out the copied versions here.
+        System.out.println(notSafe.copied);
+        System.out.println("____________________________________________");
+        System.out.println(safe.copied);
+
+
     }
+
 }

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

@@ -1,8 +1,29 @@
 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 {
+
+    Lock shared = new ReentrantLock() {
+    };
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+
+    public void run() {
+        shared.lock();
+        while(stringIterator.hasNext()){
+            copied += stringIterator.next() + " ";
+        }
+        shared.unlock();
+
+
+    }
 }

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

@@ -9,6 +9,17 @@ public class UnsafeCopier extends Copier {
         super(toCopy);
     }
 
+
     public void run() {
+        try {
+            Thread.sleep(30);
+        } catch(InterruptedException e) {
+            System.out.println("MAIN INTERRUPTED");
+        }
+        while(stringIterator.hasNext()){
+           copied += stringIterator.next() + " ";
+        }
     }
+
 }
+