Merge a8c990ab7973c062f3b54ee48ecfc28e5631567b into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

src/Test/java/io/zipcoder/SafeCopierTest.java

@@ -0,0 +1,47 @@
+package io.zipcoder;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SafeCopierTest {
+
+    String introduction;
+
+    @Before
+    public void setUp(){
+        introduction = "It was the best of times,\n" +
+                "it was the blurst of times,\n" +
+                "it was the age of wisdom,\n" +
+                "it was the age of foolishness,\n" +
+                "it was the epoch of belief,\n" +
+                "it was the epoch of incredulity,\n" +
+                "it was the season of Light,\n" +
+                "it was the season of Darkness,\n" +
+                "it was the spring of hope,\n" +
+                "it was the winter of despair,\n" +
+                "we had everything before us,\n" +
+                "we had nothing before us,\n" +
+                "we were all going direct to Heaven,\n" +
+                "we were all going direct the other way--\n" +
+                "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.";
+    }
+    @Test
+    public void run() {
+        SafeCopier safeCopier = new SafeCopier(introduction);
+        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);
+
+        monkeySafe1.start();
+        monkeySafe2.start();
+        monkeySafe3.start();
+        monkeySafe4.start();
+        monkeySafe5.start();
+    }
+}

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

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.ArrayList;
+
 public class MonkeyTypewriter {
     public static void main(String[] args) {
         String introduction = "It was the best of times,\n" +
@@ -24,6 +26,35 @@ 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 monkey1 = new Thread(unsafeCopier);
+        Thread monkey2 = new Thread(unsafeCopier);
+        Thread monkey3 = new Thread(unsafeCopier);
+        Thread monkey4 = new Thread(unsafeCopier);
+        Thread monkey5 = new Thread(unsafeCopier);
+
+        monkey1.start();
+        monkey2.start();
+        monkey3.start();
+        monkey4.start();
+        monkey5.start();
+
+        SafeCopier safeCopier = new SafeCopier(introduction);
+
+        ArrayList<Thread>monkeys = new ArrayList<Thread>();
+        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);
+
+        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----------");
+        System.out.println(unsafeCopier.copied);
+        System.out.println("----------Safe----------");
+        System.out.println(safeCopier.copied);
+
     }
 }

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

@@ -1,8 +1,35 @@
 package io.zipcoder;
 
+
+import java.util.NoSuchElementException;
+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()) {
+                lock.lock();
+                try {
+                    copied += stringIterator.next() + " ";
+                }
+                catch(NoSuchElementException e){
+
+                }
+                finally {
+                    lock.unlock();
+                }
+            }
+
+        }
+    }

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

@@ -10,5 +10,8 @@ public class UnsafeCopier extends Copier {
     }
 
     public void run() {
+        while (stringIterator.hasNext()) {
+            copied += stringIterator.next() + " ";
+        }
     }
 }