Merge c5f539f73081d5823cc3a034ac96a0c730bdff8d into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

src/main/java/io/zipcoder/Copier.java

@@ -18,4 +18,5 @@ public abstract class Copier implements Runnable {
     }
 
     public abstract void run();
+
 }

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

@@ -1,7 +1,7 @@
 package io.zipcoder;
 
 public class MonkeyTypewriter {
-    public static void main(String[] args) {
+    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 age of wisdom,\n" +
@@ -19,11 +19,27 @@ public class MonkeyTypewriter {
                 "in short, the period was so far like the present period, that some of\n" +
                 "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.
-
+        //unsafe threads
+        UnsafeCopier unsafeCopier = new UnsafeCopier(introduction);
+        Thread[] thread = new Thread[5];
+        for (int i = 0; i < thread.length; i++){
+            thread[i] = new Thread(unsafeCopier);
+            thread[i].start();
+        }
+        //make sure the background thread is run after the threads do their jobs first
+//        for (Thread threads : thread){
+//            threads.join();
+//        }
+        //safe
+        SafeCopier safeCopier = new SafeCopier(introduction);
+        Thread[] safeThread = new Thread[5];
+        for (int i = 0; i < safeThread.length; i++){
+            safeThread[i] = new Thread(safeCopier);
+            safeThread[i].start();
+        }
+//        for (Thread safetyThreads : safeThread){
+//            safetyThreads.join();
+//        }
 
         // 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.
@@ -32,7 +48,9 @@ public class MonkeyTypewriter {
         } catch(InterruptedException e) {
             System.out.println("MAIN INTERRUPTED");
         }
-
         // Print out the copied versions here.
+        System.out.println("Unsafe Monkeys: " + "\n" + unsafeCopier.copied);
+        System.out.println("----------------------------------------------");
+        System.out.println("Safe Monkeys: " + "\n" + safeCopier.copied);
     }
 }

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

@@ -1,8 +1,25 @@
 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 lock = new ReentrantLock();
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+
+    public void run() {
+        while(stringIterator.hasNext()) {
+            syncro();
+        }
+    }
+    private synchronized void syncro() {
+             this.copied += stringIterator.next() + " " + Thread.currentThread().getName();
+    }
 }

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

@@ -3,12 +3,15 @@ package io.zipcoder;
 /**
  * Modify the run function so that the monkeys each grab the next word and write it to the copy.
  */
-public class UnsafeCopier extends Copier {
+public class UnsafeCopier extends Copier implements Runnable {
 
     public UnsafeCopier(String toCopy) {
         super(toCopy);
     }
 
     public void run() {
+        while (stringIterator.hasNext()){
+            copied += stringIterator.next() + " ";
+        }
     }
 }