Merge 893724fffedb53603a963bb666676bcb71a4bc60 into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -24,6 +24,37 @@ public class MonkeyTypewriter {
         // 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 monkeyUnsafe1 = new Thread(unsafeCopier);
+        Thread monkeyUnsafe2 = new Thread(unsafeCopier);
+        Thread monkeyUnsafe3 = new Thread(unsafeCopier);
+        Thread monkeyUnsafe4 = new Thread(unsafeCopier);
+        Thread monkeyUnsafe5 = new Thread(unsafeCopier);
+
+        monkeyUnsafe1.start();
+        monkeyUnsafe2.start();
+        monkeyUnsafe3.start();
+        monkeyUnsafe4.start();
+        monkeyUnsafe5.start();
+
+        // creating new safeCopier object & passing string introduction as a parameter
+
+        SafeCopier safeCopier = new SafeCopier(introduction);
+
+        // creating 5 safe threads and passing the safe copier obj into their constructors
+        Thread monkeySafe1 = new Thread(safeCopier);
+        Thread monkeySafe2 = new Thread(safeCopier);
+        Thread monkeySafe3 = new Thread(safeCopier);
+        Thread monkeySafe4 = new Thread(safeCopier);
+        Thread monkeySafe5 = new Thread(safeCopier);
+
+        // we are starting the threads
+        monkeySafe1.start();
+        monkeySafe2.start();
+        monkeySafe3.start();
+        monkeySafe4.start();
+        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.
@@ -34,5 +65,10 @@ public class MonkeyTypewriter {
         }
 
         // 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,39 @@
 package io.zipcoder;
 
+import java.util.NoSuchElementException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+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 sharedLock = new ReentrantLock();
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+
+    public void run() {
+        try{
+            TimeUnit.MILLISECONDS.sleep(1000);
+        } catch (InterruptedException e){
+            e.printStackTrace();
+        }
+
+        while (stringIterator.hasNext()) {
+            sharedLock.lock();
+            try {
+                copied += stringIterator.next() + " " + Thread.currentThread().getName();
+            } catch (NoSuchElementException e) {
+
+            } finally {
+                sharedLock.unlock();
+            }
+        }
+    }
 }

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

@@ -6,9 +6,14 @@ package io.zipcoder;
 public class UnsafeCopier extends Copier {
 
     public UnsafeCopier(String toCopy) {
+
         super(toCopy);
     }
 
     public void run() {
+        while(stringIterator.hasNext()){
+            copied += stringIterator.next() + " ";
+        }
+
     }
 }