Merge a1968440f72aaff35bcfdf873768d2d3a2945cfb into dbc7033eb3d6c33c19985384bea0b1a977cc30d3

pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>RELEASE</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

@@ -11,6 +11,10 @@ public abstract class Copier implements Runnable {
     public Iterator<String> stringIterator;
     public String copied;
 
+    public String getCopied() {
+        return copied;
+    }
+
     public Copier(String toCopy) {
         // Take the input string, split it on spaces, turn that array to an arraylist, and then grab its iterator.
         this.stringIterator = Arrays.asList(toCopy.split(" ")).iterator();

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

@@ -25,14 +25,33 @@ public class MonkeyTypewriter {
         // A Tale Of Two Cities.
 
 
-        // 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) {
-            System.out.println("MAIN INTERRUPTED");
+        Copier unsafeCopier = new UnsafeCopier(introduction);
+        Thread[] unsafeThreads = new Thread[] {new Thread(unsafeCopier), new Thread(unsafeCopier), new Thread(unsafeCopier), new Thread(unsafeCopier), new Thread(unsafeCopier)};
+        for (Thread thread : unsafeThreads) {
+            thread.start();
         }
 
+        Copier safeCopier = new SafeCopier(introduction);
+        Thread[] safeThreads = new Thread[] {new Thread(safeCopier), new Thread(safeCopier), new Thread(safeCopier), new Thread(safeCopier), new Thread(safeCopier)};
+        for (Thread thread : safeThreads) {
+            thread.start();
+        }
+//        for (int j = 0; j < safeArray.length; j++) safeArray[j].start();
+
+
+
+        for(Thread thread : safeThreads) {
+            try {
+                thread.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+
         // Print out the copied versions here.
+        System.out.println(unsafeCopier.copied);
+        System.out.println("---------------------------------------");
+        System.out.println(safeCopier.copied);
     }
 }

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

@@ -1,8 +1,34 @@
 package io.zipcoder;
 
+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{
+
+    public SafeCopier(String toCopy) {
+        super(toCopy);
+    }
+    Lock lock = new ReentrantLock();
+
+    public void run() {
+        boolean continuing = true;
+        try {
+            TimeUnit.MILLISECONDS.sleep(30);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        while (continuing) {
+            if (lock.tryLock()){
+                if (this.stringIterator.hasNext()) {
+                    this.copied += stringIterator.next() + " " + Thread.currentThread().getName() + " ";
+                } else continuing = false;
+                lock.unlock();
+            }
+        }
+    }
 }

src/main/java/io/zipcoder/UniqueThread.java

@@ -0,0 +1,9 @@
+package io.zipcoder;
+
+public class UniqueThread extends Thread{
+//    private int id = 0;
+//
+//    public UniqueThread(){
+//        this.id =
+//    }
+}

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

@@ -1,5 +1,7 @@
 package io.zipcoder;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Modify the run function so that the monkeys each grab the next word and write it to the copy.
  */
@@ -10,5 +12,16 @@ public class UnsafeCopier extends Copier {
     }
 
     public void run() {
+        try {
+            TimeUnit.MILLISECONDS.sleep(30);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        while (this.stringIterator.hasNext()) {
+            String s = stringIterator.next();
+            StringBuilder sb = new StringBuilder();
+            sb.append(s);
+            this.copied += sb.toString() + " " + Thread.currentThread().getName() + " ";
+        }
     }
 }