Merge 95154666bd519cd95a63dfec5d0adc80bad0da81 into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

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

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
 public class MonkeyTypewriter {
     public static void main(String[] args) {
         String introduction = "It was the best of times,\n" +
@@ -24,9 +26,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.
 
+        //creation of unsafe threads with the object being passed into; additionally starting threads
+        UnsafeCopier unsafeCopier = new UnsafeCopier(introduction);
+
+        Thread UnsafeMonkeys1 = new Thread(unsafeCopier);
+        Thread UnsafeMonkeys2 = new Thread(unsafeCopier);
+        Thread UnsafeMonkeys3 = new Thread(unsafeCopier);
+        Thread UnsafeMonkeys4 = new Thread(unsafeCopier);
+        Thread UnsafeMonkeys5 = new Thread(unsafeCopier);
+
+      UnsafeMonkeys1.start();
+      UnsafeMonkeys2.start();
+      UnsafeMonkeys3.start();
+      UnsafeMonkeys4.start();
+      UnsafeMonkeys5.start();
+
+        SafeCopier safeCopier = new SafeCopier(introduction);
+        Thread SafeMonkeys1 = new Thread(safeCopier);
+        Thread SafeMonkeys2 = new Thread(safeCopier);
+        Thread SafeMonkeys3 = new Thread(safeCopier);
+        Thread SafeMonkeys4 = new Thread(safeCopier);
+        Thread SafeMonkeys5 = new Thread(safeCopier);
+
+        SafeMonkeys1.start();
+        SafeMonkeys2.start();
+        SafeMonkeys3.start();
+        SafeMonkeys4.start();
+        SafeMonkeys5.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.
+
         try {
             Thread.sleep(1000);
         } catch(InterruptedException e) {
@@ -34,5 +64,7 @@ public class MonkeyTypewriter {
         }
 
         // Print out the copied versions here.
+        System.out.println(safeCopier.copied);
+        System.out.println(unsafeCopier.copied);
     }
 }

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

@@ -1,8 +1,36 @@
 package io.zipcoder;
 
+import java.util.NoSuchElementException;
+import java.util.concurrent.TimeUnit;
+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 lock1 = new ReentrantLock();
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+
+    public void run() {
+        try {
+            TimeUnit.MILLISECONDS.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        while (stringIterator.hasNext()) {
+            lock1.lock();
+            try {
+                copied += stringIterator.next() + " " + Thread.currentThread().getName();
+            } catch (NoSuchElementException NSEE) {
+            } finally {
+                lock1.unlock();
+            }
+        }
+    }
+}

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

@@ -4,11 +4,13 @@ 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 UnsafeCopier(String toCopy) {
         super(toCopy);
     }
 
     public void run() {
+        while(stringIterator.hasNext()){
+            copied += stringIterator.next() + " ";
+        }
     }
 }