From 784accdaabda676bb99a4f0ae7daf3ca96fa2918 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 11:48:38 -0700
Subject: [PATCH 01/51] Before digging in to issue #208, move the grade book
 GUI code into its own package.

---
 grader/pom.xml                                |  2 +-
 .../java/edu/pdx/cs410J/grader/GradeBook.java |  4 +--
 .../edu/pdx/cs410J/grader/GraderTools.java    |  1 +
 .../pdx/cs410J/grader/XmlStudentParser.java   |  2 +-
 .../{ => gradebook}/AssignmentPanel.java      |  7 +++-
 .../grader/{ => gradebook}/ClassPanel.java    |  9 ++---
 .../grader/{ => gradebook}/GradeBookGUI.java  | 35 +++++--------------
 .../{ => gradebook}/GradeBookPanel.java       |  3 +-
 .../grader/{ => gradebook}/GradePanel.java    |  3 +-
 .../LetterGradeRangesPanel.java               |  5 ++-
 .../{ => gradebook}/NewAssignmentDialog.java  |  4 ++-
 .../grader/{ => gradebook}/NotesPanel.java    |  4 ++-
 .../grader/{ => gradebook}/StudentPanel.java  |  3 +-
 .../grader/{ => gradebook}/StudentsList.java  |  5 ++-
 14 files changed, 45 insertions(+), 42 deletions(-)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/AssignmentPanel.java (97%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/ClassPanel.java (99%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/GradeBookGUI.java (96%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/GradeBookPanel.java (99%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/GradePanel.java (99%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/LetterGradeRangesPanel.java (97%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/NewAssignmentDialog.java (96%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/NotesPanel.java (97%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/StudentPanel.java (99%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{ => gradebook}/StudentsList.java (97%)

diff --git a/grader/pom.xml b/grader/pom.xml
index a95288f92..e398256a8 100644
--- a/grader/pom.xml
+++ b/grader/pom.xml
@@ -175,7 +175,7 @@
             <configuration>
                 <jnlp>
                     <outputFile>grader.jnlp</outputFile>
-                    <mainClass>edu.pdx.cs410J.grader.GradeBookGUI</mainClass>
+                    <mainClass>edu.pdx.cs410J.grader.gradebook.GradeBookGUI</mainClass>
                 </jnlp>
                 <!--
                  defining this will automatically sign the jar and its dependencies
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java b/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
index abbc94aa9..9d5bdfa18 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GradeBook.java
@@ -357,7 +357,7 @@ public Optional<Student> getStudentWithSsn(String ssn) {
     return this.studentsStream().filter(s -> ssn.equals(s.getSsn())).findAny();
   }
 
-  static class LetterGradeRanges implements Iterable<LetterGradeRanges.LetterGradeRange> {
+  public static class LetterGradeRanges implements Iterable<LetterGradeRanges.LetterGradeRange> {
     private final Map<LetterGrade, LetterGradeRange> ranges = new TreeMap<>();
 
     private LetterGradeRanges() {
@@ -435,7 +435,7 @@ public Spliterator<LetterGradeRange> spliterator() {
       return this.ranges.values().spliterator();
     }
 
-    static class LetterGradeRange {
+    public static class LetterGradeRange {
       private final LetterGrade letterGrade;
       private int maximum;
       private int minimum;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
index 9d42672b1..d47f5f245 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
@@ -3,6 +3,7 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import com.google.common.annotations.VisibleForTesting;
+import edu.pdx.cs410J.grader.gradebook.GradeBookGUI;
 import edu.pdx.cs410J.grader.poa.ui.PlanOfAttackGrader;
 import org.slf4j.LoggerFactory;
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
index 6ca0cf914..d428b59a6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/XmlStudentParser.java
@@ -22,7 +22,7 @@
 /**
  * This class parses XML data that describes a <code>Student</code>.
  */
-class XmlStudentParser extends XmlHelper {
+public class XmlStudentParser extends XmlHelper {
 
   /** The Reader from which the XML Data is read */ 
   private Reader reader;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
index 31e0f9415..6095aca29 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/AssignmentPanel.java
@@ -1,6 +1,10 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.Assignment;
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.Notable;
+import edu.pdx.cs410J.grader.XmlGradeBookParser;
 
 import javax.swing.*;
 import java.awt.*;
@@ -326,4 +330,5 @@ public void windowClosing(WindowEvent e) {
     frame.pack();
     frame.setVisible(true);
   }
+
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
index 5dad496db..dfe71e729 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/ClassPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -257,7 +258,7 @@ void displayAssignments(GradeBook book) {
     assignmentNames.addAll(book.getAssignmentNames());
     this.assignmentsList.setListData(assignmentNames);
   }
-  
+
   /**
    * Displays an assignment in the appropriate fields
    */
@@ -285,7 +286,7 @@ public static void main(String[] args) {
     } catch (FileNotFoundException ex) {
       System.err.println("** Could not find file: " + ex.getMessage());
       System.exit(1);
-      
+
     } catch (IOException ex) {
       System.err.println("** IOException during parsing: " + ex.getMessage());
       System.exit(1);
@@ -317,7 +318,7 @@ public void windowClosing(WindowEvent e) {
       });
 
     frame.getContentPane().add(classPanel);
-    
+
     frame.pack();
     frame.setVisible(true);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
index 221c1f318..8986ba31b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookGUI.java
@@ -1,11 +1,12 @@
-package edu.pdx.cs410J.grader;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
+
+import javax.swing.*;
+import javax.swing.border.Border;
+import java.awt.*;
+import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -14,24 +15,6 @@
 import java.util.TimerTask;
 import java.util.prefs.Preferences;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JToolBar;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
-import javax.swing.border.Border;
-
-import edu.pdx.cs410J.ParserException;
-
 /**
  * This class is a main GUI for manipulate the grade book for CS410J.
  *
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
index 1855e6e23..b41ffd8fd 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradeBookPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
index 2f46dd162..544f06768 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/GradePanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import javax.swing.border.Border;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
index 1c92eaf07..a2b950f8c 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
@@ -1,4 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.LetterGrade;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
index e77c65aac..df04c8465 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NewAssignmentDialog.java
@@ -1,4 +1,6 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.Assignment;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
index ee2ee74b7..307525dd9 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/NotesPanel.java
@@ -1,4 +1,6 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.Notable;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
similarity index 99%
rename from grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
index ad748ff73..c4da1c09a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentPanel.java
@@ -1,6 +1,7 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
index 9bd14124f..16388bec7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/StudentsList.java
@@ -1,6 +1,9 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
 
 import edu.pdx.cs410J.ParserException;
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.XmlGradeBookParser;
 
 import javax.swing.*;
 import java.awt.*;

From 09508eb319636a0de56909b579ed853fe6d75868 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 13:24:12 -0700
Subject: [PATCH 02/51] Move the event bus classes into their own package so
 that they can be reused.

---
 .../EventBusThatPublishesUnhandledExceptionEvents.java         | 2 +-
 .../cs410J/grader/{poa => mvp}/UnhandledExceptionEvent.java    | 2 +-
 .../grader/{poa => mvp}/UnhandledExceptionPresenter.java       | 2 +-
 .../pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionView.java | 2 +-
 .../java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java   | 3 +++
 .../edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java | 2 +-
 .../edu/pdx/cs410J/grader/{poa => mvp}/EventBusTestCase.java   | 2 +-
 .../grader/{poa => mvp}/UnhandledExceptionEventTest.java       | 2 +-
 .../grader/{poa => mvp}/UnhandledExceptionPresenterTest.java   | 2 +-
 .../pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java   | 1 +
 .../edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java    | 2 ++
 .../java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java | 1 +
 .../java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java  | 2 ++
 13 files changed, 17 insertions(+), 8 deletions(-)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/EventBusThatPublishesUnhandledExceptionEvents.java (97%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionEvent.java (89%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionPresenter.java (96%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionView.java (81%)
 rename grader/src/test/java/edu/pdx/cs410J/grader/{poa => mvp}/EventBusTestCase.java (96%)
 rename grader/src/test/java/edu/pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionEventTest.java (98%)
 rename grader/src/test/java/edu/pdx/cs410J/grader/{poa => mvp}/UnhandledExceptionPresenterTest.java (97%)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
similarity index 97%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
index b369e13de..a71c846e6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/EventBusThatPublishesUnhandledExceptionEvents.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
similarity index 89%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
index 3587964d2..bafe8606b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEvent.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 public class UnhandledExceptionEvent {
   private final Throwable unhandledException;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
index 9331e08c0..543f8a539 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenter.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
similarity index 81%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
index 848254aa3..deca4ba18 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionView.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 public interface UnhandledExceptionView {
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
index 45817e437..df8519465 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
@@ -4,6 +4,9 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionPresenter;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
 import edu.pdx.cs410J.grader.poa.*;
 
 public class POAGraderUIModule extends AbstractModule {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
index 3614bda99..3d52149e7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
@@ -2,7 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import edu.pdx.cs410J.grader.poa.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
similarity index 96%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
index 91156f8fc..b15e1242c 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EventBusTestCase.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
similarity index 98%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
index c3fda3d56..b4b44a76a 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEventTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionEventTest.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
similarity index 97%
rename from grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java
rename to grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
index 6d7698070..dbdee6485 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/UnhandledExceptionPresenterTest.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa;
+package edu.pdx.cs410J.grader.mvp;
 
 import org.junit.Test;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
index 09eb50128..6d1cb7511 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
@@ -1,6 +1,7 @@
 package edu.pdx.cs410J.grader.poa;
 
 import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
index 26b107cbc..16112543e 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
@@ -3,6 +3,8 @@
 import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.ParserException;
 import edu.pdx.cs410J.grader.*;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionEvent;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
index 8a0e0aa24..931c1efbe 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
@@ -5,6 +5,7 @@
 import edu.pdx.cs410J.grader.Grade;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
index 2e9ad1e2f..e0b67b7de 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionTestCase.java
@@ -1,5 +1,7 @@
 package edu.pdx.cs410J.grader.poa;
 
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+
 import java.time.LocalDateTime;
 
 public abstract class POASubmissionTestCase extends EventBusTestCase {

From 62feb9d996bbe2d16252c40e10ba5041badfa468 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 13:39:01 -0700
Subject: [PATCH 03/51] Introduced a simple MVP for displaying project
 submissions.

---
 .../grader/scoring/ProjectSubmission.java     | 22 ++++++++++++
 .../scoring/ProjectSubmissionsLoaded.java     | 15 ++++++++
 .../scoring/ProjectSubmissionsPresenter.java  | 35 +++++++++++++++++++
 .../scoring/ProjectSubmissionsView.java       |  7 ++++
 .../ProjectSubmissionsPresenterTest.java      | 32 +++++++++++++++++
 5 files changed, 111 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
new file mode 100644
index 000000000..f5bef5c95
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -0,0 +1,22 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class ProjectSubmission {
+  private String projectName;
+  private String studentId;
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setStudentId(String studentId) {
+    this.studentId = studentId;
+  }
+
+  public String getStudentId() {
+    return studentId;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
new file mode 100644
index 000000000..231c82f1f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
@@ -0,0 +1,15 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.util.List;
+
+public class ProjectSubmissionsLoaded {
+  private final List<ProjectSubmission> submissions;
+
+  public ProjectSubmissionsLoaded(List<ProjectSubmission> submissions) {
+    this.submissions = submissions;
+  }
+
+  public List<ProjectSubmission> getSubmissions() {
+    return this.submissions;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
new file mode 100644
index 000000000..79e068f70
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -0,0 +1,35 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ProjectSubmissionsPresenter {
+  private final EventBus bus;
+  private final ProjectSubmissionsView view;
+
+  public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
+    this.bus = bus;
+    this.view = view;
+
+    this.bus.register(this);
+  }
+
+  @Subscribe
+  public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
+    List<String> submissionNames = loaded.getSubmissions().stream().map(this::getSubmissionName).collect(Collectors.toList());
+    this.view.setProjectSubmissionNames(submissionNames);
+  }
+
+  private String getSubmissionName(ProjectSubmission submission) {
+    return getProjectSubmissionName(submission.getStudentId(), submission.getProjectName());
+  }
+
+  @VisibleForTesting
+  static String getProjectSubmissionName(String studentId, String projectName) {
+    return studentId + "/" + projectName;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
new file mode 100644
index 000000000..23c96652c
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -0,0 +1,7 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.util.List;
+
+public interface ProjectSubmissionsView {
+  void setProjectSubmissionNames(List<String> submissionNames);
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
new file mode 100644
index 000000000..6b99ecf32
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -0,0 +1,32 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class ProjectSubmissionsPresenterTest extends EventBusTestCase {
+
+  @Test
+  public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
+    ProjectSubmissionsView view = mock(ProjectSubmissionsView.class);
+
+    new ProjectSubmissionsPresenter(this.bus, view);
+
+    String projectName = "Project";
+    String studentId = "student";
+
+    ProjectSubmission submission = new ProjectSubmission();
+    submission.setProjectName(projectName);
+    submission.setStudentId(studentId);
+
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(Collections.singletonList(submission));
+    this.bus.post(loaded);
+
+    String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
+    verify(view).setProjectSubmissionNames(Collections.singletonList(submissionName));
+  }
+}

From 0d03e240ae9a1478a02dd7605883ddd81a9cd1f9 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 13:48:16 -0700
Subject: [PATCH 04/51] Pulled some duplicate code into a superclass of
 Presenters that are on the event bus.

---
 .../cs410J/grader/mvp/PresenterOnEventBus.java   | 16 ++++++++++++++++
 .../grader/poa/EmailCredentialsPresenter.java    | 10 ++++------
 .../cs410J/grader/poa/GradeBookPresenter.java    | 12 +++++-------
 .../grader/poa/POAAssignmentsPresenter.java      | 10 ++++------
 .../pdx/cs410J/grader/poa/POAGradePresenter.java | 12 +++++-------
 .../grader/poa/POASubmissionPresenter.java       |  6 +++---
 .../grader/poa/POASubmissionsPresenter.java      | 12 +++++-------
 .../pdx/cs410J/grader/poa/StudentsPresenter.java | 10 ++++------
 .../scoring/ProjectSubmissionsPresenter.java     |  8 +++-----
 9 files changed, 49 insertions(+), 47 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java
new file mode 100644
index 000000000..3afaf0b6d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/PresenterOnEventBus.java
@@ -0,0 +1,16 @@
+package edu.pdx.cs410J.grader.mvp;
+
+import com.google.common.eventbus.EventBus;
+
+public class PresenterOnEventBus {
+  private final EventBus bus;
+
+  public PresenterOnEventBus(EventBus bus) {
+    this.bus = bus;
+    this.bus.register(this);
+  }
+
+  protected void publishEvent(Object event) {
+    this.bus.post(event);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
index 64d7cfafd..19799b631 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenter.java
@@ -5,28 +5,26 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 @Singleton
-public class EmailCredentialsPresenter {
-  private final EventBus bus;
+public class EmailCredentialsPresenter extends PresenterOnEventBus {
   private final EmailCredentialsView view;
   private String emailAddress;
   private String password;
 
   @Inject
   public EmailCredentialsPresenter(EventBus bus, EmailCredentialsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addEmailAddressValueListener(this::setEmailAddress);
     this.view.addPasswordValueListener(this::setPassword);
     this.view.addSubmitCredentialsListener(this::fireEmailCredentialsEvent);
   }
 
   private void fireEmailCredentialsEvent() {
-    this.bus.post(new EmailCredentials(this.emailAddress, this.password));
+    publishEvent(new EmailCredentials(this.emailAddress, this.password));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
index e0956e474..cdd314ed2 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/GradeBookPresenter.java
@@ -6,31 +6,29 @@
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.io.File;
 
-public class GradeBookPresenter {
+public class GradeBookPresenter extends PresenterOnEventBus {
   private final GradeBookView view;
-  private final EventBus bus;
   private GradeBook gradeBook;
 
   @Inject
   public GradeBookPresenter(EventBus bus, GradeBookView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    bus.register(this);
-
     view.addGradeBookFileListener(this::publishLoadGradeBookEvent);
     view.addSaveGradeBookListener(this::publishSaveGradeBookEvent);
   }
 
   private void publishSaveGradeBookEvent() {
-    this.bus.post(new SaveGradeBook(this.gradeBook));
+    publishEvent(new SaveGradeBook(this.gradeBook));
   }
 
   private void publishLoadGradeBookEvent(File file) {
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
index 0bd87ff92..c487d85d9 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenter.java
@@ -7,6 +7,7 @@
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -19,18 +20,15 @@
 import java.util.stream.Collectors;
 
 @Singleton
-public class POAAssignmentsPresenter {
-  private final EventBus bus;
+public class POAAssignmentsPresenter extends PresenterOnEventBus {
   private final POAAssignmentsView view;
   private List<Assignment> poaAssignments = Collections.emptyList();
 
   @Inject
   public POAAssignmentsPresenter(EventBus bus, POAAssignmentsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
     this.view.addAssignmentSelectedHandler(this::fireAssignmentSelectedForAssignment);
-
-    this.bus.register(this);
   }
 
   private void fireAssignmentSelectedForAssignment(int index) {
@@ -40,7 +38,7 @@ private void fireAssignmentSelectedForAssignment(int index) {
   }
 
   private void fireAssignmentSelectedEvent(Assignment assignment) {
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new AssignmentSelectedEvent(assignment));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
index 1251830c8..aac94b0f4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POAGradePresenter.java
@@ -9,12 +9,12 @@
 import edu.pdx.cs410J.grader.Assignment;
 import edu.pdx.cs410J.grader.Grade;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.Optional;
 
 @Singleton
-public class POAGradePresenter {
-  private final EventBus bus;
+public class POAGradePresenter extends PresenterOnEventBus {
   private final POAGradeView view;
 
   private POASubmission submission;
@@ -26,11 +26,9 @@ public class POAGradePresenter {
 
   @Inject
   public POAGradePresenter(EventBus bus, POAGradeView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addIsLateHandler(POAGradePresenter.this::setIsLate);
     this.view.addScoreValueHandler(this::setScoreValue);
     this.view.addRecordGradeHandler(this::publishScoreToMessageBusAndDisplayNextPOA);
@@ -42,11 +40,11 @@ private void publishScoreToMessageBusAndDisplayNextPOA() {
     }
 
     RecordGradeEvent recordGrade = new RecordGradeEvent(this.score, this.student, this.assignment, this.isLate);
-    this.bus.post(recordGrade);
+    publishEvent(recordGrade);
     this.view.setScoreHasBeenRecorded(true);
 
     SelectNextPOAEvent displayNextPOA = new SelectNextPOAEvent();
-    this.bus.post(displayNextPOA);
+    publishEvent(displayNextPOA);
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
index 031a8d56a..01f3facec 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenter.java
@@ -4,19 +4,19 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Singleton
-public class POASubmissionPresenter {
+public class POASubmissionPresenter extends PresenterOnEventBus {
   private final POASubmissionView view;
 
   @Inject
   public POASubmissionPresenter(EventBus bus, POASubmissionView view) {
+    super(bus);
     this.view = view;
-
-    bus.register(this);
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
index 5c47ebc16..febe7e6b6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenter.java
@@ -3,13 +3,13 @@
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class POASubmissionsPresenter {
-  private final EventBus bus;
+public class POASubmissionsPresenter extends PresenterOnEventBus {
   private final POASubmissionsView view;
   private final List<POASubmission> submissions = new ArrayList<>();
 
@@ -17,22 +17,20 @@ public class POASubmissionsPresenter {
 
   @Inject
   public POASubmissionsPresenter(EventBus bus, POASubmissionsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
     this.view.addSubmissionSelectedListener(this::poaSubmissionSelected);
     this.view.addDownloadSubmissionsListener(this::fireDownloadSubmissionsEvent);
-
-    this.bus.register(this);
   }
 
   private void fireDownloadSubmissionsEvent() {
-    this.bus.post(new DownloadPOASubmissionsRequest());
+    publishEvent(new DownloadPOASubmissionsRequest());
   }
 
   private void poaSubmissionSelected(int index) {
     this.selectedSubmissionIndex = index;
-    this.bus.post(new POASubmissionSelected(this.submissions.get(index)));
+    publishEvent(new POASubmissionSelected(this.submissions.get(index)));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
index 9bdca305c..8afbaacbb 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/StudentsPresenter.java
@@ -6,6 +6,7 @@
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.Student;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -13,18 +14,15 @@
 import java.util.stream.Collectors;
 
 @Singleton
-public class StudentsPresenter {
-  private final EventBus bus;
+public class StudentsPresenter extends PresenterOnEventBus {
   private final StudentsView view;
   private List<Student> students = Collections.emptyList();
 
   @Inject
   public StudentsPresenter(EventBus bus, StudentsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
 
-    this.bus.register(this);
-
     this.view.addSelectStudentHandler(this::fireSelectedStudentEventForStudentAtIndex);
   }
 
@@ -40,7 +38,7 @@ private void fireSelectedStudentEventForStudentAtIndex(int index) {
   }
 
   private void fireStudentSelectedEvent(Student student) {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 79e068f70..2b02c93dd 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -3,19 +3,17 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class ProjectSubmissionsPresenter {
-  private final EventBus bus;
+public class ProjectSubmissionsPresenter extends PresenterOnEventBus {
   private final ProjectSubmissionsView view;
 
   public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
-    this.bus = bus;
+    super(bus);
     this.view = view;
-
-    this.bus.register(this);
   }
 
   @Subscribe

From 91c2784f2264c7e6be2a7eff9e71692e3af09184 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 14:05:55 -0700
Subject: [PATCH 05/51] Pulled up code into a superclass that will be useful
 for other UI main classes.

---
 .../edu/pdx/cs410J/grader/mvp/ui/UIMain.java  | 38 +++++++++++++++++++
 .../grader/poa/ui/PlanOfAttackGrader.java     | 31 +++------------
 2 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
new file mode 100644
index 000000000..0edb199b6
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
@@ -0,0 +1,38 @@
+package edu.pdx.cs410J.grader.mvp.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.poa.ui.TopLevelJFrame;
+import org.slf4j.Logger;
+
+public class UIMain {
+  protected final TopLevelJFrame parent;
+
+  public UIMain(TopLevelJFrame parent) {
+    this.parent = parent;
+  }
+
+  private static void printStackTraceForUncaughtException(Throwable e, Logger logger) {
+    e.fillInStackTrace();
+    e.printStackTrace(System.err);
+    logger.error("Uncaught exception", e);
+  }
+
+  protected static void logAllEventsOnBusAtDebugLevel(EventBus bus, Logger logger) {
+    bus.register(new Object() {
+      @Subscribe
+      public void logEvent(Object event) {
+        logger.debug("Event " + event);
+      }
+    });
+  }
+
+  protected static void logAllUncaughtExceptions(Logger logger) {
+    Thread.currentThread().setUncaughtExceptionHandler((t, e) -> printStackTraceForUncaughtException(e, logger));
+  }
+
+  protected void display() {
+    parent.pack();
+    parent.setVisible(true);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
index a7f988766..7a0546090 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
@@ -1,11 +1,11 @@
 package edu.pdx.cs410J.grader.poa.ui;
 
 import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.poa.DownloadPOASubmissionsRequest;
 import edu.pdx.cs410J.grader.poa.LoadGradeBook;
 import edu.pdx.cs410J.grader.poa.POASubmission;
@@ -17,13 +17,12 @@
 import java.time.LocalDateTime;
 
 @Singleton
-public class PlanOfAttackGrader {
+public class PlanOfAttackGrader extends UIMain {
   private static final Logger logger = LoggerFactory.getLogger(PlanOfAttackGrader.class);
-  private final TopLevelJFrame parent;
 
   @Inject
   public PlanOfAttackGrader(TopLevelJFrame parent, POASubmissionsPanel submissions, POASubmissionInformationPanel submissionInfo) {
-    this.parent = parent;
+    super(parent);
 
     parent.setTitle("Plan Of Attack Grader");
 
@@ -34,12 +33,12 @@ public PlanOfAttackGrader(TopLevelJFrame parent, POASubmissionsPanel submissions
   }
 
   public static void main(String[] args) {
-    Thread.currentThread().setUncaughtExceptionHandler((t, e) -> printStackTrace(e));
+    logAllUncaughtExceptions(logger);
 
     Injector injector = Guice.createInjector(new POAGraderUIModule());
 
     EventBus bus = injector.getInstance(EventBus.class);
-    registerEventLogger(bus);
+    logAllEventsOnBusAtDebugLevel(bus, logger);
 
     PlanOfAttackGrader ui = injector.getInstance(PlanOfAttackGrader.class);
     ui.display();
@@ -53,26 +52,6 @@ public static void main(String[] args) {
     bus.post(new DownloadPOASubmissionsRequest());
   }
 
-  private static void printStackTrace(Throwable e) {
-    e.fillInStackTrace();
-    e.printStackTrace(System.err);
-  }
-
-  private void display() {
-    parent.pack();
-    parent.setVisible(true);
-  }
-
-  private static void registerEventLogger(EventBus bus) {
-    bus.register(new Object() {
-      @Subscribe
-      public void logEvent(Object event) {
-        logger.debug("Event " + event);
-      }
-    });
-
-  }
-
   private static POASubmission createPOASubmission(String subject) {
     POASubmission.Builder builder = POASubmission.builder();
 

From b45f28321e5ff42d79b7a63ed31645f3d1f6d9f4 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 14:38:55 -0700
Subject: [PATCH 06/51] Began developing a UI for the project submission scorer
 application.

---
 .../edu/pdx/cs410J/grader/GraderTools.java    |  5 ++
 .../scoring/ProjectSubmissionsPresenter.java  |  2 +
 .../scoring/ui/ProjectSubmissionScorer.java   | 62 +++++++++++++++++++
 .../ui/ProjectSubmissionScorerUIModule.java   | 27 ++++++++
 .../scoring/ui/ProjectSubmissionsPanel.java   | 29 +++++++++
 5 files changed, 125 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
index d47f5f245..b144c24c3 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
@@ -5,6 +5,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import edu.pdx.cs410J.grader.gradebook.GradeBookGUI;
 import edu.pdx.cs410J.grader.poa.ui.PlanOfAttackGrader;
+import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionScorer;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintStream;
@@ -73,6 +74,9 @@ private static Class getToolClass(String tool) {
       case "fixGwtZips":
         return GwtZipFixer.class;
 
+      case "scoreProjectSubmissions":
+        return ProjectSubmissionScorer.class;
+
       default:
         usage("Unknown tool: " + tool);
         return null;
@@ -104,6 +108,7 @@ private static void usage(String message) {
     err.println("    generateGradeSummary      Generate grade summary report for one or more students");
     err.println("    htmlForSurveyResults      Generate an html file for the responses to a D2L survey");
     err.println("    fixGwtZips                Fix zip files for the GWT project to work with grading script");
+    err.println("    scoreProjectSubmissions   Review project submissions and assign them scores");
     err.println("  toolArg                     A command line argument to send to the tool");
     err.println();
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 2b02c93dd..a73053967 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -3,6 +3,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.List;
@@ -11,6 +12,7 @@
 public class ProjectSubmissionsPresenter extends PresenterOnEventBus {
   private final ProjectSubmissionsView view;
 
+  @Inject
   public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
     super(bus);
     this.view = view;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
new file mode 100644
index 000000000..f9940632b
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
@@ -0,0 +1,62 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.UIMain;
+import edu.pdx.cs410J.grader.poa.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class ProjectSubmissionScorer extends UIMain {
+  private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionScorer.class);
+
+  @Inject
+  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions) {
+    super(parent);
+
+    parent.setTitle("Project Submission Scorer");
+
+    Container content = parent.getContentPane();
+    content.setLayout(new BorderLayout());
+    content.add(submissions, BorderLayout.WEST);
+  }
+
+  public static void main(String[] args) {
+    logAllUncaughtExceptions(logger);
+
+    Injector injector = Guice.createInjector(new ProjectSubmissionScorerUIModule());
+
+    EventBus bus = injector.getInstance(EventBus.class);
+    logAllEventsOnBusAtDebugLevel(bus, logger);
+
+    ProjectSubmissionScorer scorer = injector.getInstance(ProjectSubmissionScorer.class);
+    scorer.display();
+
+    bus.post(new ProjectSubmissionsLoaded(createProjectSubmissions()));
+  }
+
+  private static List<ProjectSubmission> createProjectSubmissions() {
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    String projectName = "Project";
+    for (int i = 0; i < 50; i++) {
+      String studentId = "student" + i;
+      ProjectSubmission submission = new ProjectSubmission();
+      submission.setProjectName(projectName);
+      submission.setStudentId(studentId);
+      submissions.add(submission);
+    }
+
+    return submissions;
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
new file mode 100644
index 000000000..16215acc8
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -0,0 +1,27 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsPresenter;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
+
+public class ProjectSubmissionScorerUIModule extends AbstractModule {
+  @Override
+  protected void configure() {
+
+    bind(ProjectSubmissionsView.class).to(ProjectSubmissionsPanel.class);
+
+    bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
+  }
+
+  @Provides
+  @Singleton
+  public EventBus provideEventBus() {
+    return new EventBusThatPublishesUnhandledExceptionEvents();
+  }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
new file mode 100644
index 000000000..c57a237a7
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -0,0 +1,29 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+import java.util.Vector;
+
+@Singleton
+public class ProjectSubmissionsPanel extends JPanel implements ProjectSubmissionsView {
+
+  private final JList<String> submissionNames;
+
+  public ProjectSubmissionsPanel() {
+    submissionNames = new JList<>();
+    submissionNames.setVisibleRowCount(30);
+
+    this.setLayout(new BorderLayout());
+
+    this.add(new JScrollPane(submissionNames), BorderLayout.CENTER);
+  }
+
+  @Override
+  public void setProjectSubmissionNames(List<String> submissionNames) {
+    this.submissionNames.setListData(new Vector<>(submissionNames));
+  }
+}

From cba5e50529e7d3eedbc7b64b747f3e2140ac540e Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 15:26:14 -0700
Subject: [PATCH 07/51] When you click on the name of a submission, that
 submission is selected.

---
 .../scoring/ProjectSubmissionSelected.java    | 18 +++++
 .../scoring/ProjectSubmissionsPresenter.java  | 14 +++-
 .../scoring/ProjectSubmissionsView.java       |  6 ++
 .../scoring/ui/ProjectSubmissionScorer.java   |  7 ++
 .../scoring/ui/ProjectSubmissionsPanel.java   | 18 +++++
 .../ProjectSubmissionsPresenterTest.java      | 67 +++++++++++++++++--
 6 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java
new file mode 100644
index 000000000..6dda6c26d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionSelected.java
@@ -0,0 +1,18 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class ProjectSubmissionSelected {
+  private final ProjectSubmission projectSubmission;
+
+  public ProjectSubmissionSelected(ProjectSubmission submission) {
+    this.projectSubmission = submission;
+  }
+
+  public ProjectSubmission getProjectSubmission() {
+    return projectSubmission;
+  }
+
+  @Override
+  public String toString() {
+    return "Selected project submission " + projectSubmission.getStudentId() + "/" + projectSubmission.getProjectName();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index a73053967..87facbb95 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -11,16 +11,28 @@
 
 public class ProjectSubmissionsPresenter extends PresenterOnEventBus {
   private final ProjectSubmissionsView view;
+  private List<ProjectSubmission> submissions;
 
   @Inject
   public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
     super(bus);
     this.view = view;
+
+    view.addSubmissionNameSelectedListener(this::publishSubmissionSelected);
+  }
+
+  private void publishSubmissionSelected(int selectedIndex) {
+    if (this.submissions != null) {
+      ProjectSubmission selected = this.submissions.get(selectedIndex);
+      publishEvent(new ProjectSubmissionSelected(selected));
+    }
   }
 
   @Subscribe
   public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
-    List<String> submissionNames = loaded.getSubmissions().stream().map(this::getSubmissionName).collect(Collectors.toList());
+    submissions = loaded.getSubmissions();
+
+    List<String> submissionNames = submissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
     this.view.setProjectSubmissionNames(submissionNames);
   }
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index 23c96652c..766f5e502 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -4,4 +4,10 @@
 
 public interface ProjectSubmissionsView {
   void setProjectSubmissionNames(List<String> submissionNames);
+
+  void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
+
+  interface SubmissionNameSelectedListener {
+    void submissionSelected(int index);
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
index f9940632b..940a61126 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
@@ -1,5 +1,6 @@
 package edu.pdx.cs410J.grader.scoring.ui;
 
+import ch.qos.logback.classic.Level;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
@@ -31,7 +32,13 @@ public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel su
     content.add(submissions, BorderLayout.WEST);
   }
 
+  static void setLoggingLevelToDebug() {
+    ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger("edu.pdx.cs410J.grader");
+    logger.setLevel(Level.DEBUG);
+  }
+
   public static void main(String[] args) {
+    setLoggingLevelToDebug();
     logAllUncaughtExceptions(logger);
 
     Injector injector = Guice.createInjector(new ProjectSubmissionScorerUIModule());
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index c57a237a7..d4ebc8eee 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -4,6 +4,7 @@
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
 
 import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
 import java.awt.*;
 import java.util.List;
 import java.util.Vector;
@@ -26,4 +27,21 @@ public ProjectSubmissionsPanel() {
   public void setProjectSubmissionNames(List<String> submissionNames) {
     this.submissionNames.setListData(new Vector<>(submissionNames));
   }
+
+  @Override
+  public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
+    this.submissionNames.addListSelectionListener(e -> {
+      if (isFinalEventInUserSelection(e)) {
+        int selectedIndex = submissionNames.getSelectedIndex();
+        if (selectedIndex >= 0) {
+          listener.submissionSelected(selectedIndex);
+        }
+      }
+    });
+  }
+
+  private boolean isFinalEventInUserSelection(ListSelectionEvent e) {
+    return !e.getValueIsAdjusting();
+  }
+
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 6b99ecf32..8a6b8ad6a 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -1,27 +1,40 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView.SubmissionNameSelectedListener;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 public class ProjectSubmissionsPresenterTest extends EventBusTestCase {
 
-  @Test
-  public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
-    ProjectSubmissionsView view = mock(ProjectSubmissionsView.class);
+  private ProjectSubmissionsView view;
 
+  @Override
+  @Before
+  public void setUp() {
+    super.setUp();
+    view = mock(ProjectSubmissionsView.class);
     new ProjectSubmissionsPresenter(this.bus, view);
+  }
 
+  @Test
+  public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
     String projectName = "Project";
     String studentId = "student";
 
-    ProjectSubmission submission = new ProjectSubmission();
-    submission.setProjectName(projectName);
-    submission.setStudentId(studentId);
+    ProjectSubmission submission = createProjectSubmission(projectName, studentId);
 
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(Collections.singletonList(submission));
     this.bus.post(loaded);
@@ -29,4 +42,46 @@ public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
     String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
     verify(view).setProjectSubmissionNames(Collections.singletonList(submissionName));
   }
+
+  private ProjectSubmission createProjectSubmission(String projectName, String studentId) {
+    ProjectSubmission submission = new ProjectSubmission();
+    submission.setProjectName(projectName);
+    submission.setStudentId(studentId);
+    return submission;
+  }
+
+  @Test
+  public void eventIsPublishedWhenProjectSubmissionIsSelected() {
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    bus.register(handler);
+
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+    String studentId = "student1";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    submissions.add(createProjectSubmission(projectName, "student0"));
+    ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
+    submissions.add(submission1);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    bus.post(loaded);
+
+    // When the user selects the second POA submission...
+    listener.getValue().submissionSelected(1);
+
+    // Then a ProjectSubmissionSelected event for that submission is published
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  private interface ProjectSubmissionSelectedHandler {
+    @Subscribe
+    public void handle(ProjectSubmissionSelected event);
+  }
 }

From 650b4a4b9b12c4582162231933300fa7163c2983 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 15:45:39 -0700
Subject: [PATCH 08/51] Select the first submission when submissions are
 loaded.

---
 .../scoring/ProjectSubmissionsPresenter.java  |  2 ++
 .../scoring/ProjectSubmissionsView.java       |  2 ++
 .../scoring/ui/ProjectSubmissionsPanel.java   |  5 +++++
 .../ProjectSubmissionsPresenterTest.java      | 22 ++++++++++++++++---
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 87facbb95..5970edf2c 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -34,6 +34,8 @@ public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded)
 
     List<String> submissionNames = submissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
     this.view.setProjectSubmissionNames(submissionNames);
+
+    this.view.setSelectedSubmission(0);
   }
 
   private String getSubmissionName(ProjectSubmission submission) {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index 766f5e502..6ec6e356b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -7,6 +7,8 @@ public interface ProjectSubmissionsView {
 
   void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
 
+  void setSelectedSubmission(int index);
+
   interface SubmissionNameSelectedListener {
     void submissionSelected(int index);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index d4ebc8eee..991070230 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -40,6 +40,11 @@ public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener lis
     });
   }
 
+  @Override
+  public void setSelectedSubmission(int index) {
+    this.submissionNames.setSelectedIndex(index);
+  }
+
   private boolean isFinalEventInUserSelection(ListSelectionEvent e) {
     return !e.getValueIsAdjusting();
   }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 8a6b8ad6a..bc6998a32 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -52,9 +52,6 @@ private ProjectSubmission createProjectSubmission(String projectName, String stu
 
   @Test
   public void eventIsPublishedWhenProjectSubmissionIsSelected() {
-    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
-    bus.register(handler);
-
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
     verify(view).addSubmissionNameSelectedListener(listener.capture());
 
@@ -69,6 +66,8 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     bus.post(loaded);
 
     // When the user selects the second POA submission...
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    bus.register(handler);
     listener.getValue().submissionSelected(1);
 
     // Then a ProjectSubmissionSelected event for that submission is published
@@ -80,6 +79,23 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     verifyNoMoreInteractions(handler);
   }
 
+  @Test
+  public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    ProjectSubmission submission0 = createProjectSubmission(projectName, "student0");
+    submissions.add(submission0);
+    submissions.add(createProjectSubmission(projectName, "student1"));
+
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    bus.post(loaded);
+    verify(view).setSelectedSubmission(0);
+  }
+
   private interface ProjectSubmissionSelectedHandler {
     @Subscribe
     public void handle(ProjectSubmissionSelected event);

From 5ad20f9d484314e80ffeaa4d90cc2c5f9a63c035 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 16:03:39 -0700
Subject: [PATCH 09/51] When a submission is selected, display the name of its
 test cases.

---
 .../grader/scoring/ProjectSubmission.java     | 12 +++++++
 .../cs410J/grader/scoring/TestCaseOutput.java | 14 +++++++++
 .../grader/scoring/TestCasesPresenter.java    | 25 +++++++++++++++
 .../cs410J/grader/scoring/TestCasesView.java  |  7 +++++
 .../scoring/ProjectSubmissionTestCase.java    | 12 +++++++
 .../ProjectSubmissionsPresenterTest.java      | 14 ++-------
 .../scoring/TestCasesPresenterTest.java       | 31 +++++++++++++++++++
 7 files changed, 103 insertions(+), 12 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index f5bef5c95..bf18aaa42 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -1,8 +1,12 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ProjectSubmission {
   private String projectName;
   private String studentId;
+  private final List<TestCaseOutput> testCaseOutputs = new ArrayList<>();
 
   public void setProjectName(String projectName) {
     this.projectName = projectName;
@@ -19,4 +23,12 @@ public void setStudentId(String studentId) {
   public String getStudentId() {
     return studentId;
   }
+
+  public void addTestCaseOutput(TestCaseOutput testCaseOutput) {
+    this.testCaseOutputs.add(testCaseOutput);
+  }
+
+  public List<TestCaseOutput> getTestCaseOutputs() {
+    return testCaseOutputs;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
new file mode 100644
index 000000000..39ea0bc5e
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
@@ -0,0 +1,14 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseOutput {
+  private String name;
+
+  public TestCaseOutput setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
new file mode 100644
index 000000000..ee698679e
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -0,0 +1,25 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class TestCasesPresenter extends PresenterOnEventBus {
+  private final TestCasesView view;
+  private List<TestCaseOutput> testCaseOutputs;
+
+  public TestCasesPresenter(EventBus bus, TestCasesView view) {
+    super(bus);
+    this.view = view;
+  }
+
+  @Subscribe
+  public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
+    testCaseOutputs = selected.getProjectSubmission().getTestCaseOutputs();
+    List<String> testCaseNames = testCaseOutputs.stream().map(TestCaseOutput::getName).collect(Collectors.toList());
+    view.setTestCaseNames(testCaseNames);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
new file mode 100644
index 000000000..c60d8f2d1
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
@@ -0,0 +1,7 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.util.List;
+
+public interface TestCasesView {
+  void setTestCaseNames(List<String> testCaseNames);
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java
new file mode 100644
index 000000000..7ee5fe38b
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionTestCase.java
@@ -0,0 +1,12 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
+
+public class ProjectSubmissionTestCase extends EventBusTestCase {
+  protected ProjectSubmission createProjectSubmission(String projectName, String studentId) {
+    ProjectSubmission submission = new ProjectSubmission();
+    submission.setProjectName(projectName);
+    submission.setStudentId(studentId);
+    return submission;
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index bc6998a32..35c48ba42 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -1,7 +1,6 @@
 package edu.pdx.cs410J.grader.scoring;
 
 import com.google.common.eventbus.Subscribe;
-import edu.pdx.cs410J.grader.mvp.EventBusTestCase;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView.SubmissionNameSelectedListener;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,11 +12,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.*;
 
-public class ProjectSubmissionsPresenterTest extends EventBusTestCase {
+public class ProjectSubmissionsPresenterTest extends ProjectSubmissionTestCase {
 
   private ProjectSubmissionsView view;
 
@@ -43,13 +40,6 @@ public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
     verify(view).setProjectSubmissionNames(Collections.singletonList(submissionName));
   }
 
-  private ProjectSubmission createProjectSubmission(String projectName, String studentId) {
-    ProjectSubmission submission = new ProjectSubmission();
-    submission.setProjectName(projectName);
-    submission.setStudentId(studentId);
-    return submission;
-  }
-
   @Test
   public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
new file mode 100644
index 000000000..cf3e998a7
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -0,0 +1,31 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class TestCasesPresenterTest extends ProjectSubmissionTestCase {
+
+  private TestCasesView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(TestCasesView.class);
+    new TestCasesPresenter(bus, view);
+  }
+
+  @Test
+  public void selectingSubmissionPopulatesTestCases() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    String testCaseName = "test1";
+    submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
+
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTestCaseNames(Collections.singletonList(testCaseName));
+  }
+}

From ebe9345c1aba8ad612d73f0386cc229e53d6cfa1 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 16:16:09 -0700
Subject: [PATCH 10/51] Hook up the test case presenter to the UI.

---
 .../grader/scoring/TestCasesPresenter.java    |  4 +++
 .../scoring/ui/ProjectSubmissionScorer.java   | 18 ++++++++++--
 .../ui/ProjectSubmissionScorerUIModule.java   |  5 +++-
 .../grader/scoring/ui/TestCasesPanel.java     | 28 +++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index ee698679e..ba70a1506 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -2,15 +2,19 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Singleton
 public class TestCasesPresenter extends PresenterOnEventBus {
   private final TestCasesView view;
   private List<TestCaseOutput> testCaseOutputs;
 
+  @Inject
   public TestCasesPresenter(EventBus bus, TestCasesView view) {
     super(bus);
     this.view = view;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
index 940a61126..c2b056e75 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
@@ -10,9 +10,11 @@
 import edu.pdx.cs410J.grader.poa.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -22,14 +24,20 @@ public class ProjectSubmissionScorer extends UIMain {
   private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionScorer.class);
 
   @Inject
-  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions) {
+  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases) {
     super(parent);
 
     parent.setTitle("Project Submission Scorer");
 
     Container content = parent.getContentPane();
     content.setLayout(new BorderLayout());
-    content.add(submissions, BorderLayout.WEST);
+
+    JPanel submissionsAndTestCases = new JPanel();
+    submissionsAndTestCases.setLayout(new BorderLayout());
+    submissionsAndTestCases.add(submissions, BorderLayout.WEST);
+    submissionsAndTestCases.add(testCases, BorderLayout.EAST);
+
+    content.add(submissionsAndTestCases, BorderLayout.WEST);
   }
 
   static void setLoggingLevelToDebug() {
@@ -60,6 +68,12 @@ private static List<ProjectSubmission> createProjectSubmissions() {
       ProjectSubmission submission = new ProjectSubmission();
       submission.setProjectName(projectName);
       submission.setStudentId(studentId);
+
+      for (int j = 0; j < 10; j++) {
+        String testCaseName = studentId + "'s test " + j;
+        submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
+      }
+
       submissions.add(submission);
     }
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
index 16215acc8..0cfa73d99 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -5,17 +5,20 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
-import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsPresenter;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
+import edu.pdx.cs410J.grader.scoring.TestCasesPresenter;
+import edu.pdx.cs410J.grader.scoring.TestCasesView;
 
 public class ProjectSubmissionScorerUIModule extends AbstractModule {
   @Override
   protected void configure() {
 
     bind(ProjectSubmissionsView.class).to(ProjectSubmissionsPanel.class);
+    bind(TestCasesView.class).to(TestCasesPanel.class);
 
     bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
+    bind(TestCasesPresenter.class).asEagerSingleton();
   }
 
   @Provides
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
new file mode 100644
index 000000000..3507bc6d7
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -0,0 +1,28 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.TestCasesView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.List;
+import java.util.Vector;
+
+@Singleton
+public class TestCasesPanel extends JPanel implements TestCasesView{
+  private final JList<String> testCaseNames;
+
+  public TestCasesPanel() {
+    testCaseNames = new JList<>();
+    testCaseNames.setVisibleRowCount(20);
+
+    this.setLayout(new BorderLayout());
+
+    this.add(new JScrollPane(testCaseNames), BorderLayout.CENTER);
+  }
+
+  @Override
+  public void setTestCaseNames(List<String> testCaseNames) {
+    this.testCaseNames.setListData(new Vector<>(testCaseNames));
+  }
+}

From 8da87de742edbcff2ee81c465a918476f30e6e59 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 16:21:33 -0700
Subject: [PATCH 11/51] Select the first test case when a submission is
 selected.

---
 .../cs410J/grader/scoring/TestCasesPresenter.java  |  2 ++
 .../pdx/cs410J/grader/scoring/TestCasesView.java   |  2 ++
 .../cs410J/grader/scoring/ui/TestCasesPanel.java   |  5 +++++
 .../grader/scoring/TestCasesPresenterTest.java     | 14 +++++++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index ba70a1506..c0f6c448b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -25,5 +25,7 @@ public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selec
     testCaseOutputs = selected.getProjectSubmission().getTestCaseOutputs();
     List<String> testCaseNames = testCaseOutputs.stream().map(TestCaseOutput::getName).collect(Collectors.toList());
     view.setTestCaseNames(testCaseNames);
+
+    view.setSelectedTestCaseName(0);
   }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
index c60d8f2d1..72854dc15 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
@@ -4,4 +4,6 @@
 
 public interface TestCasesView {
   void setTestCaseNames(List<String> testCaseNames);
+
+  void setSelectedTestCaseName(int index);
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
index 3507bc6d7..18f58c972 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -25,4 +25,9 @@ public TestCasesPanel() {
   public void setTestCaseNames(List<String> testCaseNames) {
     this.testCaseNames.setListData(new Vector<>(testCaseNames));
   }
+
+  @Override
+  public void setSelectedTestCaseName(int index) {
+    this.testCaseNames.setSelectedIndex(index);
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index cf3e998a7..5e7d79e28 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -21,11 +21,23 @@ public void setUp() {
   @Test
   public void selectingSubmissionPopulatesTestCases() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
-    String testCaseName = "test1";
+    String testCaseName = "test";
     submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
 
     this.bus.post(new ProjectSubmissionSelected(submission));
 
     verify(view).setTestCaseNames(Collections.singletonList(testCaseName));
   }
+
+  @Test
+  public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test1"));
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test2"));
+
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    verify(view).setSelectedTestCaseName(0);
+
+  }
 }

From b70a52aec476b1c97f6baaa2cf83e9d0c78805bd Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 16:45:52 -0700
Subject: [PATCH 12/51] Publish an event when a test case is selected.

---
 .../scoring/ProjectSubmissionsView.java       |  2 +-
 .../grader/scoring/TestCaseSelected.java      | 18 ++++++++++
 .../grader/scoring/TestCasesPresenter.java    |  7 ++++
 .../cs410J/grader/scoring/TestCasesView.java  |  6 ++++
 .../grader/scoring/ui/JPanelWithJList.java    | 23 ++++++++++++
 .../scoring/ui/ProjectSubmissionsPanel.java   | 16 ++-------
 .../grader/scoring/ui/TestCasesPanel.java     |  7 +++-
 .../ProjectSubmissionsPresenterTest.java      |  4 +--
 .../scoring/TestCasesPresenterTest.java       | 36 +++++++++++++++++++
 9 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index 6ec6e356b..ac0a05c61 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -10,6 +10,6 @@ public interface ProjectSubmissionsView {
   void setSelectedSubmission(int index);
 
   interface SubmissionNameSelectedListener {
-    void submissionSelected(int index);
+    void submissionNameSelected(int index);
   }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java
new file mode 100644
index 000000000..11bd6f73d
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseSelected.java
@@ -0,0 +1,18 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseSelected {
+  private TestCaseOutput testCaseOutput;
+
+  public TestCaseSelected(TestCaseOutput selected) {
+    this.testCaseOutput = selected;
+  }
+
+  public TestCaseOutput getTestCaseOutput() {
+    return testCaseOutput;
+  }
+
+  @Override
+  public String toString() {
+    return "Selected test case " + testCaseOutput.getName();
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index c0f6c448b..ca10c48d6 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -18,6 +18,13 @@ public class TestCasesPresenter extends PresenterOnEventBus {
   public TestCasesPresenter(EventBus bus, TestCasesView view) {
     super(bus);
     this.view = view;
+
+    this.view.addTestCaseNameSelectedListener(this::publishTestCaseNameSelectedEvent);
+  }
+
+  private void publishTestCaseNameSelectedEvent(int index) {
+    TestCaseOutput selected = this.testCaseOutputs.get(index);
+    publishEvent(new TestCaseSelected(selected));
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
index 72854dc15..7b174e2a8 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesView.java
@@ -6,4 +6,10 @@ public interface TestCasesView {
   void setTestCaseNames(List<String> testCaseNames);
 
   void setSelectedTestCaseName(int index);
+
+  void addTestCaseNameSelectedListener(TestCaseNameSelectedListener listener);
+
+  interface TestCaseNameSelectedListener {
+    void testCaseNameSelected(int index);
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java
new file mode 100644
index 000000000..91b39fdeb
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/JPanelWithJList.java
@@ -0,0 +1,23 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import java.util.function.Consumer;
+
+public class JPanelWithJList extends JPanel {
+
+  private boolean isFinalEventInUserSelection(ListSelectionEvent e) {
+    return !e.getValueIsAdjusting();
+  }
+
+  protected void registerListenerOnListItemSelection(JList<String> list, Consumer<Integer> onSelection) {
+    list.addListSelectionListener(e -> {
+      if (isFinalEventInUserSelection(e)) {
+        int selectedIndex = list.getSelectedIndex();
+        if (selectedIndex >= 0) {
+          onSelection.accept(selectedIndex);
+        }
+      }
+    });
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 991070230..05fda5f45 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -4,13 +4,12 @@
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
 
 import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
 import java.awt.*;
 import java.util.List;
 import java.util.Vector;
 
 @Singleton
-public class ProjectSubmissionsPanel extends JPanel implements ProjectSubmissionsView {
+public class ProjectSubmissionsPanel extends JPanelWithJList implements ProjectSubmissionsView {
 
   private final JList<String> submissionNames;
 
@@ -30,14 +29,7 @@ public void setProjectSubmissionNames(List<String> submissionNames) {
 
   @Override
   public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
-    this.submissionNames.addListSelectionListener(e -> {
-      if (isFinalEventInUserSelection(e)) {
-        int selectedIndex = submissionNames.getSelectedIndex();
-        if (selectedIndex >= 0) {
-          listener.submissionSelected(selectedIndex);
-        }
-      }
-    });
+    registerListenerOnListItemSelection(this.submissionNames, listener::submissionNameSelected);
   }
 
   @Override
@@ -45,8 +37,4 @@ public void setSelectedSubmission(int index) {
     this.submissionNames.setSelectedIndex(index);
   }
 
-  private boolean isFinalEventInUserSelection(ListSelectionEvent e) {
-    return !e.getValueIsAdjusting();
-  }
-
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
index 18f58c972..22642e609 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -9,7 +9,7 @@
 import java.util.Vector;
 
 @Singleton
-public class TestCasesPanel extends JPanel implements TestCasesView{
+public class TestCasesPanel extends JPanelWithJList implements TestCasesView{
   private final JList<String> testCaseNames;
 
   public TestCasesPanel() {
@@ -30,4 +30,9 @@ public void setTestCaseNames(List<String> testCaseNames) {
   public void setSelectedTestCaseName(int index) {
     this.testCaseNames.setSelectedIndex(index);
   }
+
+  @Override
+  public void addTestCaseNameSelectedListener(TestCaseNameSelectedListener listener) {
+    registerListenerOnListItemSelection(this.testCaseNames, listener::testCaseNameSelected);
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 35c48ba42..86a01b397 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -55,10 +55,10 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
     bus.post(loaded);
 
-    // When the user selects the second POA submission...
+    // When the user selects the second project submission...
     ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
     bus.register(handler);
-    listener.getValue().submissionSelected(1);
+    listener.getValue().submissionNameSelected(1);
 
     // Then a ProjectSubmissionSelected event for that submission is published
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index 5e7d79e28..3b2c20c47 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -1,11 +1,17 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.TestCasesView.TestCaseNameSelectedListener;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 import java.util.Collections;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 public class TestCasesPresenterTest extends ProjectSubmissionTestCase {
 
@@ -29,6 +35,31 @@ public void selectingSubmissionPopulatesTestCases() {
     verify(view).setTestCaseNames(Collections.singletonList(testCaseName));
   }
 
+  @Test
+  public void selectingTestCasePublishesEvent() {
+    ArgumentCaptor<TestCaseNameSelectedListener> listener = ArgumentCaptor.forClass(TestCaseNameSelectedListener.class);
+    verify(view).addTestCaseNameSelectedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.addTestCaseOutput(new TestCaseOutput().setName("test0"));
+    TestCaseOutput testCase1 = new TestCaseOutput().setName("test1");
+    submission.addTestCaseOutput(testCase1);
+
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    // When the user selects the second test case...
+    TestCaseOutputSelectedHandler handler = mock(TestCaseOutputSelectedHandler.class);
+    bus.register(handler);
+    listener.getValue().testCaseNameSelected(1);
+
+    // Then a TestCaseSelected event for that test case is published
+    ArgumentCaptor<TestCaseSelected> eventCaptor = ArgumentCaptor.forClass(TestCaseSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput(), equalTo(testCase1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
   @Test
   public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
@@ -40,4 +71,9 @@ public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
     verify(view).setSelectedTestCaseName(0);
 
   }
+
+  private interface TestCaseOutputSelectedHandler {
+    @Subscribe
+    public void handle(TestCaseSelected event);
+  }
 }

From a8cc11dc4e46d940dd3aaf922df941a07535f696 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 17:07:40 -0700
Subject: [PATCH 13/51] Begin the test case output presenter.

---
 .../cs410J/grader/scoring/TestCaseOutput.java | 30 ++++++++++++++++
 .../scoring/TestCaseOutputPresenter.java      | 22 ++++++++++++
 .../grader/scoring/TestCaseOutputView.java    |  9 +++++
 .../scoring/TestCaseOutputPresenterTest.java  | 35 +++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
index 39ea0bc5e..f05dcd895 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
@@ -2,6 +2,9 @@
 
 public class TestCaseOutput {
   private String name;
+  private String description;
+  private String command;
+  private String output;
 
   public TestCaseOutput setName(String name) {
     this.name = name;
@@ -11,4 +14,31 @@ public TestCaseOutput setName(String name) {
   public String getName() {
     return name;
   }
+
+  public TestCaseOutput setDescription(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public TestCaseOutput setCommand(String command) {
+    this.command = command;
+    return this;
+  }
+
+  public String getCommand() {
+    return command;
+  }
+
+  public TestCaseOutput setOutput(String output) {
+    this.output = output;
+    return this;
+  }
+
+  public String getOutput() {
+    return output;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
new file mode 100644
index 000000000..5982ac7e5
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -0,0 +1,22 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+public class TestCaseOutputPresenter extends PresenterOnEventBus {
+  private final TestCaseOutputView view;
+
+  public TestCaseOutputPresenter(EventBus bus, TestCaseOutputView view) {
+    super(bus);
+    this.view = view;
+  }
+
+  @Subscribe
+  public void populateViewWhenTestCaseSelected(TestCaseSelected selected) {
+    TestCaseOutput testCase = selected.getTestCaseOutput();
+    view.setCommand(testCase.getCommand());
+    view.setDescription(testCase.getDescription());
+    view.setOutput(testCase.getOutput());
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
new file mode 100644
index 000000000..206b47baa
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
@@ -0,0 +1,9 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public interface TestCaseOutputView {
+  void setDescription(String description);
+
+  void setCommand(String command);
+
+  void setOutput(String output);
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
new file mode 100644
index 000000000..f0b971a8d
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -0,0 +1,35 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class TestCaseOutputPresenterTest extends ProjectSubmissionTestCase {
+
+  private TestCaseOutputView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(TestCaseOutputView.class);
+    new TestCaseOutputPresenter(bus, view);
+  }
+
+  @Test
+  public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
+    String description = "My Test Case";
+    String command = "My Command";
+    String output = "My Output";
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setDescription(description)
+      .setCommand(command)
+      .setOutput(output);
+
+    this.bus.post(new TestCaseSelected(testCase));
+
+    verify(view).setDescription(description);
+    verify(view).setCommand(command);
+    verify(view).setOutput(output);
+  }
+}

From 9ba540372cebde0be59a22d2d361380dbb6502f8 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 18:30:53 -0700
Subject: [PATCH 14/51] Added a panel for the test case output to the UI.

---
 .../scoring/TestCaseOutputPresenter.java      |  4 ++
 .../scoring/ui/ProjectSubmissionScorer.java   | 25 +++++++++-
 .../ui/ProjectSubmissionScorerUIModule.java   |  7 ++-
 .../scoring/ui/TestCaseOutputPanel.java       | 46 +++++++++++++++++++
 4 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
index 5982ac7e5..c72f62b1d 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -2,11 +2,15 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
+@Singleton
 public class TestCaseOutputPresenter extends PresenterOnEventBus {
   private final TestCaseOutputView view;
 
+  @Inject
   public TestCaseOutputPresenter(EventBus bus, TestCaseOutputView view) {
     super(bus);
     this.view = view;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
index c2b056e75..ca2c9c83d 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
@@ -24,7 +24,8 @@ public class ProjectSubmissionScorer extends UIMain {
   private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionScorer.class);
 
   @Inject
-  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases) {
+  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
+                                 TestCaseOutputPanel testCaseOutput) {
     super(parent);
 
     parent.setTitle("Project Submission Scorer");
@@ -38,6 +39,8 @@ public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel su
     submissionsAndTestCases.add(testCases, BorderLayout.EAST);
 
     content.add(submissionsAndTestCases, BorderLayout.WEST);
+
+    content.add(testCaseOutput, BorderLayout.CENTER);
   }
 
   static void setLoggingLevelToDebug() {
@@ -71,7 +74,13 @@ private static List<ProjectSubmission> createProjectSubmissions() {
 
       for (int j = 0; j < 10; j++) {
         String testCaseName = studentId + "'s test " + j;
-        submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
+        TestCaseOutput testCaseOutput =
+          new TestCaseOutput()
+            .setName(testCaseName)
+            .setDescription("Test " + j + ": Test " + studentId + "'s " + projectName + " submission")
+            .setCommand("java -jar " + studentId + "/project.jar Test" + j)
+            .setOutput(generateOutput(studentId, j));
+        submission.addTestCaseOutput(testCaseOutput);
       }
 
       submissions.add(submission);
@@ -80,4 +89,16 @@ private static List<ProjectSubmission> createProjectSubmissions() {
     return submissions;
   }
 
+  private static String generateOutput(String studentId, int j) {
+    String output = "Output of " + studentId + "'s Test " + j;
+    if (j % 2 == 0) {
+      for (int i = 0; i < 100; i++) {
+        output += "\nq";
+      }
+
+    }
+
+    return output;
+  }
+
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
index 0cfa73d99..9fe63cdff 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -5,10 +5,7 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
-import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsPresenter;
-import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView;
-import edu.pdx.cs410J.grader.scoring.TestCasesPresenter;
-import edu.pdx.cs410J.grader.scoring.TestCasesView;
+import edu.pdx.cs410J.grader.scoring.*;
 
 public class ProjectSubmissionScorerUIModule extends AbstractModule {
   @Override
@@ -16,9 +13,11 @@ protected void configure() {
 
     bind(ProjectSubmissionsView.class).to(ProjectSubmissionsPanel.class);
     bind(TestCasesView.class).to(TestCasesPanel.class);
+    bind(TestCaseOutputView.class).to(TestCaseOutputPanel.class);
 
     bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
     bind(TestCasesPresenter.class).asEagerSingleton();
+    bind(TestCaseOutputPresenter.class).asEagerSingleton();
   }
 
   @Provides
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
new file mode 100644
index 000000000..b24e5efb9
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
@@ -0,0 +1,46 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView;
+
+import javax.swing.*;
+
+@Singleton
+public class TestCaseOutputPanel extends JPanel implements TestCaseOutputView {
+
+  private final JLabel description;
+  private final JLabel command;
+  private final JTextArea output;
+
+  public TestCaseOutputPanel() {
+    description = new JLabel();
+    description.setHorizontalAlignment(SwingConstants.CENTER);
+
+    command = new JLabel();
+
+    output = new JTextArea();
+    output.setEditable(false);
+
+    this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+
+    this.add(description);
+    this.add(Box.createVerticalStrut(5));
+    this.add(command);
+    this.add(new JScrollPane(output));
+  }
+
+  @Override
+  public void setDescription(String description) {
+    this.description.setText(description);
+  }
+
+  @Override
+  public void setCommand(String command) {
+    this.command.setText(command);
+  }
+
+  @Override
+  public void setOutput(String output) {
+    this.output.setText(output);
+  }
+}

From ee504fd2877930adb611c3bd409559e5b53cc63d Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 19:39:01 -0700
Subject: [PATCH 15/51] A presenter for viewing and editing a project
 submission's score.

---
 .../grader/scoring/ProjectSubmission.java     | 18 ++++
 .../ProjectSubmissionScorePresenter.java      | 56 +++++++++++
 .../scoring/ProjectSubmissionScoreView.java   | 15 +++
 .../ProjectSubmissionScorePresenterTest.java  | 94 +++++++++++++++++++
 4 files changed, 183 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index bf18aaa42..f91d61fd3 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -7,6 +7,8 @@ public class ProjectSubmission {
   private String projectName;
   private String studentId;
   private final List<TestCaseOutput> testCaseOutputs = new ArrayList<>();
+  private double totalPoints;
+  private Double score;
 
   public void setProjectName(String projectName) {
     this.projectName = projectName;
@@ -31,4 +33,20 @@ public void addTestCaseOutput(TestCaseOutput testCaseOutput) {
   public List<TestCaseOutput> getTestCaseOutputs() {
     return testCaseOutputs;
   }
+
+  public void setTotalPoints(double totalPoints) {
+    this.totalPoints = totalPoints;
+  }
+
+  public double getTotalPoints() {
+    return totalPoints;
+  }
+
+  public void setScore(Double score) {
+    this.score = score;
+  }
+
+  public Double getScore() {
+    return score;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
new file mode 100644
index 000000000..c38a3df03
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -0,0 +1,56 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.text.NumberFormat;
+
+public class ProjectSubmissionScorePresenter extends PresenterOnEventBus {
+  private final ProjectSubmissionScoreView view;
+  private final NumberFormat format;
+  private ProjectSubmission submission;
+
+  public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView view) {
+    super(bus);
+    this.view = view;
+
+    format = NumberFormat.getNumberInstance();
+    format.setMinimumFractionDigits(1);
+
+    this.view.addScoreChangedListener(this::setSubmissionScore);
+  }
+
+  private void setSubmissionScore(String score) {
+    Double value;
+    if ("".equals(score)) {
+      value = null;
+
+    } else {
+      try {
+        value = Double.parseDouble(score);
+
+      } catch (NumberFormatException ex) {
+        this.view.setScoreIsValid(false);
+        return;
+      }
+    }
+
+    this.submission.setScore(value);
+    this.view.setScoreIsValid(true);
+  }
+
+  @Subscribe
+  public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
+    submission = selected.getProjectSubmission();
+    Double score = submission.getScore();
+    if (score == null) {
+      this.view.setScore("");
+
+    } else {
+      this.view.setScore(format.format(score));
+    }
+
+    this.view.setTotalPoints(format.format(submission.getTotalPoints()));
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
new file mode 100644
index 000000000..02545877e
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
@@ -0,0 +1,15 @@
+package edu.pdx.cs410J.grader.scoring;
+
+interface ProjectSubmissionScoreView {
+  void setTotalPoints(String totalPoints);
+
+  void setScore(String score);
+
+  void addScoreChangedListener(ScoreChangedListener listener);
+
+  void setScoreIsValid(boolean scoreIsInvalid);
+
+  interface ScoreChangedListener {
+    void scoreChanged(String newScore);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
new file mode 100644
index 000000000..4aa5e0ba6
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -0,0 +1,94 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView.ScoreChangedListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class ProjectSubmissionScorePresenterTest extends ProjectSubmissionTestCase {
+
+  private ProjectSubmissionScoreView view;
+
+  @Override
+  public void setUp() {
+    super.setUp();
+    view = mock(ProjectSubmissionScoreView.class);
+    new ProjectSubmissionScorePresenter(bus, view);
+  }
+
+  @Test
+  public void viewIsPopulatedWhenSubmissionIsSelected() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(4.5);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTotalPoints("6.0");
+    verify(view).setScore("4.5");
+  }
+
+  @Test
+  public void submissionWithNoScoreDisplaysEmptyString() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    verify(view).setTotalPoints("6.0");
+    verify(view).setScore("");
+  }
+
+  @Test
+  public void enteringValidScoreUpdatesSubmissionScore() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("5.0");
+
+    verify(view).setScoreIsValid(true);
+    assertThat(submission.getScore(), equalTo(5.0));
+  }
+
+  @Test
+  public void enteringInvalidScorePutsPresenterInErrorState() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("qq");
+
+    verify(view).setScoreIsValid(false);
+
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void enteringEmptyScoreClearsScore() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    listener.getValue().scoreChanged("");
+
+    verify(view).setScoreIsValid(true);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+}

From d5297e6fbb5b8dd5c0f7a692379407a5c410ab3e Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 20:14:28 -0700
Subject: [PATCH 16/51] Added a UI for displaying the score of a project
 submission.  Also added some better error checking for the score entered by
 the Grader.

---
 .../ProjectSubmissionScorePresenter.java      | 39 ++++++++++---
 .../scoring/ProjectSubmissionScoreView.java   |  2 +-
 .../ui/ProjectSubmissionScorePanel.java       | 56 +++++++++++++++++++
 .../scoring/ui/ProjectSubmissionScorer.java   | 12 ++--
 .../ui/ProjectSubmissionScorerUIModule.java   |  2 +
 .../ProjectSubmissionScorePresenterTest.java  | 39 ++++++++++++-
 6 files changed, 136 insertions(+), 14 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index c38a3df03..24a6ac7fb 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -2,15 +2,19 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.text.NumberFormat;
 
+@Singleton
 public class ProjectSubmissionScorePresenter extends PresenterOnEventBus {
   private final ProjectSubmissionScoreView view;
   private final NumberFormat format;
   private ProjectSubmission submission;
 
+  @Inject
   public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView view) {
     super(bus);
     this.view = view;
@@ -22,22 +26,34 @@ public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView
   }
 
   private void setSubmissionScore(String score) {
-    Double value;
+    try {
+      Double value = getValidScoreValue(score);
+      this.submission.setScore(value);
+      this.view.setScoreIsValid(true);
+
+    } catch (InvalidScoreValue invalidScoreValue) {
+      this.view.setScoreIsValid(false);
+    }
+  }
+
+  private Double getValidScoreValue(String score) throws InvalidScoreValue {
     if ("".equals(score)) {
-      value = null;
+      return null;
 
     } else {
       try {
-        value = Double.parseDouble(score);
+        Double value = Double.parseDouble(score);
+        if (value >= 0.0 && value <= this.submission.getTotalPoints()) {
+          return value;
+
+        } else {
+          throw new InvalidScoreValue(score);
+        }
 
       } catch (NumberFormatException ex) {
-        this.view.setScoreIsValid(false);
-        return;
+        throw new InvalidScoreValue(score);
       }
     }
-
-    this.submission.setScore(value);
-    this.view.setScoreIsValid(true);
   }
 
   @Subscribe
@@ -50,7 +66,14 @@ public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selec
     } else {
       this.view.setScore(format.format(score));
     }
+    this.view.setScoreIsValid(true);
 
     this.view.setTotalPoints(format.format(submission.getTotalPoints()));
   }
+
+  private class InvalidScoreValue extends Exception {
+    public InvalidScoreValue(String score) {
+      super(score);
+    }
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
index 02545877e..25376deab 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
@@ -1,6 +1,6 @@
 package edu.pdx.cs410J.grader.scoring;
 
-interface ProjectSubmissionScoreView {
+public interface ProjectSubmissionScoreView {
   void setTotalPoints(String totalPoints);
 
   void setScore(String score);
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
new file mode 100644
index 000000000..2194a298a
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
@@ -0,0 +1,56 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+
+@Singleton
+public class ProjectSubmissionScorePanel extends JPanel implements ProjectSubmissionScoreView {
+  private final JLabel totalPoints;
+  private final JTextField score;
+
+  public ProjectSubmissionScorePanel() {
+    totalPoints = new JLabel();
+    score = new JTextField(3);
+
+    this.add(new JLabel("Total score for submission:"));
+    this.add(score);
+    this.add(new JLabel("out of"));
+    this.add(totalPoints);
+  }
+
+  @Override
+  public void setTotalPoints(String totalPoints) {
+    this.totalPoints.setText(totalPoints);
+  }
+
+  @Override
+  public void setScore(String score) {
+    this.score.setText(score);
+  }
+
+  @Override
+  public void addScoreChangedListener(ScoreChangedListener listener) {
+    this.score.addActionListener(e -> listener.scoreChanged(score.getText()));
+    this.score.addFocusListener(new FocusAdapter() {
+      @Override
+      public void focusLost(FocusEvent e) {
+        listener.scoreChanged(score.getText());
+      }
+    });
+  }
+
+  @Override
+  public void setScoreIsValid(boolean scoreIsValid) {
+    if (scoreIsValid) {
+      this.score.setBorder(BorderFactory.createEmptyBorder());
+
+    } else {
+      this.score.setBorder(BorderFactory.createLineBorder(Color.red, 2));
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
index ca2c9c83d..8362b4ca0 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
@@ -25,7 +25,7 @@ public class ProjectSubmissionScorer extends UIMain {
 
   @Inject
   public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
-                                 TestCaseOutputPanel testCaseOutput) {
+                                 TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score) {
     super(parent);
 
     parent.setTitle("Project Submission Scorer");
@@ -33,14 +33,17 @@ public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel su
     Container content = parent.getContentPane();
     content.setLayout(new BorderLayout());
 
-    JPanel submissionsAndTestCases = new JPanel();
-    submissionsAndTestCases.setLayout(new BorderLayout());
+    JPanel submissionsAndTestCases = new JPanel(new BorderLayout());
     submissionsAndTestCases.add(submissions, BorderLayout.WEST);
     submissionsAndTestCases.add(testCases, BorderLayout.EAST);
 
     content.add(submissionsAndTestCases, BorderLayout.WEST);
 
-    content.add(testCaseOutput, BorderLayout.CENTER);
+    JPanel scoreAndOutput = new JPanel(new BorderLayout());
+    scoreAndOutput.add(score, BorderLayout.NORTH);
+    scoreAndOutput.add(testCaseOutput, BorderLayout.CENTER);
+
+    content.add(scoreAndOutput, BorderLayout.CENTER);
   }
 
   static void setLoggingLevelToDebug() {
@@ -71,6 +74,7 @@ private static List<ProjectSubmission> createProjectSubmissions() {
       ProjectSubmission submission = new ProjectSubmission();
       submission.setProjectName(projectName);
       submission.setStudentId(studentId);
+      submission.setTotalPoints(8.0);
 
       for (int j = 0; j < 10; j++) {
         String testCaseName = studentId + "'s test " + j;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
index 9fe63cdff..fbf8adf1a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -14,10 +14,12 @@ protected void configure() {
     bind(ProjectSubmissionsView.class).to(ProjectSubmissionsPanel.class);
     bind(TestCasesView.class).to(TestCasesPanel.class);
     bind(TestCaseOutputView.class).to(TestCaseOutputPanel.class);
+    bind(ProjectSubmissionScoreView.class).to(ProjectSubmissionScorePanel.class);
 
     bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
     bind(TestCasesPresenter.class).asEagerSingleton();
     bind(TestCaseOutputPresenter.class).asEagerSingleton();
+    bind(ProjectSubmissionScorePresenter.class).asEagerSingleton();
   }
 
   @Provides
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
index 4aa5e0ba6..5df24328f 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -7,6 +7,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 public class ProjectSubmissionScorePresenterTest extends ProjectSubmissionTestCase {
@@ -29,6 +30,7 @@ public void viewIsPopulatedWhenSubmissionIsSelected() {
 
     verify(view).setTotalPoints("6.0");
     verify(view).setScore("4.5");
+    verify(view).setScoreIsValid(true);
   }
 
   @Test
@@ -54,7 +56,7 @@ public void enteringValidScoreUpdatesSubmissionScore() {
 
     listener.getValue().scoreChanged("5.0");
 
-    verify(view).setScoreIsValid(true);
+    verify(view, times(2)).setScoreIsValid(true);
     assertThat(submission.getScore(), equalTo(5.0));
   }
 
@@ -87,8 +89,43 @@ public void enteringEmptyScoreClearsScore() {
 
     listener.getValue().scoreChanged("");
 
+    verify(view, times(2)).setScoreIsValid(true);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void negativeScoreIsInvalid() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+
+    listener.getValue().scoreChanged("-1.0");
+
+    verify(view).setScoreIsValid(false);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Test
+  public void scoreGreaterThanTotalIsInvalid() {
+    ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
+    verify(view).addScoreChangedListener(listener.capture());
+
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
     verify(view).setScoreIsValid(true);
+
+    listener.getValue().scoreChanged("7.0");
+
+    verify(view).setScoreIsValid(false);
     assertThat(submission.getScore(), equalTo(null));
   }
 
+
 }

From 4292f5c1b78075cd0c036c27b97d88d3f401df14 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 20:49:18 -0700
Subject: [PATCH 17/51] Add points deducted to test case output presenter.

---
 .../ProjectSubmissionScorePresenter.java        |  9 +--------
 .../cs410J/grader/scoring/ScorePresenter.java   | 17 +++++++++++++++++
 .../cs410J/grader/scoring/TestCaseOutput.java   | 10 ++++++++++
 .../grader/scoring/TestCaseOutputPresenter.java | 11 +++++++++--
 .../grader/scoring/TestCaseOutputView.java      |  2 ++
 .../grader/scoring/ui/TestCaseOutputPanel.java  |  5 +++++
 .../scoring/TestCaseOutputPresenterTest.java    | 14 +++++++++++++-
 7 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index 24a6ac7fb..1fda222bb 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -4,14 +4,10 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
-
-import java.text.NumberFormat;
 
 @Singleton
-public class ProjectSubmissionScorePresenter extends PresenterOnEventBus {
+public class ProjectSubmissionScorePresenter extends ScorePresenter {
   private final ProjectSubmissionScoreView view;
-  private final NumberFormat format;
   private ProjectSubmission submission;
 
   @Inject
@@ -19,9 +15,6 @@ public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView
     super(bus);
     this.view = view;
 
-    format = NumberFormat.getNumberInstance();
-    format.setMinimumFractionDigits(1);
-
     this.view.addScoreChangedListener(this::setSubmissionScore);
   }
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
new file mode 100644
index 000000000..aac2cd3b6
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
@@ -0,0 +1,17 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.EventBus;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+
+import java.text.NumberFormat;
+
+public abstract class ScorePresenter extends PresenterOnEventBus {
+  protected final NumberFormat format;
+
+  public ScorePresenter(EventBus bus) {
+    super(bus);
+
+    format = NumberFormat.getNumberInstance();
+    format.setMinimumFractionDigits(1);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
index f05dcd895..743608f6f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
@@ -5,6 +5,7 @@ public class TestCaseOutput {
   private String description;
   private String command;
   private String output;
+  private Double pointsDeducted;
 
   public TestCaseOutput setName(String name) {
     this.name = name;
@@ -41,4 +42,13 @@ public TestCaseOutput setOutput(String output) {
   public String getOutput() {
     return output;
   }
+
+  public TestCaseOutput setPointsDeducted(Double pointsDeducted) {
+    this.pointsDeducted = pointsDeducted;
+    return this;
+  }
+
+  public Double getPointsDeducted() {
+    return pointsDeducted;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
index c72f62b1d..1a5e55b85 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -4,10 +4,9 @@
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 @Singleton
-public class TestCaseOutputPresenter extends PresenterOnEventBus {
+public class TestCaseOutputPresenter extends ScorePresenter {
   private final TestCaseOutputView view;
 
   @Inject
@@ -22,5 +21,13 @@ public void populateViewWhenTestCaseSelected(TestCaseSelected selected) {
     view.setCommand(testCase.getCommand());
     view.setDescription(testCase.getDescription());
     view.setOutput(testCase.getOutput());
+
+    Double pointsDeducted = testCase.getPointsDeducted();
+    if (pointsDeducted == null) {
+      view.setPointsDeducted("");
+
+    } else {
+      view.setPointsDeducted(format.format(pointsDeducted));
+    }
   }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
index 206b47baa..ec5661642 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
@@ -6,4 +6,6 @@ public interface TestCaseOutputView {
   void setCommand(String command);
 
   void setOutput(String output);
+
+  void setPointsDeducted(String pointsDeducted);
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
index b24e5efb9..e9b780715 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
@@ -43,4 +43,9 @@ public void setCommand(String command) {
   public void setOutput(String output) {
     this.output.setText(output);
   }
+
+  @Override
+  public void setPointsDeducted(String pointsDeducted) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
index f0b971a8d..8a69114ba 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -24,12 +24,24 @@ public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
     TestCaseOutput testCase = new TestCaseOutput()
       .setDescription(description)
       .setCommand(command)
-      .setOutput(output);
+      .setOutput(output)
+      .setPointsDeducted(null);
 
     this.bus.post(new TestCaseSelected(testCase));
 
     verify(view).setDescription(description);
     verify(view).setCommand(command);
     verify(view).setOutput(output);
+    verify(view).setPointsDeducted("");
+  }
+
+  @Test
+  public void pointDeductedAreDisplayedInView() {
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setPointsDeducted(0.5);
+
+    this.bus.post(new TestCaseSelected(testCase));
+
+    verify(view).setPointsDeducted("0.5");
   }
 }

From 8accbf8c963c93185061ba4b1d9332ecd355c490 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 21:22:14 -0700
Subject: [PATCH 18/51] Added points deducted and Grader comment to the test
 case output presenter.

---
 .../ProjectSubmissionScorePresenter.java      | 28 ++--------
 .../cs410J/grader/scoring/ScorePresenter.java | 28 ++++++++++
 .../cs410J/grader/scoring/TestCaseOutput.java | 10 ++++
 .../scoring/TestCaseOutputPresenter.java      | 29 +++++++++-
 .../grader/scoring/TestCaseOutputView.java    | 16 ++++++
 .../scoring/ui/TestCaseOutputPanel.java       | 20 +++++++
 .../scoring/TestCaseOutputPresenterTest.java  | 54 ++++++++++++++++++-
 7 files changed, 158 insertions(+), 27 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index 1fda222bb..baa03bf1b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -24,29 +24,14 @@ private void setSubmissionScore(String score) {
       this.submission.setScore(value);
       this.view.setScoreIsValid(true);
 
-    } catch (InvalidScoreValue invalidScoreValue) {
+    } catch (InvalidScoreValue ex) {
       this.view.setScoreIsValid(false);
     }
   }
 
-  private Double getValidScoreValue(String score) throws InvalidScoreValue {
-    if ("".equals(score)) {
-      return null;
-
-    } else {
-      try {
-        Double value = Double.parseDouble(score);
-        if (value >= 0.0 && value <= this.submission.getTotalPoints()) {
-          return value;
-
-        } else {
-          throw new InvalidScoreValue(score);
-        }
-
-      } catch (NumberFormatException ex) {
-        throw new InvalidScoreValue(score);
-      }
-    }
+  @Override
+  protected boolean isScoreInValidRange(Double score) {
+    return score >= 0.0 && score <= this.submission.getTotalPoints();
   }
 
   @Subscribe
@@ -64,9 +49,4 @@ public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selec
     this.view.setTotalPoints(format.format(submission.getTotalPoints()));
   }
 
-  private class InvalidScoreValue extends Exception {
-    public InvalidScoreValue(String score) {
-      super(score);
-    }
-  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
index aac2cd3b6..ca12cb1f5 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ScorePresenter.java
@@ -14,4 +14,32 @@ public ScorePresenter(EventBus bus) {
     format = NumberFormat.getNumberInstance();
     format.setMinimumFractionDigits(1);
   }
+
+  protected Double getValidScoreValue(String score) throws InvalidScoreValue {
+    if ("".equals(score)) {
+      return null;
+
+    } else {
+      try {
+        Double value = Double.parseDouble(score);
+        if (isScoreInValidRange(value)) {
+          return value;
+
+        } else {
+          throw new InvalidScoreValue(score);
+        }
+
+      } catch (NumberFormatException ex) {
+        throw new InvalidScoreValue(score);
+      }
+    }
+  }
+
+  protected abstract boolean isScoreInValidRange(Double score);
+
+  protected class InvalidScoreValue extends Exception {
+    public InvalidScoreValue(String score) {
+      super(score);
+    }
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
index 743608f6f..17eaee522 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutput.java
@@ -6,6 +6,7 @@ public class TestCaseOutput {
   private String command;
   private String output;
   private Double pointsDeducted;
+  private String graderComment;
 
   public TestCaseOutput setName(String name) {
     this.name = name;
@@ -51,4 +52,13 @@ public TestCaseOutput setPointsDeducted(Double pointsDeducted) {
   public Double getPointsDeducted() {
     return pointsDeducted;
   }
+
+  public TestCaseOutput setGraderComment(String graderComment) {
+    this.graderComment = graderComment;
+    return this;
+  }
+
+  public String getGraderComment() {
+    return graderComment;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
index 1a5e55b85..c0e4b7114 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -8,19 +8,40 @@
 @Singleton
 public class TestCaseOutputPresenter extends ScorePresenter {
   private final TestCaseOutputView view;
+  private TestCaseOutput testCase;
 
   @Inject
   public TestCaseOutputPresenter(EventBus bus, TestCaseOutputView view) {
     super(bus);
     this.view = view;
+
+    this.view.addPointsDeductedChangeListener(this::setPointsDeducted);
+    this.view.addGraderCommentChangeListener(this::storeGraderComment);
+  }
+
+  private void setPointsDeducted(String pointsDeducted) {
+    try {
+      Double value = getValidScoreValue(pointsDeducted);
+      this.testCase.setPointsDeducted(value);
+      this.view.setPointsDeductedIsValid(true);
+
+    } catch (InvalidScoreValue ex) {
+      this.view.setPointsDeductedIsValid(false);
+    }
+
+  }
+
+  private void storeGraderComment(String comment) {
+    this.testCase.setGraderComment(comment);
   }
 
   @Subscribe
   public void populateViewWhenTestCaseSelected(TestCaseSelected selected) {
-    TestCaseOutput testCase = selected.getTestCaseOutput();
+    testCase = selected.getTestCaseOutput();
     view.setCommand(testCase.getCommand());
     view.setDescription(testCase.getDescription());
     view.setOutput(testCase.getOutput());
+    view.setGraderComment(testCase.getGraderComment());
 
     Double pointsDeducted = testCase.getPointsDeducted();
     if (pointsDeducted == null) {
@@ -29,5 +50,11 @@ public void populateViewWhenTestCaseSelected(TestCaseSelected selected) {
     } else {
       view.setPointsDeducted(format.format(pointsDeducted));
     }
+    view.setPointsDeductedIsValid(true);
+  }
+
+  @Override
+  protected boolean isScoreInValidRange(Double score) {
+    return score > 0.0;
   }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
index ec5661642..62dea5a8e 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputView.java
@@ -8,4 +8,20 @@ public interface TestCaseOutputView {
   void setOutput(String output);
 
   void setPointsDeducted(String pointsDeducted);
+
+  void addGraderCommentChangeListener(GraderCommentChangeListener listener);
+
+  void setGraderComment(String comment);
+
+  void addPointsDeductedChangeListener(PointsDeductedChangeListener listener);
+
+  void setPointsDeductedIsValid(boolean isValidPointsDeducted);
+
+  interface GraderCommentChangeListener {
+    void onGraderCommentChange(String comment);
+  }
+
+  interface PointsDeductedChangeListener {
+    void onPointsDeductedChange(String pointsDeducted);
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
index e9b780715..b0a5045b0 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
@@ -48,4 +48,24 @@ public void setOutput(String output) {
   public void setPointsDeducted(String pointsDeducted) {
     throw new UnsupportedOperationException("This method is not implemented yet");
   }
+
+  @Override
+  public void addGraderCommentChangeListener(GraderCommentChangeListener listener) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
+  @Override
+  public void setGraderComment(String comment) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
+  @Override
+  public void addPointsDeductedChangeListener(PointsDeductedChangeListener listener) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
+  @Override
+  public void setPointsDeductedIsValid(boolean isValidPointsDeducted) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
index 8a69114ba..66b618e35 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -1,7 +1,12 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.GraderCommentChangeListener;
+import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.PointsDeductedChangeListener;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -21,11 +26,13 @@ public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
     String description = "My Test Case";
     String command = "My Command";
     String output = "My Output";
+    String comment = "My Grader Comment";
     TestCaseOutput testCase = new TestCaseOutput()
       .setDescription(description)
       .setCommand(command)
       .setOutput(output)
-      .setPointsDeducted(null);
+      .setPointsDeducted(null)
+      .setGraderComment(comment);
 
     this.bus.post(new TestCaseSelected(testCase));
 
@@ -33,15 +40,58 @@ public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
     verify(view).setCommand(command);
     verify(view).setOutput(output);
     verify(view).setPointsDeducted("");
+    verify(view).setGraderComment(comment);
   }
 
   @Test
-  public void pointDeductedAreDisplayedInView() {
+  public void pointsDeductedAreDisplayedInView() {
     TestCaseOutput testCase = new TestCaseOutput()
       .setPointsDeducted(0.5);
 
     this.bus.post(new TestCaseSelected(testCase));
 
+    verify(view).setPointsDeductedIsValid(true);
     verify(view).setPointsDeducted("0.5");
   }
+
+  @Test
+  public void invalidPointsDeductedPutViewInErrorState() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+
+    String invalidPoints = "QQ";
+    listener.getValue().onPointsDeductedChange(invalidPoints);
+
+    verify(view).setPointsDeductedIsValid(false);
+  }
+
+  @Test
+  public void negativePointsDeductedPutViewInErrorState() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+
+    String invalidPoints = "-1.0";
+    listener.getValue().onPointsDeductedChange(invalidPoints);
+
+    verify(view).setPointsDeductedIsValid(false);
+  }
+
+  @Test
+  public void graderCommentIsSavedInTestCaseOutput() {
+    ArgumentCaptor<GraderCommentChangeListener> listener = ArgumentCaptor.forClass(GraderCommentChangeListener.class);
+    verify(view).addGraderCommentChangeListener(listener.capture());
+
+    TestCaseOutput testCase = new TestCaseOutput();
+
+    this.bus.post(new TestCaseSelected(testCase));
+
+    String comment = "My new comment";
+    listener.getValue().onGraderCommentChange(comment);
+
+    assertThat(testCase.getGraderComment(), equalTo(comment));
+  }
 }

From d550bf0941ae192cc2d240e2cddd0dc676778d3a Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 21:46:40 -0700
Subject: [PATCH 19/51] Added UI for points deducted and grader comments. 
 Along the way, refactored some common field validation code.

---
 .../ui/ProjectSubmissionScorePanel.java       | 21 ++--------
 .../cs410J/grader/scoring/ui/ScorePanel.java  | 28 +++++++++++++
 .../scoring/ui/TestCaseOutputPanel.java       | 42 ++++++++++++++-----
 3 files changed, 63 insertions(+), 28 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
index 2194a298a..cf4382c95 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
@@ -4,12 +4,9 @@
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView;
 
 import javax.swing.*;
-import java.awt.*;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
 
 @Singleton
-public class ProjectSubmissionScorePanel extends JPanel implements ProjectSubmissionScoreView {
+public class ProjectSubmissionScorePanel extends ScorePanel implements ProjectSubmissionScoreView {
   private final JLabel totalPoints;
   private final JTextField score;
 
@@ -35,22 +32,12 @@ public void setScore(String score) {
 
   @Override
   public void addScoreChangedListener(ScoreChangedListener listener) {
-    this.score.addActionListener(e -> listener.scoreChanged(score.getText()));
-    this.score.addFocusListener(new FocusAdapter() {
-      @Override
-      public void focusLost(FocusEvent e) {
-        listener.scoreChanged(score.getText());
-      }
-    });
+    registerListenerOnTextFieldChange(this.score, listener::scoreChanged);
   }
 
   @Override
   public void setScoreIsValid(boolean scoreIsValid) {
-    if (scoreIsValid) {
-      this.score.setBorder(BorderFactory.createEmptyBorder());
-
-    } else {
-      this.score.setBorder(BorderFactory.createLineBorder(Color.red, 2));
-    }
+    setBorderBasedOnValidity(this.score, scoreIsValid);
   }
+
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java
new file mode 100644
index 000000000..48af8d1bb
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ScorePanel.java
@@ -0,0 +1,28 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.util.function.Consumer;
+
+public abstract class ScorePanel extends JPanel {
+  protected void registerListenerOnTextFieldChange(final JTextField field, final Consumer<String> consume) {
+    field.addActionListener(e -> consume.accept(field.getText()));
+    field.addFocusListener(new FocusAdapter() {
+      @Override
+      public void focusLost(FocusEvent e) {
+        consume.accept(field.getText());
+      }
+    });
+  }
+
+  protected void setBorderBasedOnValidity(JTextField field, boolean isValid) {
+    if (isValid) {
+      field.setBorder(BorderFactory.createEmptyBorder());
+
+    } else {
+      field.setBorder(BorderFactory.createLineBorder(Color.red, 2));
+    }
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
index b0a5045b0..8b95e2b60 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCaseOutputPanel.java
@@ -4,13 +4,16 @@
 import edu.pdx.cs410J.grader.scoring.TestCaseOutputView;
 
 import javax.swing.*;
+import java.awt.*;
 
 @Singleton
-public class TestCaseOutputPanel extends JPanel implements TestCaseOutputView {
+public class TestCaseOutputPanel extends ScorePanel implements TestCaseOutputView {
 
   private final JLabel description;
   private final JLabel command;
   private final JTextArea output;
+  private final JTextField pointsDeducted;
+  private final JTextField graderComment;
 
   public TestCaseOutputPanel() {
     description = new JLabel();
@@ -21,12 +24,29 @@ public TestCaseOutputPanel() {
     output = new JTextArea();
     output.setEditable(false);
 
-    this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+    pointsDeducted = new JTextField(3);
+    graderComment = new JTextField(20);
 
-    this.add(description);
-    this.add(Box.createVerticalStrut(5));
-    this.add(command);
-    this.add(new JScrollPane(output));
+
+    this.setLayout(new BorderLayout());
+
+    JPanel north = new JPanel();
+    north.setLayout(new BoxLayout(north, BoxLayout.PAGE_AXIS));
+    north.add(description);
+    north.add(Box.createVerticalStrut(5));
+    north.add(command);
+    this.add(north, BorderLayout.NORTH);
+
+    this.add(new JScrollPane(output), BorderLayout.CENTER);
+
+    JPanel feedback = new JPanel();
+    feedback.setLayout(new BoxLayout(feedback, BoxLayout.LINE_AXIS));
+    feedback.add(new JLabel("Points Deducted: "));
+    feedback.add(pointsDeducted);
+    feedback.add(new JLabel("Grader Comment: "));
+    feedback.add(graderComment);
+
+    this.add(feedback, BorderLayout.SOUTH);
   }
 
   @Override
@@ -46,26 +66,26 @@ public void setOutput(String output) {
 
   @Override
   public void setPointsDeducted(String pointsDeducted) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    this.pointsDeducted.setText(pointsDeducted);
   }
 
   @Override
   public void addGraderCommentChangeListener(GraderCommentChangeListener listener) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    registerListenerOnTextFieldChange(this.graderComment, listener::onGraderCommentChange);
   }
 
   @Override
   public void setGraderComment(String comment) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    this.graderComment.setText(comment);
   }
 
   @Override
   public void addPointsDeductedChangeListener(PointsDeductedChangeListener listener) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    registerListenerOnTextFieldChange(this.pointsDeducted, listener::onPointsDeductedChange);
   }
 
   @Override
   public void setPointsDeductedIsValid(boolean isValidPointsDeducted) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    setBorderBasedOnValidity(this.pointsDeducted, isValidPointsDeducted);
   }
 }

From 4b63738d4083b90f1c6bcd2c89b9cbc8bbeb8e66 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 22:01:06 -0700
Subject: [PATCH 20/51] Public an update event when points are deducted from a
 test case output.

---
 .../scoring/TestCaseOutputPresenter.java      |  2 ++
 .../grader/scoring/TestCaseOutputUpdated.java | 15 +++++++++++
 .../scoring/TestCaseOutputPresenterTest.java  | 25 +++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
index c0e4b7114..0417be8f5 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenter.java
@@ -23,6 +23,8 @@ private void setPointsDeducted(String pointsDeducted) {
     try {
       Double value = getValidScoreValue(pointsDeducted);
       this.testCase.setPointsDeducted(value);
+      publishEvent(new TestCaseOutputUpdated(this.testCase));
+
       this.view.setPointsDeductedIsValid(true);
 
     } catch (InvalidScoreValue ex) {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java
new file mode 100644
index 000000000..4a0876de4
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputUpdated.java
@@ -0,0 +1,15 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class TestCaseOutputUpdated {
+
+  private final TestCaseOutput testCaseOutput;
+
+  public TestCaseOutputUpdated(TestCaseOutput testCase) {
+    this.testCaseOutput = testCase;
+
+  }
+
+  public TestCaseOutput getTestCaseOutput() {
+    return testCaseOutput;
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
index 66b618e35..db1bf88ac 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -1,5 +1,6 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.GraderCommentChangeListener;
 import edu.pdx.cs410J.grader.scoring.TestCaseOutputView.PointsDeductedChangeListener;
 import org.junit.Test;
@@ -9,6 +10,7 @@
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 public class TestCaseOutputPresenterTest extends ProjectSubmissionTestCase {
 
@@ -94,4 +96,27 @@ public void graderCommentIsSavedInTestCaseOutput() {
 
     assertThat(testCase.getGraderComment(), equalTo(comment));
   }
+
+  @Test
+  public void deductingPublishesTestCaseOutputUpdatedEvent() {
+    ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
+    verify(view).addPointsDeductedChangeListener(listener.capture());
+
+    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+
+    TestCaseOutputUpdatedHandler handler = mock(TestCaseOutputUpdatedHandler.class);
+    bus.register(handler);
+    listener.getValue().onPointsDeductedChange("2.0");
+
+    ArgumentCaptor<TestCaseOutputUpdated> eventCaptor = ArgumentCaptor.forClass(TestCaseOutputUpdated.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput().getPointsDeducted(), equalTo(2.0));
+
+    verifyNoMoreInteractions(handler);
+  }
+
+  interface TestCaseOutputUpdatedHandler {
+    @Subscribe
+    void handle(TestCaseOutputUpdated event);
+  }
 }

From 1c3146ff1b5e078b8a07a2d026defc5189236ceb Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 22:12:35 -0700
Subject: [PATCH 21/51] Display the number of points deducted in the test case
 list.

---
 .../grader/scoring/TestCasesPresenter.java      | 17 ++++++++++++++++-
 .../grader/scoring/TestCasesPresenterTest.java  | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index ca10c48d6..93a058fed 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -1,5 +1,6 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
@@ -30,9 +31,23 @@ private void publishTestCaseNameSelectedEvent(int index) {
   @Subscribe
   public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
     testCaseOutputs = selected.getProjectSubmission().getTestCaseOutputs();
-    List<String> testCaseNames = testCaseOutputs.stream().map(TestCaseOutput::getName).collect(Collectors.toList());
+    List<String> testCaseNames = testCaseOutputs.stream().map(this::getDisplay).collect(Collectors.toList());
     view.setTestCaseNames(testCaseNames);
 
     view.setSelectedTestCaseName(0);
   }
+
+  private String getDisplay(TestCaseOutput testCase) {
+    return formatTestCase(testCase.getName(), testCase.getPointsDeducted());
+  }
+
+  @VisibleForTesting
+  static String formatTestCase(String testCaseName, Double pointsDeducted) {
+    if (pointsDeducted == null || pointsDeducted == 0.0) {
+      return testCaseName;
+
+    } else {
+      return testCaseName + " (-" + pointsDeducted + ")";
+    }
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index 3b2c20c47..c2add044e 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -72,6 +72,22 @@ public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
 
   }
 
+  @Test
+  public void pointsDeductedIsDisplayedInView() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    String testCaseName = "Test 1";
+    double pointsDeducted = 0.5;
+    TestCaseOutput testCase = new TestCaseOutput()
+      .setName(testCaseName)
+      .setPointsDeducted(pointsDeducted);
+    submission.addTestCaseOutput(testCase);
+
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    String expected = TestCasesPresenter.formatTestCase(testCaseName, pointsDeducted);
+    verify(view).setTestCaseNames(Collections.singletonList(expected));
+  }
+
   private interface TestCaseOutputSelectedHandler {
     @Subscribe
     public void handle(TestCaseSelected event);

From 5402d3087a49b293209c9e852188d1ec46b546b9 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 22 Jul 2017 22:35:02 -0700
Subject: [PATCH 22/51] Update the list of test cases when points are deducted
 from a test case.

---
 .../grader/scoring/TestCasesPresenter.java    | 17 +++++++++++--
 .../grader/scoring/ui/TestCasesPanel.java     |  1 +
 .../scoring/TestCasesPresenterTest.java       | 25 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index 93a058fed..c53eb1f75 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -31,16 +31,29 @@ private void publishTestCaseNameSelectedEvent(int index) {
   @Subscribe
   public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selected) {
     testCaseOutputs = selected.getProjectSubmission().getTestCaseOutputs();
-    List<String> testCaseNames = testCaseOutputs.stream().map(this::getDisplay).collect(Collectors.toList());
-    view.setTestCaseNames(testCaseNames);
+    setTestCaseNamesInView();
 
     view.setSelectedTestCaseName(0);
   }
 
+  private void setTestCaseNamesInView() {
+    List<String> testCaseNames = testCaseOutputs.stream().map(this::getDisplay).collect(Collectors.toList());
+    view.setTestCaseNames(testCaseNames);
+  }
+
   private String getDisplay(TestCaseOutput testCase) {
     return formatTestCase(testCase.getName(), testCase.getPointsDeducted());
   }
 
+  @Subscribe
+  public void repopulateViewWhenTestCaseOutputIsUpdated(TestCaseOutputUpdated update) {
+    int index = this.testCaseOutputs.indexOf(update.getTestCaseOutput());
+    if (index >= 0) {
+      setTestCaseNamesInView();
+      this.view.setSelectedTestCaseName(index);
+    }
+  }
+
   @VisibleForTesting
   static String formatTestCase(String testCaseName, Double pointsDeducted) {
     if (pointsDeducted == null || pointsDeducted == 0.0) {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
index 22642e609..e21c47562 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -24,6 +24,7 @@ public TestCasesPanel() {
   @Override
   public void setTestCaseNames(List<String> testCaseNames) {
     this.testCaseNames.setListData(new Vector<>(testCaseNames));
+    this.updateUI();
   }
 
   @Override
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index c2add044e..4d6198a98 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -5,6 +5,7 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import java.util.Arrays;
 import java.util.Collections;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -88,6 +89,30 @@ public void pointsDeductedIsDisplayedInView() {
     verify(view).setTestCaseNames(Collections.singletonList(expected));
   }
 
+  @Test
+  public void viewIsUpdatedWhenPointsAreDeducted() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+
+    String testName0 = "Test 0";
+    submission.addTestCaseOutput(new TestCaseOutput().setName(testName0));
+    String testName1 = "Test 1";
+    TestCaseOutput testCase1 = new TestCaseOutput().setName(testName1);
+    assertThat(testCase1.getPointsDeducted(), equalTo(null));
+    submission.addTestCaseOutput(testCase1);
+
+    this.bus.post(new ProjectSubmissionSelected(submission));
+    verify(view).setTestCaseNames(Arrays.asList(testName0, testName1));
+    verify(view).setSelectedTestCaseName(0);
+
+    double pointsDeducted = 0.5;
+    testCase1.setPointsDeducted(pointsDeducted);
+    this.bus.post(new TestCaseOutputUpdated(testCase1));
+
+    String expected = TestCasesPresenter.formatTestCase(testName1, pointsDeducted);
+    verify(view).setTestCaseNames(Arrays.asList(testName0, expected));
+    verify(view).setSelectedTestCaseName(1);
+  }
+
   private interface TestCaseOutputSelectedHandler {
     @Subscribe
     public void handle(TestCaseSelected event);

From 5e825e4bace14657d2d116c5eb92189498482679 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 15:57:40 -0700
Subject: [PATCH 23/51] Publish a message when the submission score is saved.

---
 .../ProjectSubmissionScorePresenter.java      | 12 ++--
 .../scoring/ProjectSubmissionScoreSaved.java  | 13 ++++
 .../scoring/ProjectSubmissionScoreView.java   |  6 ++
 .../ui/ProjectSubmissionScorePanel.java       |  5 ++
 .../ProjectSubmissionScorePresenterTest.java  | 67 +++++++++++++++----
 5 files changed, 85 insertions(+), 18 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index baa03bf1b..8908f5350 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -16,6 +16,12 @@ public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView
     this.view = view;
 
     this.view.addScoreChangedListener(this::setSubmissionScore);
+    this.view.addScoreSavedListener(this::publishSavedScoreMessage);
+  }
+
+  private void publishSavedScoreMessage() {
+    ProjectSubmissionScoreSaved saved = new ProjectSubmissionScoreSaved(this.submission);
+    publishEvent(saved);
   }
 
   private void setSubmissionScore(String score) {
@@ -39,11 +45,9 @@ public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selec
     submission = selected.getProjectSubmission();
     Double score = submission.getScore();
     if (score == null) {
-      this.view.setScore("");
-
-    } else {
-      this.view.setScore(format.format(score));
+      score = submission.getTotalPoints();
     }
+    this.view.setScore(format.format(score));
     this.view.setScoreIsValid(true);
 
     this.view.setTotalPoints(format.format(submission.getTotalPoints()));
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java
new file mode 100644
index 000000000..2e1053099
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreSaved.java
@@ -0,0 +1,13 @@
+package edu.pdx.cs410J.grader.scoring;
+
+public class ProjectSubmissionScoreSaved {
+  private ProjectSubmission projectSubmission;
+
+  public ProjectSubmissionScoreSaved(ProjectSubmission submission) {
+    this.projectSubmission = submission;
+  }
+
+  public ProjectSubmission getProjectSubmission() {
+    return projectSubmission;
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
index 25376deab..e5c6e49c1 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScoreView.java
@@ -9,7 +9,13 @@ public interface ProjectSubmissionScoreView {
 
   void setScoreIsValid(boolean scoreIsInvalid);
 
+  void addScoreSavedListener(ScoreSavedListener listener);
+
   interface ScoreChangedListener {
     void scoreChanged(String newScore);
   }
+
+  interface ScoreSavedListener {
+    void submissionSaved();
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
index cf4382c95..da19c1594 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
@@ -40,4 +40,9 @@ public void setScoreIsValid(boolean scoreIsValid) {
     setBorderBasedOnValidity(this.score, scoreIsValid);
   }
 
+  @Override
+  public void addScoreSavedListener(ScoreSavedListener listener) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
index 5df24328f..43c264c91 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -1,14 +1,16 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView.ScoreChangedListener;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionScoreView.ScoreSavedListener;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import java.util.function.BiConsumer;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 public class ProjectSubmissionScorePresenterTest extends ProjectSubmissionTestCase {
 
@@ -33,17 +35,6 @@ public void viewIsPopulatedWhenSubmissionIsSelected() {
     verify(view).setScoreIsValid(true);
   }
 
-  @Test
-  public void submissionWithNoScoreDisplaysEmptyString() {
-    ProjectSubmission submission = createProjectSubmission("Project", "student");
-    submission.setTotalPoints(6.0);
-    submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
-
-    verify(view).setTotalPoints("6.0");
-    verify(view).setScore("");
-  }
-
   @Test
   public void enteringValidScoreUpdatesSubmissionScore() {
     ArgumentCaptor<ScoreChangedListener> listener = ArgumentCaptor.forClass(ScoreChangedListener.class);
@@ -127,5 +118,53 @@ public void scoreGreaterThanTotalIsInvalid() {
     assertThat(submission.getScore(), equalTo(null));
   }
 
+  @Test
+  public void scoreInitiallyPopulatedWithTotalPoints() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
 
+    verify(view).setTotalPoints("6.0");
+    verify(view).setScore("6.0");
+    verify(view).setScoreIsValid(true);
+  }
+
+  @Test
+  public void savingScorePublishesProjectSubmissionScoreSaved() {
+    // When a score of 5.0 has been set for a project submission
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(6.0);
+    submission.setScore(null);
+    this.bus.post(new ProjectSubmissionSelected(submission));
+
+    double newScore = 5.2;
+    ScoreChangedListener scoreChanged =
+      captureListener(ScoreChangedListener.class, ProjectSubmissionScoreView::addScoreChangedListener);
+    scoreChanged.scoreChanged(String.valueOf(newScore));
+
+    ProjectSubmissionSavedHandler handler = mock(ProjectSubmissionSavedHandler.class);
+    bus.register(handler);
+
+    // When submission is saved...
+    ScoreSavedListener scoreSaved =
+      captureListener(ScoreSavedListener.class, ProjectSubmissionScoreView::addScoreSavedListener);
+    scoreSaved.submissionSaved();
+
+    // Then a ProjectSubmissionScoreSaved message is published
+    ArgumentCaptor<ProjectSubmissionScoreSaved> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionScoreSaved.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission().getScore(), equalTo(newScore));
+  }
+
+  private interface ProjectSubmissionSavedHandler {
+    @Subscribe
+    void handle(ProjectSubmissionScoreSaved event);
+  }
+
+  private <L> L captureListener(Class<L> listenerClass, BiConsumer<ProjectSubmissionScoreView, L> addListener) {
+    ArgumentCaptor<L> listener = ArgumentCaptor.forClass(listenerClass);
+    addListener.accept(verify(view), listener.capture());
+    return listener.getValue();
+  }
 }

From 9fdfdca5601feb76d1d4244a9fc255a098a5fa68 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 16:01:11 -0700
Subject: [PATCH 24/51] Added a button to save the project score.

---
 .../grader/scoring/ui/ProjectSubmissionScorePanel.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
index da19c1594..f022ade9a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorePanel.java
@@ -9,15 +9,18 @@
 public class ProjectSubmissionScorePanel extends ScorePanel implements ProjectSubmissionScoreView {
   private final JLabel totalPoints;
   private final JTextField score;
+  private final JButton saveScore;
 
   public ProjectSubmissionScorePanel() {
     totalPoints = new JLabel();
     score = new JTextField(3);
+    saveScore = new JButton("Save Score");
 
     this.add(new JLabel("Total score for submission:"));
     this.add(score);
     this.add(new JLabel("out of"));
     this.add(totalPoints);
+    this.add(saveScore);
   }
 
   @Override
@@ -42,7 +45,7 @@ public void setScoreIsValid(boolean scoreIsValid) {
 
   @Override
   public void addScoreSavedListener(ScoreSavedListener listener) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    saveScore.addActionListener(e -> listener.submissionSaved());
   }
 
 }

From 0dbf56f8f9151dc1bfc58a6e22442a87674d04a0 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 18:10:43 -0700
Subject: [PATCH 25/51] Rename main class to make it clear that it can grade
 multiple submissions.

---
 .../main/java/edu/pdx/cs410J/grader/GraderTools.java   |  4 ++--
 ...issionScorer.java => ProjectSubmissionsScorer.java} | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/{ProjectSubmissionScorer.java => ProjectSubmissionsScorer.java} (89%)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
index b144c24c3..fb3432cf5 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
@@ -5,7 +5,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import edu.pdx.cs410J.grader.gradebook.GradeBookGUI;
 import edu.pdx.cs410J.grader.poa.ui.PlanOfAttackGrader;
-import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionScorer;
+import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionsScorer;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintStream;
@@ -75,7 +75,7 @@ private static Class getToolClass(String tool) {
         return GwtZipFixer.class;
 
       case "scoreProjectSubmissions":
-        return ProjectSubmissionScorer.class;
+        return ProjectSubmissionsScorer.class;
 
       default:
         usage("Unknown tool: " + tool);
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
similarity index 89%
rename from grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
index 8362b4ca0..a14012464 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -20,12 +20,12 @@
 import java.util.List;
 
 @Singleton
-public class ProjectSubmissionScorer extends UIMain {
-  private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionScorer.class);
+public class ProjectSubmissionsScorer extends UIMain {
+  private static final Logger logger = LoggerFactory.getLogger(ProjectSubmissionsScorer.class);
 
   @Inject
-  public ProjectSubmissionScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
-                                 TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score) {
+  public ProjectSubmissionsScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
+                                  TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score) {
     super(parent);
 
     parent.setTitle("Project Submission Scorer");
@@ -60,7 +60,7 @@ public static void main(String[] args) {
     EventBus bus = injector.getInstance(EventBus.class);
     logAllEventsOnBusAtDebugLevel(bus, logger);
 
-    ProjectSubmissionScorer scorer = injector.getInstance(ProjectSubmissionScorer.class);
+    ProjectSubmissionsScorer scorer = injector.getInstance(ProjectSubmissionsScorer.class);
     scorer.display();
 
     bus.post(new ProjectSubmissionsLoaded(createProjectSubmissions()));

From 3bfdd5f50431b90bc4533f32fc2790eb99c77d05 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 18:19:38 -0700
Subject: [PATCH 26/51] Refactor the code for publishing a message to the bus
 into a superclass method.

---
 .../cs410J/grader/mvp/EventBusTestCase.java   |  3 +
 .../poa/EmailCredentialsPresenterTest.java    |  2 +-
 .../grader/poa/GradeBookFileManagerTest.java  |  8 +--
 .../grader/poa/GradeBookPresenterTest.java    | 20 +++---
 .../poa/POAAssignmentsPresenterTest.java      | 18 ++---
 .../grader/poa/POAGradePresenterTest.java     | 70 +++++++++----------
 .../poa/POASubmissionPresenterTest.java       |  2 +-
 .../poa/POASubmissionsPresenterTest.java      | 20 +++---
 .../grader/poa/StudentsPresenterTest.java     | 24 +++----
 .../ProjectSubmissionScorePresenterTest.java  | 16 ++---
 .../ProjectSubmissionsPresenterTest.java      |  4 +-
 .../scoring/TestCaseOutputPresenterTest.java  | 12 ++--
 .../scoring/TestCasesPresenterTest.java       | 12 ++--
 13 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
index b15e1242c..c058a2982 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/mvp/EventBusTestCase.java
@@ -38,4 +38,7 @@ protected void doNotFailTestWhenUnhandledExceptionEncountered(UnhandledException
 
   }
 
+  protected void publishEvent(Object event) {
+    this.bus.post(event);
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
index 6d1cb7511..8e769688d 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/EmailCredentialsPresenterTest.java
@@ -29,7 +29,7 @@ public void setUp() {
 
   @Test
   public void downloadingSubmissionsDisplaysEmailCredentialsView() {
-    this.bus.post(new DownloadPOASubmissionsRequest());
+    publishEvent(new DownloadPOASubmissionsRequest());
 
     verify(this.view).setIsVisible(true);
   }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
index 16112543e..17ae51f64 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookFileManagerTest.java
@@ -34,7 +34,7 @@ public void gradeBookLoadedOnLoadGradeBookEvent() throws IOException {
     GradeBookLoadedHandler handler = mock(GradeBookLoadedHandler.class);
     this.bus.register(handler);
 
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
 
     ArgumentCaptor<GradeBookLoaded> event = ArgumentCaptor.forClass(GradeBookLoaded.class);
     verify(handler).handle(event.capture());
@@ -66,7 +66,7 @@ public void unhandledExceptionEventPublishedWhenLoadingBadGradeBook() throws IOE
 
     this.unhandledExceptionHandler = this::doNotFailTestWhenUnhandledExceptionEncountered;
 
-    this.bus.post(new LoadGradeBook(badFile));
+    publishEvent(new LoadGradeBook(badFile));
 
     ArgumentCaptor<UnhandledExceptionEvent> event = ArgumentCaptor.forClass(UnhandledExceptionEvent.class);
     verify(handler).handle(event.capture());
@@ -87,7 +87,7 @@ public void gradeBookSavedToFileOnSaveGradeBookEvent() throws IOException, Parse
     GradeBookLoadedHandler handler = mock(GradeBookLoadedHandler.class);
     this.bus.register(handler);
 
-    this.bus.post(new LoadGradeBook(file));
+    publishEvent(new LoadGradeBook(file));
 
     ArgumentCaptor<GradeBookLoaded> event = ArgumentCaptor.forClass(GradeBookLoaded.class);
     verify(handler).handle(event.capture());
@@ -96,7 +96,7 @@ public void gradeBookSavedToFileOnSaveGradeBookEvent() throws IOException, Parse
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
 
-    this.bus.post(new SaveGradeBook(book));
+    publishEvent(new SaveGradeBook(book));
 
     book = readGradeBookFromFile(file);
     assertThat(book.getAssignmentNames(), contains(poa.getName()));
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
index 931c1efbe..86877abf0 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/GradeBookPresenterTest.java
@@ -34,7 +34,7 @@ public void setUp() {
   public void gradeBookNameDisplayedWhenLoaded() {
     String className = "Test Class";
     GradeBook book = new GradeBook(className);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(view).setGradeBookName(className);
   }
@@ -69,11 +69,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForLateSubmission() {
     book.addStudent(student);
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = true;
     double score = 0.5;
-    this.bus.post(new RecordGradeEvent(score, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(score, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -89,11 +89,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForOnTimeSubmission() {
     book.addStudent(student);
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = false;
     double score = 0.6;
-    this.bus.post(new RecordGradeEvent(score, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(score, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -109,11 +109,11 @@ public void gradeBookIsUpdatedOnRecordGradeEventForExistingGrade() {
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     boolean isLate = false;
     double newScore = 0.6;
-    this.bus.post(new RecordGradeEvent(newScore, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(newScore, student, poa, isLate));
 
     Grade grade = student.getGrade(poa.getName());
     assertThat(grade, notNullValue());
@@ -129,13 +129,13 @@ public void recordingGradeEnablesSaveGradeBookInView() {
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(view).canSaveGradeBook(false);
 
     boolean isLate = false;
     double newScore = 0.6;
-    this.bus.post(new RecordGradeEvent(newScore, student, poa, isLate));
+    publishEvent(new RecordGradeEvent(newScore, student, poa, isLate));
 
     verify(view).canSaveGradeBook(true);
   }
@@ -151,7 +151,7 @@ public void savingGradeBookInViewPublishesSaveGradeBookEvent() throws IOExceptio
     Assignment poa = new Assignment("poa", 1.0);
     book.addAssignment(poa);
     student.setGrade(poa, 0.9);
-    bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     SaveGradeBookEventHandler eventHandler = mock(SaveGradeBookEventHandler.class);
     bus.register(eventHandler);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
index fd3391d70..a23f7ee77 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAAssignmentsPresenterTest.java
@@ -44,7 +44,7 @@ public void setUp() {
 
   @Test
   public void assignmentListPopulatedInViewWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setAssignments(Arrays.asList("POA 0", "POA 1", "POA 2"));
     verify(this.view).setSelectedAssignment(0);
@@ -58,7 +58,7 @@ public void assignmentSelectedFireWhenAssignmentSelectedInView() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().assignmentSelected(1);
 
@@ -79,7 +79,7 @@ public void initiallySelectAssignmentWhoseDueDateHasMostRecentlyPassed() {
     assignment1.setDueDate(LocalDateTime.now().minusDays(2));
     assignment2.setDueDate(LocalDateTime.now().plusDays(2));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedAssignment(1);
   }
@@ -90,10 +90,10 @@ public void selectAssignmentWhenPOASubmittedWithAssignmentNumberInSubject() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     POASubmission submission = createPOASubmission("POA for Project 2", "me", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedAssignment(2);
 
@@ -117,7 +117,7 @@ public void populateDueDateInViewWhenGradeBookLoaded() {
     assignment1.setDueDate(LocalDateTime.now().minusDays(2));
     assignment2.setDueDate(LocalDateTime.now().plusDays(2));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment1));
   }
@@ -133,7 +133,7 @@ public void populateDueDateInViewWhenAssignmentSelected() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment0));
 
     viewHandler.getValue().assignmentSelected(1);
@@ -152,7 +152,7 @@ public void clearDueDateInViewWhenAssignmentHasNoDueDate() {
     AssignmentSelectedEventHandler eventHandler = mock(AssignmentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
     verify(this.view).setSelectedAssignmentDueDate(POAAssignmentsPresenter.formatDueDate(assignment0));
 
     viewHandler.getValue().assignmentSelected(1);
@@ -162,7 +162,7 @@ public void clearDueDateInViewWhenAssignmentHasNoDueDate() {
 
   @Test
   public void noAssignmentSelectedWhenGradeBookHasNoPOAAssignments() {
-    this.bus.post(new GradeBookLoaded(new GradeBook("No POA assignments")));
+    publishEvent(new GradeBookLoaded(new GradeBook("No POA assignments")));
 
     verify(this.view, never()).setAssignments(anyList());
     verify(this.view, never()).setSelectedAssignment(anyInt());
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
index 86ffe113a..70cc9fb75 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POAGradePresenterTest.java
@@ -57,7 +57,7 @@ public void setUp() {
 
   @Test
   public void onlySubmissionSelectedDisablesView() {
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -69,7 +69,7 @@ private void verifyIsLate(boolean isLate) {
 
   @Test
   public void onlyStudentSelectedDisablesView() {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -77,8 +77,8 @@ public void onlyStudentSelectedDisablesView() {
 
   @Test
   public void onlyAssignmentSelectedDisablesView() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verifyIsLate(false);
     verify(this.view).setIsEnabled(eq(false));
@@ -150,8 +150,8 @@ public void latePOAIsStoredInPresenterWhenMarkedLateInView() {
   public void assignmentTotalPointsDisplayedInViewWhenAssignmentSelected() {
     double points = 2.75;
     assignment.setPoints(points);
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view).setTotalPoints("2.75");
   }
@@ -172,8 +172,8 @@ public void setPresentersScoreFromView() {
     ArgumentCaptor<ScoreValueHandler> handler = ArgumentCaptor.forClass(ScoreValueHandler.class);
     verify(view).addScoreValueHandler(handler.capture());
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment.setPoints(2.0d)));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment.setPoints(2.0d)));
     reset(this.view);
 
     handler.getValue().scoreValue("1.75");
@@ -202,7 +202,7 @@ public void errorStateShouldBeClearedWhenNewSubmissionIsSelected() {
 
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setErrorInScore(false);
   }
@@ -214,7 +214,7 @@ public void scoreShouldBeClearedWhenNewSubmissionIsSelected() {
 
     handler.getValue().scoreValue("-4.3");
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setScore("");
     assertThat(this.presenter.getScore(), nullValue());
@@ -228,7 +228,7 @@ public void scoreAndErrorShouldBeClearedWhenNewStudentIsSelected() {
     handler.getValue().scoreValue("-4.3");
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verify(this.view).setErrorInScore(false);
     verify(this.view, times(2)).setScore("");
@@ -243,8 +243,8 @@ public void scoreAndErrorShouldBeClearedWhenNewAssignmentIsSelected() {
     handler.getValue().scoreValue("-4.3");
     verify(this.view).setErrorInScore(true);
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view, times(2)).setErrorInScore(false);
     verify(this.view).setScore(formatTotalPoints(assignment.getPoints()));
@@ -259,10 +259,10 @@ public void scoreDefaultsToTotalPoints() {
   }
 
   private void postEventsToBus() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submission));
-    this.bus.post(new StudentSelectedEvent(student));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submission));
+    publishEvent(new StudentSelectedEvent(student));
+    publishEvent(new AssignmentSelectedEvent(assignment));
   }
 
   @Test
@@ -281,8 +281,8 @@ public void aScoreThatIsGreaterThanTheTotalPointsShouldBeAnError() {
     ArgumentCaptor<ScoreValueHandler> handler = ArgumentCaptor.forClass(ScoreValueHandler.class);
     verify(view).addScoreValueHandler(handler.capture());
 
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     handler.getValue().scoreValue(String.valueOf(assignment.getPoints() + 1.0d));
 
@@ -302,16 +302,16 @@ public void scoreDefaultsToCurrentGrade() {
 
   @Test
   public void scoreDefaultsToTotalPointsWhenNoStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view).setScore(formatTotalPoints(assignment.getPoints()));
   }
 
   @Test
   public void scoreHasNotBeenRecordedWhenNoStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new AssignmentSelectedEvent(assignment));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new AssignmentSelectedEvent(assignment));
 
     verify(this.view, times(2)).setScoreHasBeenRecorded(false);
   }
@@ -337,14 +337,14 @@ public void scoreHasBeenRecordedForSelectedStudentWhenItIsInGradeBook() {
 
   @Test
   public void scoreHasBeenRecordedShouldBeFalseWhenNewSubmissionIsSelected() {
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setScoreHasBeenRecorded(false);
   }
 
   @Test
   public void scoreHasBeenRecordedShouldBeFalseWhenNewStudentIsSelected() {
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
 
     verify(this.view, times(2)).setScoreHasBeenRecorded(false);
   }
@@ -408,14 +408,14 @@ private interface RecordGradeEventHandler {
 
   @Test
   public void currentGradeIsDisplayedWhenGradedSubmissionIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submissionForPOAWithGrade));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submissionForPOAWithGrade));
     verify(this.view).setScore("");
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     verify(this.view, times(3)).setScore("");
 
-    this.bus.post(new AssignmentSelectedEvent(assignmentWithPOAGrade));
+    publishEvent(new AssignmentSelectedEvent(assignmentWithPOAGrade));
 
     InOrder inOrder = inOrder(this.view);
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
@@ -423,19 +423,19 @@ public void currentGradeIsDisplayedWhenGradedSubmissionIsSelected() {
 
   @Test
   public void currentGradeIsDisplayedWhenStudentIsSelected() {
-    this.bus.post(new GradeBookLoaded(book));
-    this.bus.post(new POASubmissionSelected(submissionForPOAWithGrade));
+    publishEvent(new GradeBookLoaded(book));
+    publishEvent(new POASubmissionSelected(submissionForPOAWithGrade));
     verify(this.view, times(1)).setScore("");
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     verify(this.view, times(3)).setScore("");
 
-    this.bus.post(new AssignmentSelectedEvent(assignmentWithPOAGrade));
+    publishEvent(new AssignmentSelectedEvent(assignmentWithPOAGrade));
 
     InOrder inOrder = inOrder(this.view);
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
 
-    this.bus.post(new StudentSelectedEvent(student));
+    publishEvent(new StudentSelectedEvent(student));
     inOrder.verify(this.view).setScore(formatTotalPoints(scoreForPOAWithGrade));
   }
 
@@ -445,7 +445,7 @@ public void unknownStudentClearsUI() {
     verify(this.view, times(4)).setScore("");
     verifyIsLate(3, false);
 
-    this.bus.post(new StudentSelectedEvent(null));
+    publishEvent(new StudentSelectedEvent(null));
 
     verify(this.view, times(5)).setScore("");
     verifyIsLate(4, false);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
index 866d89f50..abf032f48 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionPresenterTest.java
@@ -29,7 +29,7 @@ public void submissionInformationDisplayedOnSubmissionSelectionEvent() {
     String content = "Test Content";
     POASubmission submission = createPOASubmission(subject, submitter, submitTime, content);
 
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(view).setSubmissionSubject(subject);
     verify(view).setSubmissionSubmitter(submitter);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
index 3e0270a0a..c35d8ded8 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/POASubmissionsPresenterTest.java
@@ -32,7 +32,7 @@ public void poaSubmissionDownloadedEventPopulatesPOASubmissionView() {
     LocalDateTime submitTime = LocalDateTime.now();
 
     POASubmission submission = createPOASubmission(subject, submitter, submitTime);
-    bus.post(submission);
+    publishEvent(submission);
 
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject));
   }
@@ -44,8 +44,8 @@ public void submissionsDescriptionsAreDisplayedInOrderThatEventsWereSent() {
     String submitter = "Test Student";
     LocalDateTime submitTime = LocalDateTime.now();
 
-    bus.post(createPOASubmission(subject1, submitter, submitTime));
-    bus.post(createPOASubmission(subject2, submitter, submitTime));
+    publishEvent(createPOASubmission(subject1, submitter, submitTime));
+    publishEvent(createPOASubmission(subject2, submitter, submitTime));
 
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject1));
     verify(view).setPOASubmissionsDescriptions(Arrays.asList(subject1, subject2));
@@ -65,9 +65,9 @@ public void selectingSubmissionFiresPOASubmissionSelectedEvent() {
     ArgumentCaptor<POASubmissionsView.POASubmissionSelectedListener> listener = ArgumentCaptor.forClass(POASubmissionsView.POASubmissionSelectedListener.class);
     verify(view).addSubmissionSelectedListener(listener.capture());
 
-    bus.post(createPOASubmission(subject1, submitter, submitTime));
+    publishEvent(createPOASubmission(subject1, submitter, submitTime));
     POASubmission submission = createPOASubmission(subject2, submitter, submitTime);
-    bus.post(submission);
+    publishEvent(submission);
 
     // When the user selects the second POA submission...
     listener.getValue().submissionSelected(1);
@@ -96,12 +96,12 @@ public void displayNextPOAEventDisplaysNextPOA() {
     verify(view).addSubmissionSelectedListener(listener.capture());
 
     POASubmission submission1 = createPOASubmission(subject1, submitter, submitTime);
-    bus.post(submission1);
+    publishEvent(submission1);
     POASubmission submission2 = createPOASubmission(subject2, submitter, submitTime);
-    bus.post(submission2);
+    publishEvent(submission2);
 
     // When a DisplayNextPOAEvent is posted
-    bus.post(new SelectNextPOAEvent());
+    publishEvent(new SelectNextPOAEvent());
 
     // Then the View is updated
     verify(view).selectPOASubmission(1);
@@ -129,10 +129,10 @@ public void displayingNextPOAAtEndOfSubmissionListDoesNothing() {
     verify(view).addSubmissionSelectedListener(listener.capture());
 
     POASubmission submission1 = createPOASubmission(subject1, submitter, submitTime);
-    bus.post(submission1);
+    publishEvent(submission1);
 
     // When a DisplayNextPOAEvent is posted
-    bus.post(new SelectNextPOAEvent());
+    publishEvent(new SelectNextPOAEvent());
 
     // Then nothing happens
     verify(view, times(0)).selectPOASubmission(anyInt());
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
index 1a2ac99a8..e8b399e36 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/poa/StudentsPresenterTest.java
@@ -42,7 +42,7 @@ public void setUp() {
 
   @Test
   public void viewIsPopulatedWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setStudents(Arrays.asList("<unknown student>", "First0 Last0 <email0@mail.com>", "First1 Last1 <email1@mail.com>", "First2 Last2 <email2@mail.com>"));
   }
@@ -54,14 +54,14 @@ public void studentsAreListedInAlphabeticalOrderByLastName() {
     book.addStudent(new Student("3").setFirstName("First3").setLastName("Last3").setEmail("email3@mail.com"));
     book.addStudent(new Student("1").setFirstName("First2").setLastName("Last2").setEmail("email2@mail.com"));
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setStudents(Arrays.asList("<unknown student>", "First1 Last1 <email1@mail.com>", "First2 Last2 <email2@mail.com>", "First3 Last3 <email3@mail.com>"));
   }
 
   @Test
   public void firstStudentIsSelectedWhenGradeBookLoaded() {
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     verify(this.view).setSelectedStudentIndex(0);
   }
@@ -74,7 +74,7 @@ public void selectingStudentInViewFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(2);
 
@@ -99,7 +99,7 @@ public void selectingStudentInAlphabetizedViewFiresStudentSelectedEvent() {
     Student student2 = new Student("1").setFirstName("First2").setLastName("Last2").setEmail("email2@mail.com");
     book.addStudent(student2);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(2);
 
@@ -117,7 +117,7 @@ public void selectingUnknownStudentInViewFiresNullStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(book));
+    publishEvent(new GradeBookLoaded(book));
 
     viewHandler.getValue().studentSelected(0);
 
@@ -137,11 +137,11 @@ public void submissionWithMatchingStudentNameFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", student1.getFirstName() + " " + student1.getLastName() + " <wrong@mail.com>", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedStudentIndex(2);
 
@@ -156,11 +156,11 @@ public void submissionWithMatchingStudentEmailFiresStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", student2.getEmail(), LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view).setSelectedStudentIndex(3);
 
@@ -175,11 +175,11 @@ public void submissionByNonMatchingStudentFiresUnknownStudentSelectedEvent() {
     StudentSelectedEventHandler eventHandler = mock(StudentSelectedEventHandler.class);
     this.bus.register(eventHandler);
 
-    this.bus.post(new GradeBookLoaded(this.book));
+    publishEvent(new GradeBookLoaded(this.book));
 
     POASubmission submission =
       createPOASubmission("Subject", "Unknown Student <unknown@mail.com>", LocalDateTime.now());
-    this.bus.post(new POASubmissionSelected(submission));
+    publishEvent(new POASubmissionSelected(submission));
 
     verify(this.view, times(2)).setSelectedStudentIndex(0);
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
index 43c264c91..a4a9693f4 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -28,7 +28,7 @@ public void viewIsPopulatedWhenSubmissionIsSelected() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(4.5);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     verify(view).setTotalPoints("6.0");
     verify(view).setScore("4.5");
@@ -43,7 +43,7 @@ public void enteringValidScoreUpdatesSubmissionScore() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     listener.getValue().scoreChanged("5.0");
 
@@ -59,7 +59,7 @@ public void enteringInvalidScorePutsPresenterInErrorState() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     listener.getValue().scoreChanged("qq");
 
@@ -76,7 +76,7 @@ public void enteringEmptyScoreClearsScore() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     listener.getValue().scoreChanged("");
 
@@ -92,7 +92,7 @@ public void negativeScoreIsInvalid() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
     verify(view).setScoreIsValid(true);
 
     listener.getValue().scoreChanged("-1.0");
@@ -109,7 +109,7 @@ public void scoreGreaterThanTotalIsInvalid() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
     verify(view).setScoreIsValid(true);
 
     listener.getValue().scoreChanged("7.0");
@@ -123,7 +123,7 @@ public void scoreInitiallyPopulatedWithTotalPoints() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     verify(view).setTotalPoints("6.0");
     verify(view).setScore("6.0");
@@ -136,7 +136,7 @@ public void savingScorePublishesProjectSubmissionScoreSaved() {
     ProjectSubmission submission = createProjectSubmission("Project", "student");
     submission.setTotalPoints(6.0);
     submission.setScore(null);
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     double newScore = 5.2;
     ScoreChangedListener scoreChanged =
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 86a01b397..f1aaa7ea2 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -53,7 +53,7 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
     submissions.add(submission1);
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
-    bus.post(loaded);
+    publishEvent(loaded);
 
     // When the user selects the second project submission...
     ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
@@ -82,7 +82,7 @@ public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
     submissions.add(createProjectSubmission(projectName, "student1"));
 
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
-    bus.post(loaded);
+    publishEvent(loaded);
     verify(view).setSelectedSubmission(0);
   }
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
index db1bf88ac..656804a84 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCaseOutputPresenterTest.java
@@ -36,7 +36,7 @@ public void testCaseOutputDetailsAreViewedWhenTestCaseSelected() {
       .setPointsDeducted(null)
       .setGraderComment(comment);
 
-    this.bus.post(new TestCaseSelected(testCase));
+    publishEvent(new TestCaseSelected(testCase));
 
     verify(view).setDescription(description);
     verify(view).setCommand(command);
@@ -50,7 +50,7 @@ public void pointsDeductedAreDisplayedInView() {
     TestCaseOutput testCase = new TestCaseOutput()
       .setPointsDeducted(0.5);
 
-    this.bus.post(new TestCaseSelected(testCase));
+    publishEvent(new TestCaseSelected(testCase));
 
     verify(view).setPointsDeductedIsValid(true);
     verify(view).setPointsDeducted("0.5");
@@ -61,7 +61,7 @@ public void invalidPointsDeductedPutViewInErrorState() {
     ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
     verify(view).addPointsDeductedChangeListener(listener.capture());
 
-    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
 
     String invalidPoints = "QQ";
     listener.getValue().onPointsDeductedChange(invalidPoints);
@@ -74,7 +74,7 @@ public void negativePointsDeductedPutViewInErrorState() {
     ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
     verify(view).addPointsDeductedChangeListener(listener.capture());
 
-    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
 
     String invalidPoints = "-1.0";
     listener.getValue().onPointsDeductedChange(invalidPoints);
@@ -89,7 +89,7 @@ public void graderCommentIsSavedInTestCaseOutput() {
 
     TestCaseOutput testCase = new TestCaseOutput();
 
-    this.bus.post(new TestCaseSelected(testCase));
+    publishEvent(new TestCaseSelected(testCase));
 
     String comment = "My new comment";
     listener.getValue().onGraderCommentChange(comment);
@@ -102,7 +102,7 @@ public void deductingPublishesTestCaseOutputUpdatedEvent() {
     ArgumentCaptor<PointsDeductedChangeListener> listener = ArgumentCaptor.forClass(PointsDeductedChangeListener.class);
     verify(view).addPointsDeductedChangeListener(listener.capture());
 
-    this.bus.post(new TestCaseSelected(new TestCaseOutput()));
+    publishEvent(new TestCaseSelected(new TestCaseOutput()));
 
     TestCaseOutputUpdatedHandler handler = mock(TestCaseOutputUpdatedHandler.class);
     bus.register(handler);
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index 4d6198a98..0b9f192c3 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -31,7 +31,7 @@ public void selectingSubmissionPopulatesTestCases() {
     String testCaseName = "test";
     submission.addTestCaseOutput(new TestCaseOutput().setName(testCaseName));
 
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     verify(view).setTestCaseNames(Collections.singletonList(testCaseName));
   }
@@ -46,7 +46,7 @@ public void selectingTestCasePublishesEvent() {
     TestCaseOutput testCase1 = new TestCaseOutput().setName("test1");
     submission.addTestCaseOutput(testCase1);
 
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     // When the user selects the second test case...
     TestCaseOutputSelectedHandler handler = mock(TestCaseOutputSelectedHandler.class);
@@ -67,7 +67,7 @@ public void firstTestCaseIsSelectedWhenSubmissionIsSelected() {
     submission.addTestCaseOutput(new TestCaseOutput().setName("test1"));
     submission.addTestCaseOutput(new TestCaseOutput().setName("test2"));
 
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     verify(view).setSelectedTestCaseName(0);
 
@@ -83,7 +83,7 @@ public void pointsDeductedIsDisplayedInView() {
       .setPointsDeducted(pointsDeducted);
     submission.addTestCaseOutput(testCase);
 
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
 
     String expected = TestCasesPresenter.formatTestCase(testCaseName, pointsDeducted);
     verify(view).setTestCaseNames(Collections.singletonList(expected));
@@ -100,13 +100,13 @@ public void viewIsUpdatedWhenPointsAreDeducted() {
     assertThat(testCase1.getPointsDeducted(), equalTo(null));
     submission.addTestCaseOutput(testCase1);
 
-    this.bus.post(new ProjectSubmissionSelected(submission));
+    publishEvent(new ProjectSubmissionSelected(submission));
     verify(view).setTestCaseNames(Arrays.asList(testName0, testName1));
     verify(view).setSelectedTestCaseName(0);
 
     double pointsDeducted = 0.5;
     testCase1.setPointsDeducted(pointsDeducted);
-    this.bus.post(new TestCaseOutputUpdated(testCase1));
+    publishEvent(new TestCaseOutputUpdated(testCase1));
 
     String expected = TestCasesPresenter.formatTestCase(testName1, pointsDeducted);
     verify(view).setTestCaseNames(Arrays.asList(testName0, expected));

From 6583045f1ae24b7a2f3bd63623b4be503ed59d56 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 18:43:26 -0700
Subject: [PATCH 27/51] Move uncaught exception handling code into the mvp
 package and install the uncaught exception handler in the project submission
 scorer application.

---
 .../{poa => mvp}/ui/TopLevelJFrame.java       |  2 +-
 .../edu/pdx/cs410J/grader/mvp/ui/UIMain.java  |  1 -
 .../ui/UnhandledExceptionDialog.java          |  2 +-
 .../grader/poa/ui/EmailCredentialsDialog.java |  1 +
 .../cs410J/grader/poa/ui/GradeBookWidget.java |  1 +
 .../grader/poa/ui/POAGraderUIModule.java      |  1 +
 .../grader/poa/ui/PlanOfAttackGrader.java     |  1 +
 .../ProjectSubmissionScorePresenter.java      | 21 +++++++++++++++++++
 .../ui/ProjectSubmissionScorerUIModule.java   |  5 +++++
 .../scoring/ui/ProjectSubmissionsScorer.java  |  2 +-
 10 files changed, 33 insertions(+), 4 deletions(-)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/ui/TopLevelJFrame.java (75%)
 rename grader/src/main/java/edu/pdx/cs410J/grader/{poa => mvp}/ui/UnhandledExceptionDialog.java (96%)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
similarity index 75%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
index 4f49f5121..25f01acb4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/TopLevelJFrame.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa.ui;
+package edu.pdx.cs410J.grader.mvp.ui;
 
 import com.google.inject.Singleton;
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
index 0edb199b6..1564173d0 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java
@@ -2,7 +2,6 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import edu.pdx.cs410J.grader.poa.ui.TopLevelJFrame;
 import org.slf4j.Logger;
 
 public class UIMain {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
similarity index 96%
rename from grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
rename to grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
index 3d52149e7..d67f891d4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java
@@ -1,4 +1,4 @@
-package edu.pdx.cs410J.grader.poa.ui;
+package edu.pdx.cs410J.grader.mvp.ui;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
index 43aaf46d2..49c369483 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/EmailCredentialsDialog.java
@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.poa.EmailCredentialsView;
 
 import javax.swing.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
index e152f8487..85ea5e7be 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/GradeBookWidget.java
@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.poa.GradeBookView;
 
 import javax.swing.*;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
index df8519465..edd562d74 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/POAGraderUIModule.java
@@ -7,6 +7,7 @@
 import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
 import edu.pdx.cs410J.grader.mvp.UnhandledExceptionPresenter;
 import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.ui.UnhandledExceptionDialog;
 import edu.pdx.cs410J.grader.poa.*;
 
 public class POAGraderUIModule extends AbstractModule {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
index 7a0546090..883ee450c 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/PlanOfAttackGrader.java
@@ -5,6 +5,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.poa.DownloadPOASubmissionsRequest;
 import edu.pdx.cs410J.grader.poa.LoadGradeBook;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index 8908f5350..e958593b7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -53,4 +53,25 @@ public void populateViewWhenSubmissionIsSelected(ProjectSubmissionSelected selec
     this.view.setTotalPoints(format.format(submission.getTotalPoints()));
   }
 
+  @Subscribe
+  public void updateScoreWhenTestCaseOutputIsUpdate(TestCaseOutputUpdated updated) {
+    if (submission.getTestCaseOutputs().contains(updated.getTestCaseOutput())) {
+      double score = submission.getTotalPoints();
+      double totalPointsDeducted = submission.getTestCaseOutputs().stream().mapToDouble(this::getPointsDeducted).sum();
+      score -= totalPointsDeducted;
+      this.submission.setScore(score);
+      this.view.setScoreIsValid(true);
+      this.view.setScore(format.format(score));
+    }
+  }
+
+  private double getPointsDeducted(TestCaseOutput testCaseOutput) {
+    Double pointsDeducted = testCaseOutput.getPointsDeducted();
+    if (pointsDeducted == null) {
+      return 0.0;
+
+    } else {
+      return pointsDeducted.doubleValue();
+    }
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
index fbf8adf1a..2bcf65c98 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -5,6 +5,9 @@
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.EventBusThatPublishesUnhandledExceptionEvents;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionPresenter;
+import edu.pdx.cs410J.grader.mvp.UnhandledExceptionView;
+import edu.pdx.cs410J.grader.mvp.ui.UnhandledExceptionDialog;
 import edu.pdx.cs410J.grader.scoring.*;
 
 public class ProjectSubmissionScorerUIModule extends AbstractModule {
@@ -15,11 +18,13 @@ protected void configure() {
     bind(TestCasesView.class).to(TestCasesPanel.class);
     bind(TestCaseOutputView.class).to(TestCaseOutputPanel.class);
     bind(ProjectSubmissionScoreView.class).to(ProjectSubmissionScorePanel.class);
+    bind(UnhandledExceptionView.class).to(UnhandledExceptionDialog.class).asEagerSingleton();
 
     bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
     bind(TestCasesPresenter.class).asEagerSingleton();
     bind(TestCaseOutputPresenter.class).asEagerSingleton();
     bind(ProjectSubmissionScorePresenter.class).asEagerSingleton();
+    bind(UnhandledExceptionPresenter.class).asEagerSingleton();
   }
 
   @Provides
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
index a14012464..5d48d30d1 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -7,7 +7,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.ui.UIMain;
-import edu.pdx.cs410J.grader.poa.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded;
 import edu.pdx.cs410J.grader.scoring.TestCaseOutput;

From 38bf4f82468e0b46cc0db0c907a54577d5acd99d Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 18:51:30 -0700
Subject: [PATCH 28/51] Update the submission's score when points are deducted
 for a test case.

---
 .../ProjectSubmissionScorePresenterTest.java  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
index a4a9693f4..ee549a961 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -157,6 +157,44 @@ public void savingScorePublishesProjectSubmissionScoreSaved() {
     assertThat(eventCaptor.getValue().getProjectSubmission().getScore(), equalTo(newScore));
   }
 
+  @Test
+  public void testCaseScoreChangeUpdatesSubmissionScore() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+    TestCaseOutput testCase = new TestCaseOutput();
+    submission.addTestCaseOutput(testCase);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    testCase.setPointsDeducted(3.0);
+    publishEvent(new TestCaseOutputUpdated(testCase));
+
+    verify(view, times(2)).setScoreIsValid(true);
+    verify(view).setScore("5.0");
+  }
+
+  @Test
+  public void testCaseScoreChangeUpdatesSubmissionScoreWhenATestCaseHasNoScore() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+    TestCaseOutput testCase = new TestCaseOutput();
+    submission.addTestCaseOutput(testCase);
+    submission.addTestCaseOutput(new TestCaseOutput());
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    testCase.setPointsDeducted(3.0);
+    publishEvent(new TestCaseOutputUpdated(testCase));
+
+    verify(view, times(2)).setScoreIsValid(true);
+    verify(view).setScore("5.0");
+  }
+
+
   private interface ProjectSubmissionSavedHandler {
     @Subscribe
     void handle(ProjectSubmissionScoreSaved event);

From b30d440d64bdef2759002c7987b74e826e01682a Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 18:52:14 -0700
Subject: [PATCH 29/51] Added titles to the list of submissions and test cases

---
 .../pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java | 4 +++-
 .../java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 05fda5f45..99da45fe7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -19,7 +19,9 @@ public ProjectSubmissionsPanel() {
 
     this.setLayout(new BorderLayout());
 
-    this.add(new JScrollPane(submissionNames), BorderLayout.CENTER);
+    JScrollPane scroll = new JScrollPane(submissionNames);
+    scroll.setBorder(BorderFactory.createTitledBorder("Project Submissions"));
+    this.add(scroll, BorderLayout.CENTER);
   }
 
   @Override
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
index e21c47562..a9da2e6ac 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/TestCasesPanel.java
@@ -18,7 +18,9 @@ public TestCasesPanel() {
 
     this.setLayout(new BorderLayout());
 
-    this.add(new JScrollPane(testCaseNames), BorderLayout.CENTER);
+    JScrollPane scroll = new JScrollPane(testCaseNames);
+    scroll.setBorder(BorderFactory.createTitledBorder("Test Cases"));
+    this.add(scroll, BorderLayout.CENTER);
   }
 
   @Override

From c987286b3959f51b0c94bc60d949af1b20eb886c Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 19:13:36 -0700
Subject: [PATCH 30/51] Make distinction between ungraded and graded
 submissions.

---
 .../scoring/ProjectSubmissionsPresenter.java  | 30 ++++++++++++++++---
 .../scoring/ProjectSubmissionsView.java       |  8 +++--
 .../scoring/ui/ProjectSubmissionsPanel.java   | 14 +++++++--
 .../ProjectSubmissionsPresenterTest.java      | 29 ++++++++++++++++--
 4 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 5970edf2c..23d56e4db 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -7,11 +7,14 @@
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class ProjectSubmissionsPresenter extends PresenterOnEventBus {
   private final ProjectSubmissionsView view;
   private List<ProjectSubmission> submissions;
+  private List<ProjectSubmission> gradedSubmissions;
+  private List<ProjectSubmission> ungradedSubmissions;
 
   @Inject
   public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
@@ -30,12 +33,31 @@ private void publishSubmissionSelected(int selectedIndex) {
 
   @Subscribe
   public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
-    submissions = loaded.getSubmissions();
+    setSubmissions(loaded.getSubmissions());
 
-    List<String> submissionNames = submissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
-    this.view.setProjectSubmissionNames(submissionNames);
+    List<String> ungradedSubmissionNames = ungradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
+    this.view.setUngradedProjectSubmissionNames(ungradedSubmissionNames);
+    this.view.setSelectedUngradedSubmission(0);
 
-    this.view.setSelectedSubmission(0);
+    List<String> gradedSubmissionNames = gradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
+    this.view.setGradedProjectSubmissionNames(gradedSubmissionNames);
+    this.view.setSelectedGradedSubmission(0);
+  }
+
+  private void setSubmissions(List<ProjectSubmission> submissions) {
+    this.submissions = submissions;
+
+    gradedSubmissions = submissions.stream()
+      .filter(this::isGraded)
+      .collect(Collectors.toList());
+
+    ungradedSubmissions = submissions.stream()
+      .filter(((Predicate<ProjectSubmission>) this::isGraded).negate())
+      .collect(Collectors.toList());
+  }
+
+  private boolean isGraded(ProjectSubmission submission) {
+    return submission.getScore() != null;
   }
 
   private String getSubmissionName(ProjectSubmission submission) {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index ac0a05c61..933e4d292 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -3,11 +3,15 @@
 import java.util.List;
 
 public interface ProjectSubmissionsView {
-  void setProjectSubmissionNames(List<String> submissionNames);
+  void setUngradedProjectSubmissionNames(List<String> submissionNames);
 
   void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
 
-  void setSelectedSubmission(int index);
+  void setSelectedUngradedSubmission(int index);
+
+  void setGradedProjectSubmissionNames(List<String> submissionNames);
+
+  void setSelectedGradedSubmission(int index);
 
   interface SubmissionNameSelectedListener {
     void submissionNameSelected(int index);
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 99da45fe7..0570f0d13 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -25,7 +25,7 @@ public ProjectSubmissionsPanel() {
   }
 
   @Override
-  public void setProjectSubmissionNames(List<String> submissionNames) {
+  public void setUngradedProjectSubmissionNames(List<String> submissionNames) {
     this.submissionNames.setListData(new Vector<>(submissionNames));
   }
 
@@ -35,8 +35,18 @@ public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener lis
   }
 
   @Override
-  public void setSelectedSubmission(int index) {
+  public void setSelectedUngradedSubmission(int index) {
     this.submissionNames.setSelectedIndex(index);
   }
 
+  @Override
+  public void setGradedProjectSubmissionNames(List<String> submissionNames) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
+  @Override
+  public void setSelectedGradedSubmission(int index) {
+    throw new UnsupportedOperationException("This method is not implemented yet");
+  }
+
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index f1aaa7ea2..aa4f31e2b 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -7,6 +7,7 @@
 import org.mockito.ArgumentCaptor;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -34,10 +35,32 @@ public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
     ProjectSubmission submission = createProjectSubmission(projectName, studentId);
 
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(Collections.singletonList(submission));
-    this.bus.post(loaded);
+    publishEvent(loaded);
 
     String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
-    verify(view).setProjectSubmissionNames(Collections.singletonList(submissionName));
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
+  }
+
+  @Test
+  public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
+    String projectName = "Project";
+    String ungradedStudentName = "student0";
+    ProjectSubmission ungraded = createProjectSubmission(projectName, ungradedStudentName);
+    ungraded.setScore(null);
+
+    String gradedStudentName = "student1";
+    ProjectSubmission graded = createProjectSubmission(projectName, gradedStudentName);
+    graded.setScore(4.0);
+
+    publishEvent(new ProjectSubmissionsLoaded(Arrays.asList(ungraded, graded)));
+
+    String ungradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(ungradedStudentName, projectName);
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(ungradedName));
+    verify(view).setSelectedUngradedSubmission(0);
+
+    String gradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(gradedStudentName, projectName);
+    verify(view).setGradedProjectSubmissionNames(Collections.singletonList(gradedName));
+    verify(view).setSelectedGradedSubmission(0);
   }
 
   @Test
@@ -83,7 +106,7 @@ public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
 
     ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
     publishEvent(loaded);
-    verify(view).setSelectedSubmission(0);
+    verify(view).setSelectedUngradedSubmission(0);
   }
 
   private interface ProjectSubmissionSelectedHandler {

From dd9c65d55e6420264d2a897bf36a6834effc4abd Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 19:41:35 -0700
Subject: [PATCH 31/51] Added UI components for graded project submissions.

---
 .../scoring/ui/ProjectSubmissionsPanel.java   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 0570f0d13..3348df7b8 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -11,42 +11,50 @@
 @Singleton
 public class ProjectSubmissionsPanel extends JPanelWithJList implements ProjectSubmissionsView {
 
-  private final JList<String> submissionNames;
+  private final JList<String> ungradedSubmissionNames;
+  private final JList<String> gradedSubmissionNames;
 
   public ProjectSubmissionsPanel() {
-    submissionNames = new JList<>();
-    submissionNames.setVisibleRowCount(30);
+    ungradedSubmissionNames = new JList<>();
+    ungradedSubmissionNames.setVisibleRowCount(15);
+
+    gradedSubmissionNames = new JList<>();
+    gradedSubmissionNames.setVisibleRowCount(15);
 
     this.setLayout(new BorderLayout());
 
-    JScrollPane scroll = new JScrollPane(submissionNames);
-    scroll.setBorder(BorderFactory.createTitledBorder("Project Submissions"));
-    this.add(scroll, BorderLayout.CENTER);
+    JScrollPane ungradedScroll = new JScrollPane(ungradedSubmissionNames);
+    ungradedScroll.setBorder(BorderFactory.createTitledBorder("Ungraded Submissions"));
+    this.add(ungradedScroll, BorderLayout.NORTH);
+
+    JScrollPane gradedScroll = new JScrollPane(gradedSubmissionNames);
+    gradedScroll.setBorder(BorderFactory.createTitledBorder("Graded Submissions"));
+    this.add(gradedScroll, BorderLayout.SOUTH);
   }
 
   @Override
   public void setUngradedProjectSubmissionNames(List<String> submissionNames) {
-    this.submissionNames.setListData(new Vector<>(submissionNames));
+    this.ungradedSubmissionNames.setListData(new Vector<>(submissionNames));
   }
 
   @Override
   public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
-    registerListenerOnListItemSelection(this.submissionNames, listener::submissionNameSelected);
+    registerListenerOnListItemSelection(this.ungradedSubmissionNames, listener::submissionNameSelected);
   }
 
   @Override
   public void setSelectedUngradedSubmission(int index) {
-    this.submissionNames.setSelectedIndex(index);
+    this.ungradedSubmissionNames.setSelectedIndex(index);
   }
 
   @Override
   public void setGradedProjectSubmissionNames(List<String> submissionNames) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    this.gradedSubmissionNames.setListData(new Vector<>(submissionNames));
   }
 
   @Override
   public void setSelectedGradedSubmission(int index) {
-    throw new UnsupportedOperationException("This method is not implemented yet");
+    this.gradedSubmissionNames.setSelectedIndex(index);
   }
 
 }

From 29427de460910c9aff277fbf44840d3c1c14ca6f Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 19:50:03 -0700
Subject: [PATCH 32/51] Update lists of graded/ungraded submissions when the
 submission score changes.

---
 .../scoring/ProjectSubmissionsPresenter.java  | 13 +++++++++++-
 .../ProjectSubmissionsPresenterTest.java      | 21 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 23d56e4db..6fb006d41 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -33,7 +33,11 @@ private void publishSubmissionSelected(int selectedIndex) {
 
   @Subscribe
   public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
-    setSubmissions(loaded.getSubmissions());
+    populateViewWithSubmissions(loaded.getSubmissions());
+  }
+
+  private void populateViewWithSubmissions(List<ProjectSubmission> submissions) {
+    setSubmissions(submissions);
 
     List<String> ungradedSubmissionNames = ungradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
     this.view.setUngradedProjectSubmissionNames(ungradedSubmissionNames);
@@ -44,6 +48,13 @@ public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded)
     this.view.setSelectedGradedSubmission(0);
   }
 
+  @Subscribe
+  public void populateViewWithNamesOfUpdatedSubmissions(ProjectSubmissionScoreSaved saved) {
+    if (this.submissions.contains(saved.getProjectSubmission())) {
+      populateViewWithSubmissions(this.submissions);
+    }
+  }
+
   private void setSubmissions(List<ProjectSubmission> submissions) {
     this.submissions = submissions;
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index aa4f31e2b..eaa9a03ae 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -109,6 +109,27 @@ public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
     verify(view).setSelectedUngradedSubmission(0);
   }
 
+  @Test
+  public void submissionMovedToGradedWhenUpdated() {
+    String projectName = "Project";
+    String studentId = "student";
+    ProjectSubmission submission = createProjectSubmission(projectName, studentId);
+    submission.setScore(null);
+
+    publishEvent(new ProjectSubmissionsLoaded(Collections.singletonList(submission)));
+
+    String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
+    verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
+    verify(view).setSelectedUngradedSubmission(0);
+
+    submission.setScore(3.0);
+    publishEvent(new ProjectSubmissionScoreSaved(submission));
+
+    verify(view).setGradedProjectSubmissionNames(Collections.singletonList(submissionName));
+    verify(view, times(2)).setSelectedGradedSubmission(0);
+
+  }
+
   private interface ProjectSubmissionSelectedHandler {
     @Subscribe
     public void handle(ProjectSubmissionSelected event);

From 7eb05d39ee90c7afcafb7465ff50acff5e4b943e Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:05:33 -0700
Subject: [PATCH 33/51] We should never programmatically select one of the
 graded submissions.  There's no need to do so.

---
 .../cs410J/grader/scoring/ProjectSubmissionsPresenter.java   | 1 -
 .../pdx/cs410J/grader/scoring/ProjectSubmissionsView.java    | 2 --
 .../cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java    | 5 -----
 .../grader/scoring/ProjectSubmissionsPresenterTest.java      | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 6fb006d41..6b9eb5c1f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -45,7 +45,6 @@ private void populateViewWithSubmissions(List<ProjectSubmission> submissions) {
 
     List<String> gradedSubmissionNames = gradedSubmissions.stream().map(this::getSubmissionName).collect(Collectors.toList());
     this.view.setGradedProjectSubmissionNames(gradedSubmissionNames);
-    this.view.setSelectedGradedSubmission(0);
   }
 
   @Subscribe
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index 933e4d292..d7910d72a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -11,8 +11,6 @@ public interface ProjectSubmissionsView {
 
   void setGradedProjectSubmissionNames(List<String> submissionNames);
 
-  void setSelectedGradedSubmission(int index);
-
   interface SubmissionNameSelectedListener {
     void submissionNameSelected(int index);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 3348df7b8..9fa5d5f92 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -52,9 +52,4 @@ public void setGradedProjectSubmissionNames(List<String> submissionNames) {
     this.gradedSubmissionNames.setListData(new Vector<>(submissionNames));
   }
 
-  @Override
-  public void setSelectedGradedSubmission(int index) {
-    this.gradedSubmissionNames.setSelectedIndex(index);
-  }
-
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index eaa9a03ae..e8a3d2f7f 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -60,7 +60,6 @@ public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
 
     String gradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(gradedStudentName, projectName);
     verify(view).setGradedProjectSubmissionNames(Collections.singletonList(gradedName));
-    verify(view).setSelectedGradedSubmission(0);
   }
 
   @Test
@@ -126,8 +125,6 @@ public void submissionMovedToGradedWhenUpdated() {
     publishEvent(new ProjectSubmissionScoreSaved(submission));
 
     verify(view).setGradedProjectSubmissionNames(Collections.singletonList(submissionName));
-    verify(view, times(2)).setSelectedGradedSubmission(0);
-
   }
 
   private interface ProjectSubmissionSelectedHandler {

From 619bec25dae3a25f56b0f422db247ffa587f137a Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:06:14 -0700
Subject: [PATCH 34/51] When a project submission has it's score saved, but the
 score hasn't been set yet, give it full credit (max points).

---
 .../ProjectSubmissionScorePresenter.java      |  3 +++
 .../ProjectSubmissionScorePresenterTest.java  | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
index e958593b7..ec2dcc033 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenter.java
@@ -20,6 +20,9 @@ public ProjectSubmissionScorePresenter(EventBus bus, ProjectSubmissionScoreView
   }
 
   private void publishSavedScoreMessage() {
+    if (this.submission.getScore() == null) {
+      this.submission.setScore(this.submission.getTotalPoints());
+    }
     ProjectSubmissionScoreSaved saved = new ProjectSubmissionScoreSaved(this.submission);
     publishEvent(saved);
   }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
index ee549a961..0c628f39d 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionScorePresenterTest.java
@@ -194,6 +194,29 @@ public void testCaseScoreChangeUpdatesSubmissionScoreWhenATestCaseHasNoScore() {
     verify(view).setScore("5.0");
   }
 
+  @Test
+  public void savingSubmissionScoreWithNoDeductionsUpdatesToFullCredit() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+    submission.setTotalPoints(8.0);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setScoreIsValid(true);
+    verify(view).setScore("8.0");
+
+    ProjectSubmissionSavedHandler handler = mock(ProjectSubmissionSavedHandler.class);
+    bus.register(handler);
+
+    // When submission is saved...
+    ScoreSavedListener scoreSaved =
+      captureListener(ScoreSavedListener.class, ProjectSubmissionScoreView::addScoreSavedListener);
+    scoreSaved.submissionSaved();
+
+    // Then a ProjectSubmissionScoreSaved with the full credit score
+    ArgumentCaptor<ProjectSubmissionScoreSaved> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionScoreSaved.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission().getScore(), equalTo(submission.getTotalPoints()));
+  }
+
 
   private interface ProjectSubmissionSavedHandler {
     @Subscribe

From df8b75eca340f2cc36cf4a883065b54d7f6187d9 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:25:44 -0700
Subject: [PATCH 35/51] When a project's grade has been saved, select the next
 ungraded project.

---
 .../scoring/ProjectSubmissionsPresenter.java  | 11 ++++----
 .../scoring/ProjectSubmissionsView.java       |  2 +-
 .../scoring/ui/ProjectSubmissionsPanel.java   |  2 +-
 .../ProjectSubmissionsPresenterTest.java      | 26 +++++++++++++++++--
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 6b9eb5c1f..88b56cd48 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -21,12 +21,12 @@ public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
     super(bus);
     this.view = view;
 
-    view.addSubmissionNameSelectedListener(this::publishSubmissionSelected);
+    view.addUngradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, this.submissions));
   }
 
-  private void publishSubmissionSelected(int selectedIndex) {
-    if (this.submissions != null) {
-      ProjectSubmission selected = this.submissions.get(selectedIndex);
+  private void publishSubmissionSelected(int selectedIndex, List<ProjectSubmission> submissions) {
+    if (submissions != null) {
+      ProjectSubmission selected = submissions.get(selectedIndex);
       publishEvent(new ProjectSubmissionSelected(selected));
     }
   }
@@ -48,9 +48,10 @@ private void populateViewWithSubmissions(List<ProjectSubmission> submissions) {
   }
 
   @Subscribe
-  public void populateViewWithNamesOfUpdatedSubmissions(ProjectSubmissionScoreSaved saved) {
+  public void populateViewWithNamesOfUpdatedSubmissionsAndSelectFirstUngraded(ProjectSubmissionScoreSaved saved) {
     if (this.submissions.contains(saved.getProjectSubmission())) {
       populateViewWithSubmissions(this.submissions);
+      publishSubmissionSelected(0, this.ungradedSubmissions);
     }
   }
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index d7910d72a..3ea012d37 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -5,7 +5,7 @@
 public interface ProjectSubmissionsView {
   void setUngradedProjectSubmissionNames(List<String> submissionNames);
 
-  void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
+  void addUngradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
 
   void setSelectedUngradedSubmission(int index);
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index 9fa5d5f92..dc7731614 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -38,7 +38,7 @@ public void setUngradedProjectSubmissionNames(List<String> submissionNames) {
   }
 
   @Override
-  public void addSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
+  public void addUngradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
     registerListenerOnListItemSelection(this.ungradedSubmissionNames, listener::submissionNameSelected);
   }
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index e8a3d2f7f..6c8240a73 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -65,7 +65,7 @@ public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
   @Test
   public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
-    verify(view).addSubmissionNameSelectedListener(listener.capture());
+    verify(view).addUngradedSubmissionNameSelectedListener(listener.capture());
 
     String projectName = "Project";
     String studentId = "student1";
@@ -94,7 +94,7 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
   @Test
   public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
-    verify(view).addSubmissionNameSelectedListener(listener.capture());
+    verify(view).addUngradedSubmissionNameSelectedListener(listener.capture());
 
     String projectName = "Project";
 
@@ -127,6 +127,28 @@ public void submissionMovedToGradedWhenUpdated() {
     verify(view).setGradedProjectSubmissionNames(Collections.singletonList(submissionName));
   }
 
+  @Test
+  public void nextSubmissionSelectedWhenSubmissionGraded() {
+    ProjectSubmission submission0 = createProjectSubmission("Project", "student0");
+    submission0.setScore(null);
+    ProjectSubmission submission1 = createProjectSubmission("Project", "student1");
+    submission1.setScore(null);
+
+    publishEvent(new ProjectSubmissionsLoaded(Arrays.asList(submission0, submission1)));
+
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    this.bus.register(handler);
+
+    submission0.setScore(3.0);
+    publishEvent(new ProjectSubmissionScoreSaved(submission0));
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+  }
+
   private interface ProjectSubmissionSelectedHandler {
     @Subscribe
     public void handle(ProjectSubmissionSelected event);

From e16067efd6ea3800464da8318532ac0615cfb419 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:37:32 -0700
Subject: [PATCH 36/51] Display information about a graded submission when it
 is selected in the list.

---
 .../grader/scoring/ProjectSubmission.java     |  3 +-
 .../scoring/ProjectSubmissionsPresenter.java  |  5 +--
 .../scoring/ProjectSubmissionsView.java       |  2 ++
 .../scoring/ui/ProjectSubmissionsPanel.java   |  5 +++
 .../ProjectSubmissionsPresenterTest.java      | 32 ++++++++++++++++++-
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index f91d61fd3..0641c9d79 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -42,8 +42,9 @@ public double getTotalPoints() {
     return totalPoints;
   }
 
-  public void setScore(Double score) {
+  public ProjectSubmission setScore(Double score) {
     this.score = score;
+    return this;
   }
 
   public Double getScore() {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index 88b56cd48..bc0c3952e 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -21,11 +21,12 @@ public ProjectSubmissionsPresenter(EventBus bus, ProjectSubmissionsView view) {
     super(bus);
     this.view = view;
 
-    view.addUngradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, this.submissions));
+    view.addUngradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, ungradedSubmissions));
+    view.addGradedSubmissionNameSelectedListener((selectedIndex) -> publishSubmissionSelected(selectedIndex, gradedSubmissions));
   }
 
   private void publishSubmissionSelected(int selectedIndex, List<ProjectSubmission> submissions) {
-    if (submissions != null) {
+    if (submissions != null && !submissions.isEmpty()) {
       ProjectSubmission selected = submissions.get(selectedIndex);
       publishEvent(new ProjectSubmissionSelected(selected));
     }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
index 3ea012d37..684334e20 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsView.java
@@ -11,6 +11,8 @@ public interface ProjectSubmissionsView {
 
   void setGradedProjectSubmissionNames(List<String> submissionNames);
 
+  void addGradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener);
+
   interface SubmissionNameSelectedListener {
     void submissionNameSelected(int index);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
index dc7731614..2185f957a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsPanel.java
@@ -52,4 +52,9 @@ public void setGradedProjectSubmissionNames(List<String> submissionNames) {
     this.gradedSubmissionNames.setListData(new Vector<>(submissionNames));
   }
 
+  @Override
+  public void addGradedSubmissionNameSelectedListener(SubmissionNameSelectedListener listener) {
+    registerListenerOnListItemSelection(this.gradedSubmissionNames, listener::submissionNameSelected);
+  }
+
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 6c8240a73..7636916b4 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -63,7 +63,7 @@ public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
   }
 
   @Test
-  public void eventIsPublishedWhenProjectSubmissionIsSelected() {
+  public void eventIsPublishedWhenUngradedProjectSubmissionIsSelected() {
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
     verify(view).addUngradedSubmissionNameSelectedListener(listener.capture());
 
@@ -91,6 +91,36 @@ public void eventIsPublishedWhenProjectSubmissionIsSelected() {
     verifyNoMoreInteractions(handler);
   }
 
+  @Test
+  public void eventIsPublishedWhenGradedProjectSubmissionIsSelected() {
+    ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);
+    verify(view).addGradedSubmissionNameSelectedListener(listener.capture());
+
+    String projectName = "Project";
+    String studentId = "student1";
+
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    submissions.add(createProjectSubmission(projectName, "student0").setScore(3.0));
+    ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
+    submission1.setScore(4.0);
+    submissions.add(submission1);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    publishEvent(loaded);
+
+    // When the user selects the second project submission...
+    ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
+    bus.register(handler);
+    listener.getValue().submissionNameSelected(1);
+
+    // Then a ProjectSubmissionSelected event for that submission is published
+
+    ArgumentCaptor<ProjectSubmissionSelected> eventCaptor = ArgumentCaptor.forClass(ProjectSubmissionSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getProjectSubmission(), equalTo(submission1));
+
+    verifyNoMoreInteractions(handler);
+  }
+
   @Test
   public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
     ArgumentCaptor<SubmissionNameSelectedListener> listener = ArgumentCaptor.forClass(SubmissionNameSelectedListener.class);

From 4d874050dee1c1651bf7efa924adc2eaf10adc48 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:55:43 -0700
Subject: [PATCH 37/51] When the score for a test case is specified, advance to
 the next test case.

---
 .../grader/scoring/TestCasesPresenter.java    |  9 +++++--
 .../scoring/TestCasesPresenterTest.java       | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
index c53eb1f75..48eee889a 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenter.java
@@ -46,11 +46,16 @@ private String getDisplay(TestCaseOutput testCase) {
   }
 
   @Subscribe
-  public void repopulateViewWhenTestCaseOutputIsUpdated(TestCaseOutputUpdated update) {
+  public void repopulateViewAndSelectNextTestCaseWhenTestCaseOutputIsUpdated(TestCaseOutputUpdated update) {
     int index = this.testCaseOutputs.indexOf(update.getTestCaseOutput());
     if (index >= 0) {
       setTestCaseNamesInView();
-      this.view.setSelectedTestCaseName(index);
+      if (index < this.testCaseOutputs.size() - 1) {
+        int nextIndex = index + 1;
+        this.view.setSelectedTestCaseName(nextIndex);
+        TestCaseOutput next = this.testCaseOutputs.get(nextIndex);
+        publishEvent(new TestCaseSelected(next));
+      }
     }
   }
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index 0b9f192c3..0ae1360d9 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -113,6 +113,30 @@ public void viewIsUpdatedWhenPointsAreDeducted() {
     verify(view).setSelectedTestCaseName(1);
   }
 
+  @Test
+  public void nextTestCaseIsSelectedWhenTestCaseIsUpdated() {
+    ProjectSubmission submission = createProjectSubmission("Project", "student");
+
+    TestCaseOutput testCase0 = new TestCaseOutput().setName("Test 0");
+    submission.addTestCaseOutput(testCase0);
+    TestCaseOutput testCase1 = new TestCaseOutput().setName("Test 1");
+    assertThat(testCase1.getPointsDeducted(), equalTo(null));
+    submission.addTestCaseOutput(testCase1);
+
+    publishEvent(new ProjectSubmissionSelected(submission));
+    verify(view).setSelectedTestCaseName(0);
+
+    TestCaseOutputSelectedHandler handler = mock(TestCaseOutputSelectedHandler.class);
+    this.bus.register(handler);
+
+    publishEvent(new TestCaseOutputUpdated(testCase0));
+    verify(view).setSelectedTestCaseName(1);
+
+    ArgumentCaptor<TestCaseSelected> eventCaptor = ArgumentCaptor.forClass(TestCaseSelected.class);
+    verify(handler).handle(eventCaptor.capture());
+    assertThat(eventCaptor.getValue().getTestCaseOutput(), equalTo(testCase1));
+  }
+
   private interface TestCaseOutputSelectedHandler {
     @Subscribe
     public void handle(TestCaseSelected event);

From de684eb28b60abf066d206f75510586318a11208 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 23 Jul 2017 20:57:46 -0700
Subject: [PATCH 38/51] Fixed broken unit test.

---
 .../pdx/cs410J/grader/scoring/TestCasesPresenterTest.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
index 0ae1360d9..a4364eec0 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/TestCasesPresenterTest.java
@@ -10,9 +10,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.*;
 
 public class TestCasesPresenterTest extends ProjectSubmissionTestCase {
 
@@ -110,7 +108,7 @@ public void viewIsUpdatedWhenPointsAreDeducted() {
 
     String expected = TestCasesPresenter.formatTestCase(testName1, pointsDeducted);
     verify(view).setTestCaseNames(Arrays.asList(testName0, expected));
-    verify(view).setSelectedTestCaseName(1);
+    verify(view, never()).setSelectedTestCaseName(1);
   }
 
   @Test

From b3d0af9eeff4d0bc8e97fb118d21eea66bedac38 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Fri, 28 Jul 2017 20:43:18 -0700
Subject: [PATCH 39/51] Added some unit tests for parsing an output file
 created by the grading script.

---
 .../grader/scoring/ProjectSubmission.java     |  19 ++
 .../ProjectSubmissionOutputFileParser.java    |  23 ++
 ...ProjectSubmissionOutputFileParserTest.java | 258 ++++++++++++++++++
 3 files changed, 300 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index 0641c9d79..1bc2ec9d7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -1,6 +1,7 @@
 package edu.pdx.cs410J.grader.scoring;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class ProjectSubmission {
@@ -9,6 +10,8 @@ public class ProjectSubmission {
   private final List<TestCaseOutput> testCaseOutputs = new ArrayList<>();
   private double totalPoints;
   private Double score;
+  private String studentName;
+  private Date submissionTime;
 
   public void setProjectName(String projectName) {
     this.projectName = projectName;
@@ -50,4 +53,20 @@ public ProjectSubmission setScore(Double score) {
   public Double getScore() {
     return score;
   }
+
+  public String getStudentName() {
+    return studentName;
+  }
+
+  public void setStudentName(String studentName) {
+    this.studentName = studentName;
+  }
+
+  public Date getSubmissionTime() {
+    return submissionTime;
+  }
+
+  public void setSubmissionTime(Date submissionTime) {
+    this.submissionTime = submissionTime;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
new file mode 100644
index 000000000..2ed75b05c
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
@@ -0,0 +1,23 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.io.Reader;
+import java.util.Date;
+
+public class ProjectSubmissionOutputFileParser {
+  public ProjectSubmissionOutputFileParser(Reader source) {
+
+
+  }
+
+  public ProjectSubmission parse() {
+    throw new UnsupportedOperationException("Not implemented yet");
+  }
+
+  public static Date parseSubmissionTime(String submissionTimeString) {
+    return null;
+  }
+
+  public static Date parseGradingTime(String gradingTimeString) {
+    return null;
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
new file mode 100644
index 000000000..4c27bbb88
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
@@ -0,0 +1,258 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+public class ProjectSubmissionOutputFileParserTest {
+
+  /*
+
+              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3
+              Submitted by David Whitlock
+              Submitted on 2017-Jul-28 19:51:41
+              Graded on Fri Jul 28 19:53:58 PDT 2017
+
+ out of 8.0
+
+   */
+
+  @Ignore
+  @Test
+  public void parseProjectName() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getProjectName(), equalTo("Project3"));
+  }
+
+  @Ignore
+  @Test
+  public void parseStudentId() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getStudentId(), equalTo("whitlock"));
+  }
+
+  @Ignore
+  @Test
+  public void parseStudentName() {
+    OutputFile file = new OutputFile();
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getStudentName(), equalTo("David Whitlock"));
+  }
+
+  @Ignore
+  @Test
+  public void parseSubmissionTime() {
+    OutputFile file = new OutputFile();
+    String submissionTimeString = "2017-Jul-28 19:51:41";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on " + submissionTimeString + "\n");
+
+    ProjectSubmission submission = parse(file);
+    Date submissionTime = ProjectSubmissionOutputFileParser.parseSubmissionTime(submissionTimeString);
+    assertThat(submission.getSubmissionTime(), equalTo(submissionTime));
+  }
+
+  @Ignore
+  @Test
+  public void parseGradingTime() {
+    OutputFile file = new OutputFile();
+    String gradingTimeString = "Fri Jul 28 19:53:58 PDT 2017";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on " + gradingTimeString + "\n");
+
+    ProjectSubmission submission = parse(file);
+    Date gradingTime = ProjectSubmissionOutputFileParser.parseGradingTime(gradingTimeString);
+    assertThat(submission.getSubmissionTime(), equalTo(gradingTime));
+  }
+
+  @Ignore
+  @Test
+  public void parseTotalPoints() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line(" out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getTotalPoints(), equalTo(8.0));
+  }
+
+  @Ignore
+  @Test
+  public void parseEmptyGrade() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line(" out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getScore(), equalTo(null));
+  }
+
+  @Ignore
+  @Test
+  public void parseSpecifiedGrade() {
+    OutputFile file = new OutputFile();
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line("");
+    file.line("7.0 out of 8.0");
+
+    ProjectSubmission submission = parse(file);
+    assertThat(submission.getScore(), equalTo(7.0));
+  }
+
+  @Ignore
+  @Test
+  public void parseCompilerTestCaseHasSameNameAndDescription() {
+    OutputFile file = new OutputFile();
+    String testNameAndDescription = "Compiling source code";
+    String command = "mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package";
+    String output = "This is the compiler output";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + testNameAndDescription);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line(output);
+
+    ProjectSubmission submission = parse(file);
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+
+    TestCaseOutput testCase = testCases.get(0);
+    assertThat(testCase.getName(), equalTo(testNameAndDescription));
+    assertThat(testCase.getDescription(), equalTo(testNameAndDescription));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(output));
+  }
+
+  @Ignore
+  @Test
+  public void parseCompilerTestWithNoOutput() {
+    OutputFile file = new OutputFile();
+    String testNameAndDescription = "Compiling source code";
+    String command = "mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + testNameAndDescription);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line("*****  Test 1: No arguments");
+
+    ProjectSubmission submission = parse(file);
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+
+    TestCaseOutput testCase = testCases.get(0);
+    assertThat(testCase.getName(), equalTo(testNameAndDescription));
+    assertThat(testCase.getDescription(), equalTo(testNameAndDescription));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(""));
+  }
+
+  @Ignore
+  @Test
+  public void parseTest1() {
+    OutputFile file = new OutputFile();
+    String testName = "Test 1";
+    String description = "No arguments";
+    String command = "$ java -Dstudent.name=np4 -Djava.security.manager -Djava.security.policy=file:/u/sjavata/submissions/summer2017/Project3/student-np4/java.policy -jar airline-np4/target/airline-np4-Summer2017.jar";
+    String output = "Please Check! Some of the arguments are missing.";
+
+    file.line("              CS410J Project 3: edu.pdx.cs410J.whitlock.Project3");
+    file.line("              Submitted by David Whitlock");
+    file.line("              Submitted on 2017-Jul-28 19:51:41\n");
+    file.line("              Graded on Fri Jul 28 19:53:58 PDT 2017\n");
+    file.line();
+    file.line("7.0 out of 8.0");
+    file.line("*****  " + "Compiling source code");
+    file.line();
+    file.line("mvn --quiet --batch-mode --file airline-whitlock/pom.xml -DskipTests package");
+    file.line();
+    file.line("*****  " + testName + ": " + description);
+    file.line();
+    file.line(command);
+    file.line();
+    file.line(output);
+
+    ProjectSubmission submission = parse(file);
+    List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+
+    TestCaseOutput testCase = testCases.get(1);
+    assertThat(testCase.getName(), equalTo(testName));
+    assertThat(testCase.getDescription(), equalTo(description));
+    assertThat(testCase.getCommand(), equalTo(command));
+    assertThat(testCase.getOutput(), equalTo(output));
+  }
+
+
+  private ProjectSubmission parse(OutputFile file) {
+    String text = file.getText();
+    ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new StringReader(text));
+    return parser.parse();
+  }
+
+  private class OutputFile {
+    private final StringWriter writer = new StringWriter();
+    private final PrintWriter pw = new PrintWriter(writer, true);
+
+    public void line(String line) {
+      pw.println(line);
+    }
+
+    public String getText() {
+      return this.writer.toString();
+    }
+
+    public void line() {
+      line("");
+    }
+  }
+}

From 90978f73a264d02a2b433bfc0d03825731908ec7 Mon Sep 17 00:00:00 2001
From: susham kumar <susham.kumar@gmail.com>
Date: Sat, 29 Jul 2017 09:48:55 -0700
Subject: [PATCH 40/51] Java Doc

---
 .../grader/scoring/ProjectSubmissionOutputFileParser.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
index 2ed75b05c..8688dd8fd 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
@@ -3,6 +3,10 @@
 import java.io.Reader;
 import java.util.Date;
 
+/**
+ * Author: Susham Kumar
+ */
+
 public class ProjectSubmissionOutputFileParser {
   public ProjectSubmissionOutputFileParser(Reader source) {
 

From 96e97088cac6f14c17fad5167db9f91d0f7393e6 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 09:54:02 -0700
Subject: [PATCH 41/51] Begin to add support for converting ProjectSubmission
 objects into XML.

---
 .../grader/scoring/ProjectSubmission.java     |  2 ++
 .../ProjectSubmissionXmlConverter.java        | 26 +++++++++++++++++
 .../ProjectSubmissionXmlConverterTest.java    | 29 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index 1bc2ec9d7..da0ca4b60 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -1,9 +1,11 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@XmlRootElement(name = "project-submission")
 public class ProjectSubmission {
   private String projectName;
   private String studentId;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
new file mode 100644
index 000000000..611f8551f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -0,0 +1,26 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.Reader;
+import java.io.Writer;
+
+public class ProjectSubmissionXmlConverter {
+  private final JAXBContext xmlContext;
+
+  public ProjectSubmissionXmlConverter() throws JAXBException {
+    xmlContext = JAXBContext.newInstance(ProjectSubmission.class);
+  }
+
+  public void convertToXml(ProjectSubmission submission, Writer writer) throws JAXBException {
+    Marshaller marshaller = this.xmlContext.createMarshaller();
+    marshaller.marshal(submission, writer);
+  }
+
+  public ProjectSubmission convertFromXml(Reader reader) throws JAXBException {
+    Unmarshaller unmarshaller = this.xmlContext.createUnmarshaller();
+    return (ProjectSubmission) unmarshaller.unmarshal(reader);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
new file mode 100644
index 000000000..aca4cae63
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
@@ -0,0 +1,29 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import org.junit.Test;
+
+import javax.xml.bind.JAXBException;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+public class ProjectSubmissionXmlConverterTest {
+
+  @Test
+  public void convertProjectName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String projectName = "Project";
+    expected.setProjectName(projectName);
+
+    ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+    StringWriter sw = new StringWriter();
+    converter.convertToXml(expected, sw);
+    String xml = sw.toString();
+    System.out.println(xml);
+    ProjectSubmission actual = converter.convertFromXml(new StringReader(xml));
+    assertThat(actual.getProjectName(), equalTo(projectName));
+  }
+
+}

From 956dbd3f88084277d98353c2b6b83dc6ef81b9e4 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 11:21:36 -0700
Subject: [PATCH 42/51] Make sure that you can convert a submissions student
 id.

---
 .../ProjectSubmissionXmlConverterTest.java    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
index aca4cae63..6f0126862 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
@@ -17,13 +17,27 @@ public void convertProjectName() throws JAXBException {
     String projectName = "Project";
     expected.setProjectName(projectName);
 
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getProjectName(), equalTo(projectName));
+  }
+
+  private ProjectSubmission convertToXmlAndBack(ProjectSubmission submission) throws JAXBException {
     ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
     StringWriter sw = new StringWriter();
-    converter.convertToXml(expected, sw);
+    converter.convertToXml(submission, sw);
     String xml = sw.toString();
     System.out.println(xml);
-    ProjectSubmission actual = converter.convertFromXml(new StringReader(xml));
-    assertThat(actual.getProjectName(), equalTo(projectName));
+    return converter.convertFromXml(new StringReader(xml));
+  }
+
+  @Test
+  public void convertStudentId() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String studentId = "studentId";
+    expected.setStudentId(studentId);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getStudentId(), equalTo(studentId));
   }
 
 }

From 2394e852f30313d62a5106d054a4049186b44b48 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 18:45:11 -0700
Subject: [PATCH 43/51] Convert project submission to XML and back.

---
 .../grader/scoring/ProjectSubmission.java     |   5 +-
 .../ProjectSubmissionXmlConverter.java        |   1 +
 .../ProjectSubmissionXmlConverterTest.java    | 199 ++++++++++++++++++
 3 files changed, 204 insertions(+), 1 deletion(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index da0ca4b60..cce95ed7f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -1,14 +1,17 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@XmlRootElement(name = "project-submission")
+@XmlRootElement(name = "ProjectSubmission")
 public class ProjectSubmission {
   private String projectName;
   private String studentId;
+
+  @XmlElementWrapper
   private final List<TestCaseOutput> testCaseOutputs = new ArrayList<>();
   private double totalPoints;
   private Double score;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
index 611f8551f..73c2f9e69 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -16,6 +16,7 @@ public ProjectSubmissionXmlConverter() throws JAXBException {
 
   public void convertToXml(ProjectSubmission submission, Writer writer) throws JAXBException {
     Marshaller marshaller = this.xmlContext.createMarshaller();
+    marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
     marshaller.marshal(submission, writer);
   }
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
index 6f0126862..b579f3c5b 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverterTest.java
@@ -5,6 +5,8 @@
 import javax.xml.bind.JAXBException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Date;
+import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -40,4 +42,201 @@ public void convertStudentId() throws JAXBException {
     assertThat(actual.getStudentId(), equalTo(studentId));
   }
 
+  @Test
+  public void convertStudentName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    String studentName = "studentName";
+    expected.setStudentName(studentName);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getStudentName(), equalTo(studentName));
+  }
+
+  @Test
+  public void convertTotalPoints() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    double totalPoints = 7.0;
+    expected.setTotalPoints(totalPoints);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getTotalPoints(), equalTo(totalPoints));
+  }
+
+  @Test
+  public void convertNullScore() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Double score = null;
+    expected.setScore(score);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getScore(), equalTo(score));
+  }
+
+  @Test
+  public void convertNonNullScore() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Double score = 3.4;
+    expected.setScore(score);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getScore(), equalTo(score));
+  }
+
+  @Test
+  public void convertNonSubmissionTime() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    Date submissionTime = new Date();
+    expected.setSubmissionTime(submissionTime);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    assertThat(actual.getSubmissionTime(), equalTo(submissionTime));
+  }
+
+  @Test
+  public void convertEmptyTestCaseOutput() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+  }
+
+  @Test
+  public void convertTestCaseOutputPointsDeducted() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    double pointsDeducted = 3.4;
+    testCase.setPointsDeducted(pointsDeducted);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getPointsDeducted(), equalTo(pointsDeducted));
+  }
+
+  @Test
+  public void convertTestCaseOutputGraderComment() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String graderComment = "This is a comment";
+    testCase.setGraderComment(graderComment);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getGraderComment(), equalTo(graderComment));
+  }
+
+  @Test
+  public void convertTestCaseOutputDescription() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String description = "This is a description";
+    testCase.setDescription(description);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getDescription(), equalTo(description));
+  }
+
+  @Test
+  public void convertTestCaseCommand() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String command = "This is a command";
+    testCase.setCommand(command);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getCommand(), equalTo(command));
+  }
+
+  @Test
+  public void convertTestCaseName() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String name = "This is the name";
+    testCase.setName(name);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getName(), equalTo(name));
+  }
+
+  @Test
+  public void convertTestCaseOutput() throws JAXBException {
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase = new TestCaseOutput();
+    String output = "This is output";
+    testCase.setOutput(output);
+    expected.addTestCaseOutput(testCase);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(1));
+    assertThat(testCases.get(0).getOutput(), equalTo(output));
+  }
+
+  @Test
+  public void convertMultipleTestCaseOutputs() throws JAXBException {
+    String name1 = "Name1";
+    String command1 = "Command1";
+    Double pointsDeducted1 = 1.0;
+    String comment1 = "Comment1";
+    String output1 = "This is output1";
+    String description1 = "Description1";
+
+    String name2 = "Name2";
+    String command2 = "Command2";
+    Double pointsDeducted2 = 2.0;
+    String comment2 = "Comment2";
+    String output2 = "This is output2";
+    String description2 = "Description2";
+
+    ProjectSubmission expected = new ProjectSubmission();
+    TestCaseOutput testCase1 = new TestCaseOutput()
+      .setName(name1)
+      .setDescription(description1)
+      .setCommand(command1)
+      .setOutput(output1)
+      .setPointsDeducted(pointsDeducted1)
+      .setGraderComment(comment1);
+    expected.addTestCaseOutput(testCase1);
+
+    TestCaseOutput testCase2 = new TestCaseOutput()
+      .setName(name2)
+      .setDescription(description2)
+      .setCommand(command2)
+      .setOutput(output2)
+      .setPointsDeducted(pointsDeducted2)
+      .setGraderComment(comment2);
+    expected.addTestCaseOutput(testCase2);
+
+    ProjectSubmission actual = convertToXmlAndBack(expected);
+    List<TestCaseOutput> testCases = actual.getTestCaseOutputs();
+    assertThat(testCases.size(), equalTo(2));
+    assertThat(testCases.get(0).getName(), equalTo(name1));
+    assertThat(testCases.get(0).getDescription(), equalTo(description1));
+    assertThat(testCases.get(0).getCommand(), equalTo(command1));
+    assertThat(testCases.get(0).getOutput(), equalTo(output1));
+    assertThat(testCases.get(0).getPointsDeducted(), equalTo(pointsDeducted1));
+    assertThat(testCases.get(0).getGraderComment(), equalTo(comment1));
+    assertThat(testCases.get(1).getName(), equalTo(name2));
+    assertThat(testCases.get(1).getDescription(), equalTo(description2));
+    assertThat(testCases.get(1).getCommand(), equalTo(command2));
+    assertThat(testCases.get(1).getOutput(), equalTo(output2));
+    assertThat(testCases.get(1).getPointsDeducted(), equalTo(pointsDeducted2));
+    assertThat(testCases.get(1).getGraderComment(), equalTo(comment2));
+  }
+
 }

From 19a2ad11ab6f7030516d42a20ec532ce002dd29c Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 19:07:25 -0700
Subject: [PATCH 44/51] Write a main program that converts a project submission
 output file to an XML file.

---
 .../edu/pdx/cs410J/grader/GraderTools.java    | 27 ++++----
 .../ProjectSubmissionXmlConverter.java        | 65 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
index fb3432cf5..77f6eab98 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java
@@ -5,6 +5,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import edu.pdx.cs410J.grader.gradebook.GradeBookGUI;
 import edu.pdx.cs410J.grader.poa.ui.PlanOfAttackGrader;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionXmlConverter;
 import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionsScorer;
 import org.slf4j.LoggerFactory;
 
@@ -77,6 +78,9 @@ private static Class getToolClass(String tool) {
       case "scoreProjectSubmissions":
         return ProjectSubmissionsScorer.class;
 
+      case "convertProjectOutFilesToXml":
+        return ProjectSubmissionXmlConverter.class;
+
       default:
         usage("Unknown tool: " + tool);
         return null;
@@ -98,17 +102,18 @@ private static void usage(String message) {
     err.println();
     err.println("usage: GraderTools tool toolArg*");
     err.println("  tool                        The tool to execute");
-    err.println("    gradebook                 The Grade Book GUI");
-    err.println("    fetch                     Fetch student surveys or projects from the Grader's");
-    err.println("                              emails account");
-    err.println("    importFromD2L             Import grades from a D2L CSV");
-    err.println("    importFromProjectReports  Import grades from graded project reports");
-    err.println("    mailFileToStudent         Email text files to students");
-    err.println("    gradePOAs                 Tool for downloading and grading POAs");
-    err.println("    generateGradeSummary      Generate grade summary report for one or more students");
-    err.println("    htmlForSurveyResults      Generate an html file for the responses to a D2L survey");
-    err.println("    fixGwtZips                Fix zip files for the GWT project to work with grading script");
-    err.println("    scoreProjectSubmissions   Review project submissions and assign them scores");
+    err.println("    gradebook                     The Grade Book GUI");
+    err.println("    fetch                         Fetch student surveys or projects from the Grader's");
+    err.println("                                  emails account");
+    err.println("    importFromD2L                 Import grades from a D2L CSV");
+    err.println("    importFromProjectReports      Import grades from graded project reports");
+    err.println("    mailFileToStudent             Email text files to students");
+    err.println("    gradePOAs                     Tool for downloading and grading POAs");
+    err.println("    generateGradeSummary          Generate grade summary report for one or more students");
+    err.println("    htmlForSurveyResults          Generate an html file for the responses to a D2L survey");
+    err.println("    fixGwtZips                    Fix zip files for the GWT project to work with grading script");
+    err.println("    scoreProjectSubmissions       Review project submissions and assign them scores");
+    err.println("    convertProjectOutFilesToXml   Review project submissions and assign them scores");
     err.println("  toolArg                     A command line argument to send to the tool");
     err.println();
 
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
index 73c2f9e69..c45a88ee0 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -1,14 +1,20 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class ProjectSubmissionXmlConverter {
   private final JAXBContext xmlContext;
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   public ProjectSubmissionXmlConverter() throws JAXBException {
     xmlContext = JAXBContext.newInstance(ProjectSubmission.class);
@@ -24,4 +30,59 @@ public ProjectSubmission convertFromXml(Reader reader) throws JAXBException {
     Unmarshaller unmarshaller = this.xmlContext.createUnmarshaller();
     return (ProjectSubmission) unmarshaller.unmarshal(reader);
   }
+
+  public static void main(String... args) throws JAXBException {
+    List<String> outFileNames = new ArrayList<>();
+    outFileNames.addAll(Arrays.asList(args));
+
+    if (outFileNames.isEmpty()) {
+      usage("Missing project submission out file name");
+    }
+
+    ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+    outFileNames.stream().map(File::new).forEach(converter::convertOutFileToXml);
+  }
+
+  private void convertOutFileToXml(File outFile) {
+    if (!outFile.exists()) {
+      logger.error("Output file \"" + outFile + "\" does not exist");
+      return;
+    }
+
+    ProjectSubmission submission;
+    try {
+      ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new FileReader(outFile));
+      submission = parser.parse();
+
+    } catch (FileNotFoundException e) {
+      logger.error("Could not file file " + outFile, e);
+      return;
+    }
+
+    String outFileName = outFile.getName();
+    String filePrefix= outFileName.substring(outFileName.indexOf('.'));
+    String xmlFileName = filePrefix + ".xml";
+
+    File directory = outFile.getParentFile();
+    File xmlFile = new File(directory, xmlFileName);
+
+    try {
+      convertToXml(submission, new FileWriter(xmlFile));
+
+    } catch (JAXBException | IOException e) {
+      logger.error("While writing to " + xmlFile, e);
+    }
+
+  }
+
+  private static void usage(String message) {
+    PrintStream err = System.err;
+    err.println("** " + message);
+    err.println();
+    err.println("usage: java ProjectSubmissionsXmlConverter outFileName+");
+    err.println("  outFileName    A project submission output file");
+    err.println();
+
+    System.exit(1);
+  }
 }

From 21d1cbf2c1707777fa297ecd9e7276135d1c1912 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 22:05:59 -0700
Subject: [PATCH 45/51] Added a new presenter that loads project submissions
 from XML files.

---
 .../ProjectSubmissionXmlConverter.java        |  8 ++
 .../scoring/ProjectSubmissionsLoaded.java     | 25 +++++-
 ...rojectSubmissionsLoaderSaverPresenter.java | 75 ++++++++++++++++++
 .../ProjectSubmissionsLoaderSaverView.java    | 11 +++
 .../scoring/ProjectSubmissionsPresenter.java  |  7 +-
 .../scoring/ui/ProjectSubmissionsScorer.java  | 11 ++-
 ...ctSubmissionsLoaderSaverPresenterTest.java | 79 +++++++++++++++++++
 .../ProjectSubmissionsPresenterTest.java      | 32 ++++++--
 8 files changed, 232 insertions(+), 16 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
 create mode 100644 grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
index c45a88ee0..97946f986 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -1,5 +1,6 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,4 +86,11 @@ private static void usage(String message) {
 
     System.exit(1);
   }
+
+  @VisibleForTesting
+  String getXmlString(ProjectSubmission submission) throws JAXBException {
+    StringWriter sw = new StringWriter();
+    this.convertToXml(submission, sw);
+    return sw.toString();
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
index 231c82f1f..8f0fc8749 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaded.java
@@ -1,15 +1,34 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import java.io.File;
 import java.util.List;
 
 public class ProjectSubmissionsLoaded {
-  private final List<ProjectSubmission> submissions;
+  private final List<LoadedProjectSubmission> submissions;
 
-  public ProjectSubmissionsLoaded(List<ProjectSubmission> submissions) {
+  public ProjectSubmissionsLoaded(List<LoadedProjectSubmission> submissions) {
     this.submissions = submissions;
   }
 
-  public List<ProjectSubmission> getSubmissions() {
+  public List<LoadedProjectSubmission> getLoadedSubmissions() {
     return this.submissions;
   }
+
+  public static class LoadedProjectSubmission {
+    private final File file;
+    private final ProjectSubmission submission;
+
+    public LoadedProjectSubmission(File file, ProjectSubmission submission) {
+      this.file = file;
+      this.submission = submission;
+    }
+
+    public ProjectSubmission getSubmission() {
+      return submission;
+    }
+
+    public File getFile() {
+      return file;
+    }
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
new file mode 100644
index 000000000..09b40e472
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
@@ -0,0 +1,75 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+
+import javax.xml.bind.JAXBException;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ProjectSubmissionsLoaderSaverPresenter extends PresenterOnEventBus {
+  private final ProjectSubmissionsLoaderSaverView view;
+  private final ProjectSubmissionXmlConverter converter;
+  private final ProjectSubmissionXmlLoader xmlLoader;
+
+  public ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view) throws JAXBException {
+    this(bus, view, new ProjectSubmissionXmlLoader() {
+      @Override
+      public Reader getReader(File file) throws FileNotFoundException {
+        return new FileReader(file);
+      }
+
+      @Override
+      public List<File> getSubmissionFiles(File directory) {
+        File[] xmlFiles = directory.listFiles((dir, name) -> name.endsWith(".xml"));
+        return Arrays.asList(xmlFiles);
+      }
+    });
+  }
+
+  @VisibleForTesting
+  ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view, ProjectSubmissionXmlLoader xmlLoader) throws JAXBException {
+    super(bus);
+    this.view = view;
+    this.xmlLoader = xmlLoader;
+
+    this.view.addDirectorySelectedListener(this::loadSubmissionsFromDirectory);
+    this.converter = new ProjectSubmissionXmlConverter();
+  }
+
+  private void loadSubmissionsFromDirectory(File directory) {
+    List<LoadedProjectSubmission> loaded = new ArrayList<>();
+    List<File> xmlFiles = getSubmissionFiles(directory);
+    for (File xmlFile : xmlFiles) {
+      ProjectSubmission submission = null;
+      try {
+        submission = this.converter.convertFromXml(getReader(xmlFile));
+      } catch (JAXBException | FileNotFoundException e) {
+        Object result;
+        throw new IllegalStateException("While parsing XML", e);
+      }
+      loaded.add(new LoadedProjectSubmission(xmlFile, submission));
+    }
+
+    publishEvent(new ProjectSubmissionsLoaded(loaded));
+  }
+
+  private Reader getReader(File file) throws FileNotFoundException {
+    return this.xmlLoader.getReader(file);
+  }
+
+  private List<File> getSubmissionFiles(File directory) {
+    return this.xmlLoader.getSubmissionFiles(directory);
+  }
+
+  @VisibleForTesting
+  static interface ProjectSubmissionXmlLoader {
+    Reader getReader(File file) throws FileNotFoundException;
+
+    List<File> getSubmissionFiles(File directory);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
new file mode 100644
index 000000000..aa9a8c1ef
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
@@ -0,0 +1,11 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import java.io.File;
+
+public interface ProjectSubmissionsLoaderSaverView {
+  void addDirectorySelectedListener(DirectorySelectedListener listener);
+
+  interface DirectorySelectedListener {
+    void directorySelected(File directory);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
index bc0c3952e..9f501fca4 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenter.java
@@ -6,6 +6,7 @@
 import com.google.inject.Inject;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -34,7 +35,11 @@ private void publishSubmissionSelected(int selectedIndex, List<ProjectSubmission
 
   @Subscribe
   public void populateViewWithNamesOfSubmissions(ProjectSubmissionsLoaded loaded) {
-    populateViewWithSubmissions(loaded.getSubmissions());
+    List<ProjectSubmission> list = new ArrayList<>();
+    loaded.getLoadedSubmissions().forEach(l -> {
+      list.add(l.getSubmission());
+    });
+    populateViewWithSubmissions(list);
   }
 
   private void populateViewWithSubmissions(List<ProjectSubmission> submissions) {
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
index 5d48d30d1..646bace43 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -6,16 +6,18 @@
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
-import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.TestCaseOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,8 +68,8 @@ public static void main(String[] args) {
     bus.post(new ProjectSubmissionsLoaded(createProjectSubmissions()));
   }
 
-  private static List<ProjectSubmission> createProjectSubmissions() {
-    List<ProjectSubmission> submissions = new ArrayList<>();
+  private static List<LoadedProjectSubmission> createProjectSubmissions() {
+    List<LoadedProjectSubmission> submissions = new ArrayList<>();
     String projectName = "Project";
     for (int i = 0; i < 50; i++) {
       String studentId = "student" + i;
@@ -87,7 +89,8 @@ private static List<ProjectSubmission> createProjectSubmissions() {
         submission.addTestCaseOutput(testCaseOutput);
       }
 
-      submissions.add(submission);
+      File file = new File(new File(System.getProperty("user.dir")), studentId + ".xml");
+      submissions.add(new LoadedProjectSubmission(file, submission));
     }
 
     return submissions;
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
new file mode 100644
index 000000000..d1b23b5e0
--- /dev/null
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
@@ -0,0 +1,79 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView.DirectorySelectedListener;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import javax.xml.bind.JAXBException;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class ProjectSubmissionsLoaderSaverPresenterTest extends ProjectSubmissionTestCase {
+
+  private final ProjectSubmissionsLoaderSaverView view = mock(ProjectSubmissionsLoaderSaverView.class);
+  private final File testDirectory = new File(System.getProperty("user.dir"));
+
+  @Override
+  public void setUp() {
+    super.setUp();
+
+
+    try {
+      ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+      Map<File, String> submissionsXml = new LinkedHashMap<>();
+      submissionsXml.put(new File(testDirectory, "one.xml"), converter.getXmlString(createProjectSubmission("Project", "one")));
+      submissionsXml.put(new File(testDirectory, "two.xml"), converter.getXmlString(createProjectSubmission("Project", "two")));
+
+      new ProjectSubmissionsLoaderSaverPresenter(bus, view, new ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlLoader() {
+        @Override
+        public Reader getReader(File file) throws FileNotFoundException {
+          return new StringReader(submissionsXml.get(file));
+        }
+
+        @Override
+        public List<File> getSubmissionFiles(File directory) {
+          return new ArrayList<>(submissionsXml.keySet());
+        }
+      });
+
+    } catch (JAXBException e) {
+      fail(e.toString());
+    }
+  }
+
+  @Test
+  public void submissionLoadedWhenDirectorySelected() {
+    ArgumentCaptor<DirectorySelectedListener> listener = ArgumentCaptor.forClass(DirectorySelectedListener.class);
+    verify(view).addDirectorySelectedListener(listener.capture());
+
+    ProjectSubmissionsLoadedHandler handler = mock(ProjectSubmissionsLoadedHandler.class);
+    bus.register(handler);
+
+    listener.getValue().directorySelected(testDirectory);
+
+    ArgumentCaptor<ProjectSubmissionsLoaded> event = ArgumentCaptor.forClass(ProjectSubmissionsLoaded.class);
+    verify(handler).handle(event.capture());
+
+    List<LoadedProjectSubmission> submissions = event.getValue().getLoadedSubmissions();
+    assertThat(submissions.size(), equalTo(2));
+    for (LoadedProjectSubmission submission : submissions) {
+      assertThat(submission.getFile().getName(), equalTo(submission.getSubmission().getStudentId() + ".xml"));
+    }
+  }
+
+  interface ProjectSubmissionsLoadedHandler {
+    @Subscribe
+    void handle(ProjectSubmissionsLoaded event);
+  }
+}
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
index 7636916b4..6dd907a9d 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsPresenterTest.java
@@ -1,11 +1,13 @@
 package edu.pdx.cs410J.grader.scoring;
 
 import com.google.common.eventbus.Subscribe;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsView.SubmissionNameSelectedListener;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,13 +36,27 @@ public void viewIsPopulatedWithSubmissionNamesWhenSubmissionsAreLoaded() {
 
     ProjectSubmission submission = createProjectSubmission(projectName, studentId);
 
-    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(Collections.singletonList(submission));
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(Collections.singletonList(submission)));
     publishEvent(loaded);
 
     String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
     verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
   }
 
+  private List<LoadedProjectSubmission> newLoadedSubmission(Iterable<ProjectSubmission> submissions) {
+    List<LoadedProjectSubmission> list = new ArrayList<>();
+    for (ProjectSubmission submission : submissions) {
+      list.add(newLoadedSubmission(submission));
+    }
+    return list;
+  }
+
+  private LoadedProjectSubmission newLoadedSubmission(ProjectSubmission submission) {
+    String studentId = submission.getStudentId();
+    File file = new File(new File(System.getProperty("user.dir")), studentId + ".xml");
+    return new LoadedProjectSubmission(file, submission);
+  }
+
   @Test
   public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
     String projectName = "Project";
@@ -52,7 +68,7 @@ public void viewIsPopulatedWithGradedAndUngradedSubmissions() {
     ProjectSubmission graded = createProjectSubmission(projectName, gradedStudentName);
     graded.setScore(4.0);
 
-    publishEvent(new ProjectSubmissionsLoaded(Arrays.asList(ungraded, graded)));
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Arrays.asList(ungraded, graded))));
 
     String ungradedName = ProjectSubmissionsPresenter.getProjectSubmissionName(ungradedStudentName, projectName);
     verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(ungradedName));
@@ -74,7 +90,7 @@ public void eventIsPublishedWhenUngradedProjectSubmissionIsSelected() {
     submissions.add(createProjectSubmission(projectName, "student0"));
     ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
     submissions.add(submission1);
-    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
     publishEvent(loaded);
 
     // When the user selects the second project submission...
@@ -104,7 +120,7 @@ public void eventIsPublishedWhenGradedProjectSubmissionIsSelected() {
     ProjectSubmission submission1 = createProjectSubmission(projectName, studentId);
     submission1.setScore(4.0);
     submissions.add(submission1);
-    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
     publishEvent(loaded);
 
     // When the user selects the second project submission...
@@ -133,7 +149,7 @@ public void firstSubmissionIsSelectedWhenSubmissionsAreLoaded() {
     submissions.add(submission0);
     submissions.add(createProjectSubmission(projectName, "student1"));
 
-    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(submissions);
+    ProjectSubmissionsLoaded loaded = new ProjectSubmissionsLoaded(newLoadedSubmission(submissions));
     publishEvent(loaded);
     verify(view).setSelectedUngradedSubmission(0);
   }
@@ -145,7 +161,7 @@ public void submissionMovedToGradedWhenUpdated() {
     ProjectSubmission submission = createProjectSubmission(projectName, studentId);
     submission.setScore(null);
 
-    publishEvent(new ProjectSubmissionsLoaded(Collections.singletonList(submission)));
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Collections.singletonList(submission))));
 
     String submissionName = ProjectSubmissionsPresenter.getProjectSubmissionName(studentId, projectName);
     verify(view).setUngradedProjectSubmissionNames(Collections.singletonList(submissionName));
@@ -164,7 +180,7 @@ public void nextSubmissionSelectedWhenSubmissionGraded() {
     ProjectSubmission submission1 = createProjectSubmission("Project", "student1");
     submission1.setScore(null);
 
-    publishEvent(new ProjectSubmissionsLoaded(Arrays.asList(submission0, submission1)));
+    publishEvent(new ProjectSubmissionsLoaded(newLoadedSubmission(Arrays.asList(submission0, submission1))));
 
     ProjectSubmissionSelectedHandler handler = mock(ProjectSubmissionSelectedHandler.class);
     this.bus.register(handler);
@@ -181,6 +197,6 @@ public void nextSubmissionSelectedWhenSubmissionGraded() {
 
   private interface ProjectSubmissionSelectedHandler {
     @Subscribe
-    public void handle(ProjectSubmissionSelected event);
+    void handle(ProjectSubmissionSelected event);
   }
 }

From b04c9b6075302d7582d9a2db783660a015a0c365 Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sat, 29 Jul 2017 22:34:19 -0700
Subject: [PATCH 46/51] Added the UI for selecting a directory from which to
 read project submission XML files.

---
 ...rojectSubmissionsLoaderSaverPresenter.java |  4 ++
 .../ui/ProjectSubmissionScorerUIModule.java   |  2 +
 .../ProjectSubmissionsLoaderSaverPanel.java   | 67 +++++++++++++++++++
 .../scoring/ui/ProjectSubmissionsScorer.java  |  4 +-
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
index 09b40e472..9885b99cb 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
@@ -2,6 +2,8 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import edu.pdx.cs410J.grader.mvp.PresenterOnEventBus;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
 
@@ -11,11 +13,13 @@
 import java.util.Arrays;
 import java.util.List;
 
+@Singleton
 public class ProjectSubmissionsLoaderSaverPresenter extends PresenterOnEventBus {
   private final ProjectSubmissionsLoaderSaverView view;
   private final ProjectSubmissionXmlConverter converter;
   private final ProjectSubmissionXmlLoader xmlLoader;
 
+  @Inject
   public ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view) throws JAXBException {
     this(bus, view, new ProjectSubmissionXmlLoader() {
       @Override
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
index 2bcf65c98..9ab0e491b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionScorerUIModule.java
@@ -18,6 +18,7 @@ protected void configure() {
     bind(TestCasesView.class).to(TestCasesPanel.class);
     bind(TestCaseOutputView.class).to(TestCaseOutputPanel.class);
     bind(ProjectSubmissionScoreView.class).to(ProjectSubmissionScorePanel.class);
+    bind(ProjectSubmissionsLoaderSaverView.class).to(ProjectSubmissionsLoaderSaverPanel.class);
     bind(UnhandledExceptionView.class).to(UnhandledExceptionDialog.class).asEagerSingleton();
 
     bind(ProjectSubmissionsPresenter.class).asEagerSingleton();
@@ -25,6 +26,7 @@ protected void configure() {
     bind(TestCaseOutputPresenter.class).asEagerSingleton();
     bind(ProjectSubmissionScorePresenter.class).asEagerSingleton();
     bind(UnhandledExceptionPresenter.class).asEagerSingleton();
+    bind(ProjectSubmissionsLoaderSaverPresenter.class).asEagerSingleton();
   }
 
   @Provides
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
new file mode 100644
index 000000000..d313da860
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
@@ -0,0 +1,67 @@
+package edu.pdx.cs410J.grader.scoring.ui;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class ProjectSubmissionsLoaderSaverPanel extends JPanel implements ProjectSubmissionsLoaderSaverView {
+
+  private final TopLevelJFrame parent;
+  private final List<DirectorySelectedListener> listeners = new ArrayList<>();
+
+  @Inject
+  public ProjectSubmissionsLoaderSaverPanel(TopLevelJFrame parent) {
+    this.parent = parent;
+    JButton load = new JButton("Load XML files");
+    load.addActionListener(this::showDirectoryChooser);
+    this.add(load);
+  }
+
+  private void showDirectoryChooser(ActionEvent actionEvent) {
+    JFileChooser chooser = getFileChooser();
+    int response = chooser.showOpenDialog(parent);
+
+    if (response == JFileChooser.APPROVE_OPTION) {
+      File file = chooser.getSelectedFile();
+      loadFromDirectory(file);
+    }
+  }
+
+  private void loadFromDirectory(File directory) {
+    this.listeners.forEach(l -> l.directorySelected(directory));
+  }
+
+  private JFileChooser getFileChooser() {
+    JFileChooser chooser = new JFileChooser();
+    chooser.setDialogTitle("Choose a directory containing submission XML files");
+//    chooser.setFileFilter(new FileFilter() {
+//      @Override
+//      public boolean accept(File f) {
+//        return f.isDirectory() || f.getName().endsWith(".xml");
+//      }
+//
+//      @Override
+//      public String getDescription() {
+//        return "Directory or .xml files";
+//      }
+//    });
+    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+    chooser.setAcceptAllFileFilterUsed(false);
+    chooser.setDialogType(JFileChooser.OPEN_DIALOG);
+
+    return chooser;
+  }
+
+  @Override
+  public void addDirectorySelectedListener(DirectorySelectedListener listener) {
+    this.listeners.add(listener);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
index 646bace43..e397cb60f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -27,7 +27,8 @@ public class ProjectSubmissionsScorer extends UIMain {
 
   @Inject
   public ProjectSubmissionsScorer(TopLevelJFrame parent, ProjectSubmissionsPanel submissions, TestCasesPanel testCases,
-                                  TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score) {
+                                  TestCaseOutputPanel testCaseOutput, ProjectSubmissionScorePanel score,
+                                  ProjectSubmissionsLoaderSaverPanel loadAndSave) {
     super(parent);
 
     parent.setTitle("Project Submission Scorer");
@@ -36,6 +37,7 @@ public ProjectSubmissionsScorer(TopLevelJFrame parent, ProjectSubmissionsPanel s
     content.setLayout(new BorderLayout());
 
     JPanel submissionsAndTestCases = new JPanel(new BorderLayout());
+    submissionsAndTestCases.add(loadAndSave, BorderLayout.NORTH);
     submissionsAndTestCases.add(submissions, BorderLayout.WEST);
     submissionsAndTestCases.add(testCases, BorderLayout.EAST);
 

From 658d9db49d5cc9caedd367034c9e731f321cb89b Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 30 Jul 2017 15:13:06 -0700
Subject: [PATCH 47/51] Added the ability to save the project submissions back
 to the XML files from which they were loaded.

---
 .../GenerateProjectSubmissionXmlFiles.java    | 95 +++++++++++++++++++
 ...rojectSubmissionsLoaderSaverPresenter.java | 48 ++++++++--
 .../ProjectSubmissionsLoaderSaverView.java    |  6 ++
 .../ProjectSubmissionsLoaderSaverPanel.java   | 25 ++++-
 .../scoring/ui/ProjectSubmissionsScorer.java  | 43 ---------
 ...ctSubmissionsLoaderSaverPresenterTest.java | 29 +++++-
 6 files changed, 187 insertions(+), 59 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java
new file mode 100644
index 000000000..3a14317a4
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/GenerateProjectSubmissionXmlFiles.java
@@ -0,0 +1,95 @@
+package edu.pdx.cs410J.grader.scoring;
+
+import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GenerateProjectSubmissionXmlFiles {
+
+  public static void main(String... args) {
+    if (args.length == 0) {
+      usage("Missing directory name");
+      return;
+    }
+
+    String directoryName = args[0];
+    File directory = new File(directoryName);
+    if (directory.exists() && !directory.isDirectory()) {
+      usage("Directory " + directory + " must be a directory");
+      return;
+    }
+
+    directory.mkdirs();
+
+    createProjectSubmissions().forEach(s -> writeXmlToDirectory(s, directory));
+  }
+
+  private static void writeXmlToDirectory(ProjectSubmission submission, File directory) {
+    String xmlFileName = submission.getStudentId() + ".xml";
+    File file = new File(directory, xmlFileName);
+    ProjectSubmissionXmlConverter converter = null;
+    try {
+      converter = new ProjectSubmissionXmlConverter();
+      converter.convertToXml(submission, new FileWriter(file));
+
+    } catch (JAXBException | IOException e) {
+      e.printStackTrace(System.err);
+    }
+  }
+
+  private static List<ProjectSubmission> createProjectSubmissions() {
+    List<ProjectSubmission> submissions = new ArrayList<>();
+    String projectName = "Project";
+    for (int i = 0; i < 50; i++) {
+      String studentId = "student" + i;
+      ProjectSubmission submission = new ProjectSubmission();
+      submission.setProjectName(projectName);
+      submission.setStudentId(studentId);
+      submission.setTotalPoints(8.0);
+
+      for (int j = 0; j < 10; j++) {
+        String testCaseName = studentId + "'s test " + j;
+        TestCaseOutput testCaseOutput =
+          new TestCaseOutput()
+            .setName(testCaseName)
+            .setDescription("Test " + j + ": Test " + studentId + "'s " + projectName + " submission")
+            .setCommand("java -jar " + studentId + "/project.jar Test" + j)
+            .setOutput(generateOutput(studentId, j));
+        submission.addTestCaseOutput(testCaseOutput);
+      }
+
+      submissions.add(submission);
+    }
+
+    return submissions;
+  }
+
+  private static String generateOutput(String studentId, int j) {
+    String output = "Output of " + studentId + "'s Test " + j;
+    if (j % 2 == 0) {
+      for (int i = 0; i < 100; i++) {
+        output += "\nq";
+      }
+
+    }
+
+    return output;
+  }
+
+
+  private static void usage(String message) {
+    PrintStream err = System.err;
+
+    err.println("** " + message);
+    err.println();
+    err.println("usage: java GenerateProjectSubmissionXmlFiles directoryName");
+    err.println("  directoryName      The name of the directory into which XML files should be generated");
+    err.println();
+
+    System.exit(1);
+  }
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
index 9885b99cb..9f23db391 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
@@ -18,6 +18,8 @@ public class ProjectSubmissionsLoaderSaverPresenter extends PresenterOnEventBus
   private final ProjectSubmissionsLoaderSaverView view;
   private final ProjectSubmissionXmlConverter converter;
   private final ProjectSubmissionXmlLoader xmlLoader;
+  private final ProjectSubmissionXmlWriter xmlWriter;
+  private List<LoadedProjectSubmission> loadedProjectSubmissions;
 
   @Inject
   public ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view) throws JAXBException {
@@ -32,34 +34,61 @@ public List<File> getSubmissionFiles(File directory) {
         File[] xmlFiles = directory.listFiles((dir, name) -> name.endsWith(".xml"));
         return Arrays.asList(xmlFiles);
       }
+    }, new ProjectSubmissionXmlWriter() {
+      @Override
+      public void writeXmlToFile(File file, String xml) throws IOException {
+        try (FileWriter writer = new FileWriter(file)) {
+          writer.write(xml);
+          writer.flush();
+        }
+      }
     });
   }
 
   @VisibleForTesting
-  ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view, ProjectSubmissionXmlLoader xmlLoader) throws JAXBException {
+  ProjectSubmissionsLoaderSaverPresenter(EventBus bus, ProjectSubmissionsLoaderSaverView view,
+                                         ProjectSubmissionXmlLoader xmlLoader,
+                                         ProjectSubmissionXmlWriter xmlWriter) throws JAXBException {
     super(bus);
     this.view = view;
     this.xmlLoader = xmlLoader;
+    this.xmlWriter = xmlWriter;
 
-    this.view.addDirectorySelectedListener(this::loadSubmissionsFromDirectory);
     this.converter = new ProjectSubmissionXmlConverter();
+
+    this.view.addDirectorySelectedListener(this::loadSubmissionsFromDirectory);
+    this.view.addSaveSubmissionsListener(this::saveSubmissionsToXmlFiles);
+  }
+
+  private void saveSubmissionsToXmlFiles() {
+    loadedProjectSubmissions.forEach(this::saveSubmissionToXmlFile);
+  }
+
+  private void saveSubmissionToXmlFile(LoadedProjectSubmission submission) {
+    try {
+      String xml = this.converter.getXmlString(submission.getSubmission());
+      this.xmlWriter.writeXmlToFile(submission.getFile(), xml);
+
+    } catch (JAXBException | IOException e) {
+      throw new IllegalStateException("While saving XML", e);
+    }
+
   }
 
   private void loadSubmissionsFromDirectory(File directory) {
-    List<LoadedProjectSubmission> loaded = new ArrayList<>();
+    loadedProjectSubmissions = new ArrayList<>();
     List<File> xmlFiles = getSubmissionFiles(directory);
     for (File xmlFile : xmlFiles) {
       ProjectSubmission submission = null;
       try {
         submission = this.converter.convertFromXml(getReader(xmlFile));
       } catch (JAXBException | FileNotFoundException e) {
-        Object result;
         throw new IllegalStateException("While parsing XML", e);
       }
-      loaded.add(new LoadedProjectSubmission(xmlFile, submission));
+      loadedProjectSubmissions.add(new LoadedProjectSubmission(xmlFile, submission));
     }
 
-    publishEvent(new ProjectSubmissionsLoaded(loaded));
+    publishEvent(new ProjectSubmissionsLoaded(loadedProjectSubmissions));
   }
 
   private Reader getReader(File file) throws FileNotFoundException {
@@ -71,9 +100,14 @@ private List<File> getSubmissionFiles(File directory) {
   }
 
   @VisibleForTesting
-  static interface ProjectSubmissionXmlLoader {
+  interface ProjectSubmissionXmlLoader {
     Reader getReader(File file) throws FileNotFoundException;
 
     List<File> getSubmissionFiles(File directory);
   }
+
+  @VisibleForTesting
+  interface ProjectSubmissionXmlWriter {
+    void writeXmlToFile(File file, String xml) throws IOException;
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
index aa9a8c1ef..1ee2264c3 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
@@ -5,7 +5,13 @@
 public interface ProjectSubmissionsLoaderSaverView {
   void addDirectorySelectedListener(DirectorySelectedListener listener);
 
+  void addSaveSubmissionsListener(SaveSubmissionsListener listener);
+
   interface DirectorySelectedListener {
     void directorySelected(File directory);
   }
+
+  interface SaveSubmissionsListener {
+    void onSaveSubmissions();
+  }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
index d313da860..552857641 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
@@ -6,6 +6,7 @@
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.ArrayList;
@@ -15,17 +16,28 @@
 public class ProjectSubmissionsLoaderSaverPanel extends JPanel implements ProjectSubmissionsLoaderSaverView {
 
   private final TopLevelJFrame parent;
-  private final List<DirectorySelectedListener> listeners = new ArrayList<>();
+  private final List<DirectorySelectedListener> loadListeners = new ArrayList<>();
+  private ArrayList<SaveSubmissionsListener> saveListeners = new ArrayList<>();
 
   @Inject
   public ProjectSubmissionsLoaderSaverPanel(TopLevelJFrame parent) {
     this.parent = parent;
+    this.setLayout(new FlowLayout());
+
     JButton load = new JButton("Load XML files");
     load.addActionListener(this::showDirectoryChooser);
     this.add(load);
+
+    JButton save = new JButton("Save XML files");
+    save.addActionListener(this::saveXmlFiles);
+    this.add(save);
+  }
+
+  private void saveXmlFiles(ActionEvent event) {
+    this.saveListeners.forEach(SaveSubmissionsListener::onSaveSubmissions);
   }
 
-  private void showDirectoryChooser(ActionEvent actionEvent) {
+  private void showDirectoryChooser(ActionEvent Event) {
     JFileChooser chooser = getFileChooser();
     int response = chooser.showOpenDialog(parent);
 
@@ -36,7 +48,7 @@ private void showDirectoryChooser(ActionEvent actionEvent) {
   }
 
   private void loadFromDirectory(File directory) {
-    this.listeners.forEach(l -> l.directorySelected(directory));
+    this.loadListeners.forEach(l -> l.directorySelected(directory));
   }
 
   private JFileChooser getFileChooser() {
@@ -62,6 +74,11 @@ private JFileChooser getFileChooser() {
 
   @Override
   public void addDirectorySelectedListener(DirectorySelectedListener listener) {
-    this.listeners.add(listener);
+    this.loadListeners.add(listener);
+  }
+
+  @Override
+  public void addSaveSubmissionsListener(SaveSubmissionsListener listener) {
+    this.saveListeners.add(listener);
   }
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
index e397cb60f..3b0ce9d3f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsScorer.java
@@ -9,7 +9,6 @@
 import edu.pdx.cs410J.grader.mvp.ui.TopLevelJFrame;
 import edu.pdx.cs410J.grader.mvp.ui.UIMain;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmission;
-import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
 import edu.pdx.cs410J.grader.scoring.TestCaseOutput;
 import org.slf4j.Logger;
@@ -66,48 +65,6 @@ public static void main(String[] args) {
 
     ProjectSubmissionsScorer scorer = injector.getInstance(ProjectSubmissionsScorer.class);
     scorer.display();
-
-    bus.post(new ProjectSubmissionsLoaded(createProjectSubmissions()));
-  }
-
-  private static List<LoadedProjectSubmission> createProjectSubmissions() {
-    List<LoadedProjectSubmission> submissions = new ArrayList<>();
-    String projectName = "Project";
-    for (int i = 0; i < 50; i++) {
-      String studentId = "student" + i;
-      ProjectSubmission submission = new ProjectSubmission();
-      submission.setProjectName(projectName);
-      submission.setStudentId(studentId);
-      submission.setTotalPoints(8.0);
-
-      for (int j = 0; j < 10; j++) {
-        String testCaseName = studentId + "'s test " + j;
-        TestCaseOutput testCaseOutput =
-          new TestCaseOutput()
-            .setName(testCaseName)
-            .setDescription("Test " + j + ": Test " + studentId + "'s " + projectName + " submission")
-            .setCommand("java -jar " + studentId + "/project.jar Test" + j)
-            .setOutput(generateOutput(studentId, j));
-        submission.addTestCaseOutput(testCaseOutput);
-      }
-
-      File file = new File(new File(System.getProperty("user.dir")), studentId + ".xml");
-      submissions.add(new LoadedProjectSubmission(file, submission));
-    }
-
-    return submissions;
-  }
-
-  private static String generateOutput(String studentId, int j) {
-    String output = "Output of " + studentId + "'s Test " + j;
-    if (j % 2 == 0) {
-      for (int i = 0; i < 100; i++) {
-        output += "\nq";
-      }
-
-    }
-
-    return output;
   }
 
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
index d1b23b5e0..fc2b3a318 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
@@ -2,7 +2,10 @@
 
 import com.google.common.eventbus.Subscribe;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaded.LoadedProjectSubmission;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlLoader;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlWriter;
 import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView.DirectorySelectedListener;
+import edu.pdx.cs410J.grader.scoring.ProjectSubmissionsLoaderSaverView.SaveSubmissionsListener;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -16,26 +19,29 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.fail;
+import static org.mockito.Matchers.notNull;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 public class ProjectSubmissionsLoaderSaverPresenterTest extends ProjectSubmissionTestCase {
 
   private final ProjectSubmissionsLoaderSaverView view = mock(ProjectSubmissionsLoaderSaverView.class);
   private final File testDirectory = new File(System.getProperty("user.dir"));
+  private ProjectSubmissionXmlWriter xmlWriter = mock(ProjectSubmissionXmlWriter.class);
+  private Map<File, String> submissionsXml;
 
   @Override
   public void setUp() {
     super.setUp();
 
-
     try {
       ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
-      Map<File, String> submissionsXml = new LinkedHashMap<>();
+      submissionsXml = new LinkedHashMap<>();
       submissionsXml.put(new File(testDirectory, "one.xml"), converter.getXmlString(createProjectSubmission("Project", "one")));
       submissionsXml.put(new File(testDirectory, "two.xml"), converter.getXmlString(createProjectSubmission("Project", "two")));
 
-      new ProjectSubmissionsLoaderSaverPresenter(bus, view, new ProjectSubmissionsLoaderSaverPresenter.ProjectSubmissionXmlLoader() {
+      new ProjectSubmissionsLoaderSaverPresenter(bus, view, new ProjectSubmissionXmlLoader() {
         @Override
         public Reader getReader(File file) throws FileNotFoundException {
           return new StringReader(submissionsXml.get(file));
@@ -45,7 +51,7 @@ public Reader getReader(File file) throws FileNotFoundException {
         public List<File> getSubmissionFiles(File directory) {
           return new ArrayList<>(submissionsXml.keySet());
         }
-      });
+      }, xmlWriter);
 
     } catch (JAXBException e) {
       fail(e.toString());
@@ -53,7 +59,7 @@ public List<File> getSubmissionFiles(File directory) {
   }
 
   @Test
-  public void submissionLoadedWhenDirectorySelected() {
+  public void submissionsLoadedWhenDirectorySelected() {
     ArgumentCaptor<DirectorySelectedListener> listener = ArgumentCaptor.forClass(DirectorySelectedListener.class);
     verify(view).addDirectorySelectedListener(listener.capture());
 
@@ -72,6 +78,19 @@ public void submissionLoadedWhenDirectorySelected() {
     }
   }
 
+  @Test
+  public void submissionsSavedWhenSaveButtonClicked() throws IOException {
+    ArgumentCaptor<DirectorySelectedListener> directorySelected = ArgumentCaptor.forClass(DirectorySelectedListener.class);
+    verify(view).addDirectorySelectedListener(directorySelected.capture());
+    directorySelected.getValue().directorySelected(testDirectory);
+
+    ArgumentCaptor<SaveSubmissionsListener> listener = ArgumentCaptor.forClass(SaveSubmissionsListener.class);
+    verify(view).addSaveSubmissionsListener(listener.capture());
+    listener.getValue().onSaveSubmissions();
+
+    verify(xmlWriter, times(2)).writeXmlToFile(notNull(File.class), notNull(String.class));
+  }
+
   interface ProjectSubmissionsLoadedHandler {
     @Subscribe
     void handle(ProjectSubmissionsLoaded event);

From 1a5fc3398d919d607c1e967e9c4ba30efe829e4b Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Sun, 30 Jul 2017 15:44:50 -0700
Subject: [PATCH 48/51] Added a label that displays the location from which
 files were loaded.

---
 ...rojectSubmissionsLoaderSaverPresenter.java |  7 +++++++
 .../ProjectSubmissionsLoaderSaverView.java    |  2 ++
 .../ProjectSubmissionsLoaderSaverPanel.java   | 19 ++++++++++++++++---
 ...ctSubmissionsLoaderSaverPresenterTest.java |  8 ++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
index 9f23db391..d86907f5f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenter.java
@@ -15,6 +15,7 @@
 
 @Singleton
 public class ProjectSubmissionsLoaderSaverPresenter extends PresenterOnEventBus {
+  public static final String CLICK_HERE_MESSAGE = "Click above to load submission files";
   private final ProjectSubmissionsLoaderSaverView view;
   private final ProjectSubmissionXmlConverter converter;
   private final ProjectSubmissionXmlLoader xmlLoader;
@@ -58,6 +59,7 @@ public void writeXmlToFile(File file, String xml) throws IOException {
 
     this.view.addDirectorySelectedListener(this::loadSubmissionsFromDirectory);
     this.view.addSaveSubmissionsListener(this::saveSubmissionsToXmlFiles);
+    this.view.setDisplayMessage(CLICK_HERE_MESSAGE);
   }
 
   private void saveSubmissionsToXmlFiles() {
@@ -88,6 +90,7 @@ private void loadSubmissionsFromDirectory(File directory) {
       loadedProjectSubmissions.add(new LoadedProjectSubmission(xmlFile, submission));
     }
 
+    this.view.setDisplayMessage(loadedSubmissionsFrom(directory));
     publishEvent(new ProjectSubmissionsLoaded(loadedProjectSubmissions));
   }
 
@@ -99,6 +102,10 @@ private List<File> getSubmissionFiles(File directory) {
     return this.xmlLoader.getSubmissionFiles(directory);
   }
 
+  public static String loadedSubmissionsFrom(File testDirectory) {
+    return testDirectory.getAbsolutePath();
+  }
+
   @VisibleForTesting
   interface ProjectSubmissionXmlLoader {
     Reader getReader(File file) throws FileNotFoundException;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
index 1ee2264c3..3b487513f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverView.java
@@ -7,6 +7,8 @@ public interface ProjectSubmissionsLoaderSaverView {
 
   void addSaveSubmissionsListener(SaveSubmissionsListener listener);
 
+  void setDisplayMessage(String message);
+
   interface DirectorySelectedListener {
     void directorySelected(File directory);
   }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
index 552857641..6aff03fb9 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ui/ProjectSubmissionsLoaderSaverPanel.java
@@ -18,19 +18,27 @@ public class ProjectSubmissionsLoaderSaverPanel extends JPanel implements Projec
   private final TopLevelJFrame parent;
   private final List<DirectorySelectedListener> loadListeners = new ArrayList<>();
   private ArrayList<SaveSubmissionsListener> saveListeners = new ArrayList<>();
+  private final JLabel message;
 
   @Inject
   public ProjectSubmissionsLoaderSaverPanel(TopLevelJFrame parent) {
     this.parent = parent;
-    this.setLayout(new FlowLayout());
+    this.setLayout(new BorderLayout());
+
+    JPanel buttons = new JPanel();
 
     JButton load = new JButton("Load XML files");
     load.addActionListener(this::showDirectoryChooser);
-    this.add(load);
+    buttons.add(load);
 
     JButton save = new JButton("Save XML files");
     save.addActionListener(this::saveXmlFiles);
-    this.add(save);
+    buttons.add(save);
+
+    this.add(buttons, BorderLayout.NORTH);
+
+    message = new JLabel();
+    this.add(message, BorderLayout.SOUTH);
   }
 
   private void saveXmlFiles(ActionEvent event) {
@@ -81,4 +89,9 @@ public void addDirectorySelectedListener(DirectorySelectedListener listener) {
   public void addSaveSubmissionsListener(SaveSubmissionsListener listener) {
     this.saveListeners.add(listener);
   }
+
+  @Override
+  public void setDisplayMessage(String message) {
+    this.message.setText(message);
+  }
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
index fc2b3a318..89d754812 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionsLoaderSaverPresenterTest.java
@@ -76,6 +76,9 @@ public void submissionsLoadedWhenDirectorySelected() {
     for (LoadedProjectSubmission submission : submissions) {
       assertThat(submission.getFile().getName(), equalTo(submission.getSubmission().getStudentId() + ".xml"));
     }
+
+    String message = ProjectSubmissionsLoaderSaverPresenter.loadedSubmissionsFrom(testDirectory);
+    verify(view).setDisplayMessage(message);
   }
 
   @Test
@@ -91,6 +94,11 @@ public void submissionsSavedWhenSaveButtonClicked() throws IOException {
     verify(xmlWriter, times(2)).writeXmlToFile(notNull(File.class), notNull(String.class));
   }
 
+  @Test
+  public void clickHereMessageIsInitiallyDisplayed() {
+    verify(view).setDisplayMessage(ProjectSubmissionsLoaderSaverPresenter.CLICK_HERE_MESSAGE);
+  }
+
   interface ProjectSubmissionsLoadedHandler {
     @Subscribe
     void handle(ProjectSubmissionsLoaded event);

From 76407f0e133e9e0804e353bc90acf21acb81f661 Mon Sep 17 00:00:00 2001
From: susham kumar <susham.kumar@gmail.com>
Date: Mon, 28 Aug 2017 22:07:22 -0700
Subject: [PATCH 49/51] Implementation of ProjectSubmissionOutputFileParser

---
 .../grader/scoring/ProjectSubmission.java     |  7 ++
 .../ProjectSubmissionOutputFileParser.java    | 93 +++++++++++++++++--
 ...ProjectSubmissionOutputFileParserTest.java | 19 ++--
 3 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
index cce95ed7f..f73c8230f 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmission.java
@@ -17,6 +17,13 @@ public class ProjectSubmission {
   private Double score;
   private String studentName;
   private Date submissionTime;
+  private Date gradedTime;
+
+
+
+  public Date getGradedTime() {return gradedTime;}
+
+  public void setGradedTime(Date gradedTime) {this.gradedTime = gradedTime;}
 
   public void setProjectName(String projectName) {
     this.projectName = projectName;
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
index 8688dd8fd..23ededfee 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
@@ -1,27 +1,106 @@
 package edu.pdx.cs410J.grader.scoring;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.nio.CharBuffer;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
+import java.util.regex.Pattern;
 
 /**
  * Author: Susham Kumar
  */
 
 public class ProjectSubmissionOutputFileParser {
-  public ProjectSubmissionOutputFileParser(Reader source) {
 
+  public ProjectSubmissionOutputFileParser(Reader source) {
+      if(source != null) {
+          bufferedReader = new BufferedReader(source);
+      }
 
   }
 
-  public ProjectSubmission parse() {
-    throw new UnsupportedOperationException("Not implemented yet");
+  public ProjectSubmission parse()  {
+
+     projectSubmission = new ProjectSubmission();
+     String fileContents=null;
+
+      try {
+          while((fileContents= bufferedReader.readLine()) !=null) {
+            fileContents=fileContents.trim();
+          if(fileContents.contains("CS410J")){              // fileContents has the student Id and Project Name.
+              String[] splitContent=fileContents.split(Pattern.quote("."));
+              projectSubmission.setProjectName(splitContent[splitContent.length -1]);
+              projectSubmission.setStudentId(splitContent[splitContent.length -2]);
+
+            }
+
+            if(fileContents.contains("Submitted by")){ //fileContents has StudentName
+             String [] splitContent=fileContents.split("Submitted by ");
+             projectSubmission.setStudentName(splitContent[splitContent.length -1]);
+            }
+
+            if(fileContents.contains("Submitted on")){ //fileContents has Submission Time
+                String [] splitContent=fileContents.split("Submitted on ");
+                projectSubmission.setSubmissionTime(parseSubmissionTime(splitContent[splitContent.length -1]));
+
+            }
+
+            if(fileContents.contains("Graded on")){ //fileContents has Graded Time
+                String [] splitContent=fileContents.split("Graded on");
+                projectSubmission.setGradedTime(parseGradingTime(splitContent[splitContent.length -1].trim()));
+            }
+              if(fileContents.contains("out of")){ //fileContents has Total Points and Awarded Points
+                  String [] splitContent=fileContents.split("out of");
+                  String keyword="out of";
+                  String awardedPoints=fileContents.substring(0, fileContents.indexOf(keyword));
+                  if(!awardedPoints.isEmpty() && awardedPoints != "") {
+                      double specifiedGrade = Double.parseDouble(awardedPoints);
+                      projectSubmission.setScore(specifiedGrade);
+                  }
+                  projectSubmission.setTotalPoints(Double.parseDouble(splitContent[splitContent.length -1].trim()));
+              }
+
+
+          }
+
+      } catch (IOException e) {
+          e.printStackTrace();
+      }
+      catch(ParseException pe)
+      {
+          logger.error("While Parsing the Date"+ pe);
+      }
+
+      return  projectSubmission;
   }
 
-  public static Date parseSubmissionTime(String submissionTimeString) {
-    return null;
+  public static Date parseSubmissionTime(String submissionTimeString) throws ParseException {
+
+    DateFormat format = new SimpleDateFormat("yyyy-MMM-dd HH:mm:ss");
+   Date date = format.parse(submissionTimeString);
+
+      return date;
   }
 
-  public static Date parseGradingTime(String gradingTimeString) {
-    return null;
+  public static Date parseGradingTime(String gradingTimeString) throws ParseException {
+      DateFormat gradingTimeFormat = new SimpleDateFormat("E MMM dd HH:mm:ss z yyyy");
+      String  test= gradingTimeFormat.format(new Date());
+      Date date = gradingTimeFormat.parse(gradingTimeString);
+
+      return date;
   }
+
+    private BufferedReader bufferedReader=null;
+    private ProjectSubmission projectSubmission=null;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 }
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
index 4c27bbb88..b2ec19a5c 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
@@ -6,6 +6,7 @@
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,6 @@ public class ProjectSubmissionOutputFileParserTest {
 
    */
 
-  @Ignore
   @Test
   public void parseProjectName() {
     OutputFile file = new OutputFile();
@@ -35,7 +35,6 @@ public void parseProjectName() {
     assertThat(submission.getProjectName(), equalTo("Project3"));
   }
 
-  @Ignore
   @Test
   public void parseStudentId() {
     OutputFile file = new OutputFile();
@@ -45,7 +44,6 @@ public void parseStudentId() {
     assertThat(submission.getStudentId(), equalTo("whitlock"));
   }
 
-  @Ignore
   @Test
   public void parseStudentName() {
     OutputFile file = new OutputFile();
@@ -56,9 +54,8 @@ public void parseStudentName() {
     assertThat(submission.getStudentName(), equalTo("David Whitlock"));
   }
 
-  @Ignore
   @Test
-  public void parseSubmissionTime() {
+  public void parseSubmissionTime() throws ParseException {
     OutputFile file = new OutputFile();
     String submissionTimeString = "2017-Jul-28 19:51:41";
 
@@ -71,9 +68,9 @@ public void parseSubmissionTime() {
     assertThat(submission.getSubmissionTime(), equalTo(submissionTime));
   }
 
-  @Ignore
   @Test
-  public void parseGradingTime() {
+
+  public void parseGradingTime() throws ParseException {
     OutputFile file = new OutputFile();
     String gradingTimeString = "Fri Jul 28 19:53:58 PDT 2017";
 
@@ -84,10 +81,10 @@ public void parseGradingTime() {
 
     ProjectSubmission submission = parse(file);
     Date gradingTime = ProjectSubmissionOutputFileParser.parseGradingTime(gradingTimeString);
-    assertThat(submission.getSubmissionTime(), equalTo(gradingTime));
+    assertThat(submission.getGradedTime(), equalTo(gradingTime));
   }
 
-  @Ignore
+
   @Test
   public void parseTotalPoints() {
     OutputFile file = new OutputFile();
@@ -103,7 +100,7 @@ public void parseTotalPoints() {
     assertThat(submission.getTotalPoints(), equalTo(8.0));
   }
 
-  @Ignore
+
   @Test
   public void parseEmptyGrade() {
     OutputFile file = new OutputFile();
@@ -119,7 +116,7 @@ public void parseEmptyGrade() {
     assertThat(submission.getScore(), equalTo(null));
   }
 
-  @Ignore
+
   @Test
   public void parseSpecifiedGrade() {
     OutputFile file = new OutputFile();

From 5fa1ab502fd648cd3504b1c6a939401e16e1bd1b Mon Sep 17 00:00:00 2001
From: David Whitlock <david.m.whitlock@gmail.com>
Date: Wed, 30 Aug 2017 04:21:23 -0700
Subject: [PATCH 50/51] Import a class that is no longer in the same package.

---
 .../edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
index d74c06b53..e209ac80b 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java
@@ -2,6 +2,7 @@
 
 import edu.pdx.cs410J.grader.GradeBook;
 import edu.pdx.cs410J.grader.LetterGrade;
+import edu.pdx.cs410J.grader.Student;
 
 import javax.swing.*;
 import java.awt.*;

From 407599c02e736a40fad4b8f35643852600a8a127 Mon Sep 17 00:00:00 2001
From: susham kumar <susham.kumar@gmail.com>
Date: Fri, 1 Sep 2017 09:04:18 -0700
Subject: [PATCH 51/51] Made few changes as per the code review

---
 .../scoring/InvalidFileContentException.java  | 10 +++
 .../ProjectSubmissionOutputFileParser.java    | 72 +++++++++++--------
 .../ProjectSubmissionXmlConverter.java        | 69 +++++++++---------
 ...ProjectSubmissionOutputFileParserTest.java | 22 +++++-
 4 files changed, 105 insertions(+), 68 deletions(-)
 create mode 100644 grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java

diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java
new file mode 100644
index 000000000..ad939847f
--- /dev/null
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/InvalidFileContentException.java
@@ -0,0 +1,10 @@
+package edu.pdx.cs410J.grader.scoring;
+
+/**
+ * Created by sushamkumar on 9/1/17.
+ */
+public class InvalidFileContentException extends Exception {
+    public InvalidFileContentException() { super("Out file is corrupted"); }
+    public InvalidFileContentException(String message) { super(message); }
+
+}
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
index 23ededfee..cc87fc4f7 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParser.java
@@ -14,6 +14,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Locale;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -22,19 +23,27 @@
 
 public class ProjectSubmissionOutputFileParser {
 
+    private final BufferedReader bufferedReader;
+    private static final String SUBMITTEDBY="Submitted by";
+    private static final String SUBMITTEDON="Submitted on";
+    private static final String GRADEDON="Graded on";
+
+
   public ProjectSubmissionOutputFileParser(Reader source) {
       if(source != null) {
           bufferedReader = new BufferedReader(source);
       }
+      else
+          throw new NullPointerException();
 
   }
 
-  public ProjectSubmission parse()  {
+  public ProjectSubmission parse() throws ParseException, IOException, InvalidFileContentException {
 
      projectSubmission = new ProjectSubmission();
      String fileContents=null;
 
-      try {
+
           while((fileContents= bufferedReader.readLine()) !=null) {
             fileContents=fileContents.trim();
           if(fileContents.contains("CS410J")){              // fileContents has the student Id and Project Name.
@@ -44,43 +53,44 @@ public ProjectSubmission parse()  {
 
             }
 
-            if(fileContents.contains("Submitted by")){ //fileContents has StudentName
-             String [] splitContent=fileContents.split("Submitted by ");
-             projectSubmission.setStudentName(splitContent[splitContent.length -1]);
+            if(fileContents.contains(SUBMITTEDBY)){ //fileContents has StudentName
+             String [] splitContent=fileContents.split(SUBMITTEDBY);
+             projectSubmission.setStudentName(splitContent[splitContent.length -1].trim());
             }
 
-            if(fileContents.contains("Submitted on")){ //fileContents has Submission Time
-                String [] splitContent=fileContents.split("Submitted on ");
-                projectSubmission.setSubmissionTime(parseSubmissionTime(splitContent[splitContent.length -1]));
+            if(fileContents.contains(SUBMITTEDON)){ //fileContents has Submission Time
+                String [] splitContent=fileContents.split(SUBMITTEDON);
+                projectSubmission.setSubmissionTime(parseSubmissionTime(splitContent[splitContent.length -1].trim()));
 
             }
 
-            if(fileContents.contains("Graded on")){ //fileContents has Graded Time
-                String [] splitContent=fileContents.split("Graded on");
+            if(fileContents.contains(GRADEDON)){ //fileContents has Graded Time
+                String [] splitContent=fileContents.split(GRADEDON);
                 projectSubmission.setGradedTime(parseGradingTime(splitContent[splitContent.length -1].trim()));
             }
-              if(fileContents.contains("out of")){ //fileContents has Total Points and Awarded Points
-                  String [] splitContent=fileContents.split("out of");
-                  String keyword="out of";
-                  String awardedPoints=fileContents.substring(0, fileContents.indexOf(keyword));
-                  if(!awardedPoints.isEmpty() && awardedPoints != "") {
-                      double specifiedGrade = Double.parseDouble(awardedPoints);
-                      projectSubmission.setScore(specifiedGrade);
-                  }
-                  projectSubmission.setTotalPoints(Double.parseDouble(splitContent[splitContent.length -1].trim()));
-              }
-
 
-          }
+            if(fileContents.contains("out of")){ //fileContents has Total Points and Awarded Points
 
-      } catch (IOException e) {
-          e.printStackTrace();
-      }
-      catch(ParseException pe)
-      {
-          logger.error("While Parsing the Date"+ pe);
-      }
+                  Pattern rightpattern = Pattern.compile("(?<=out of).*");
+                  Pattern leftpattern=Pattern.compile(".*(?=out of)");
+                  Matcher rightmatcher = rightpattern.matcher(fileContents);
+                  Matcher leftmatcher = leftpattern.matcher(fileContents);
+                  if (rightmatcher.find()) {
+                      projectSubmission.setTotalPoints(Double.parseDouble(rightmatcher.group().trim()));
+                  }
+                  else
+                  {
+                      throw new InvalidFileContentException("Not able to retrieve Total Points");
+                  }
+                  if(leftmatcher.find()){
 
+                      projectSubmission.setScore(Double.parseDouble(leftmatcher.group().trim()));
+                  }
+                  else {
+                      throw new InvalidFileContentException("Not able to retrieve the Score");
+                  }
+              }
+          }
       return  projectSubmission;
   }
 
@@ -100,7 +110,7 @@ public static Date parseGradingTime(String gradingTimeString) throws ParseExcept
       return date;
   }
 
-    private BufferedReader bufferedReader=null;
-    private ProjectSubmission projectSubmission=null;
+
+    private ProjectSubmission projectSubmission;
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 }
diff --git a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
index 97946f986..4b7cdb186 100644
--- a/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
+++ b/grader/src/main/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionXmlConverter.java
@@ -9,70 +9,71 @@
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 import java.io.*;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class ProjectSubmissionXmlConverter {
-  private final JAXBContext xmlContext;
-  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final JAXBContext xmlContext;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-  public ProjectSubmissionXmlConverter() throws JAXBException {
-    xmlContext = JAXBContext.newInstance(ProjectSubmission.class);
-  }
+    public ProjectSubmissionXmlConverter() throws JAXBException {
+        xmlContext = JAXBContext.newInstance(ProjectSubmission.class);
+    }
 
-  public void convertToXml(ProjectSubmission submission, Writer writer) throws JAXBException {
-    Marshaller marshaller = this.xmlContext.createMarshaller();
-    marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-    marshaller.marshal(submission, writer);
-  }
+    public void convertToXml(ProjectSubmission submission, Writer writer) throws JAXBException {
+        Marshaller marshaller = this.xmlContext.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        marshaller.marshal(submission, writer);
+    }
 
-  public ProjectSubmission convertFromXml(Reader reader) throws JAXBException {
-    Unmarshaller unmarshaller = this.xmlContext.createUnmarshaller();
-    return (ProjectSubmission) unmarshaller.unmarshal(reader);
-  }
+    public ProjectSubmission convertFromXml(Reader reader) throws JAXBException {
+        Unmarshaller unmarshaller = this.xmlContext.createUnmarshaller();
+        return (ProjectSubmission) unmarshaller.unmarshal(reader);
+    }
 
-  public static void main(String... args) throws JAXBException {
-    List<String> outFileNames = new ArrayList<>();
-    outFileNames.addAll(Arrays.asList(args));
+    public static void main(String... args) throws JAXBException {
+        List<String> outFileNames = new ArrayList<>();
+        outFileNames.addAll(Arrays.asList(args));
 
-    if (outFileNames.isEmpty()) {
-      usage("Missing project submission out file name");
-    }
+        if (outFileNames.isEmpty()) {
+            usage("Missing project submission out file name");
+        }
 
-    ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
-    outFileNames.stream().map(File::new).forEach(converter::convertOutFileToXml);
-  }
+        ProjectSubmissionXmlConverter converter = new ProjectSubmissionXmlConverter();
+        outFileNames.stream().map(File::new).forEach(converter::convertOutFileToXml);
+}
 
   private void convertOutFileToXml(File outFile) {
+
+     File xmlFile = null;
     if (!outFile.exists()) {
       logger.error("Output file \"" + outFile + "\" does not exist");
       return;
     }
-
-    ProjectSubmission submission;
     try {
-      ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new FileReader(outFile));
-      submission = parser.parse();
 
-    } catch (FileNotFoundException e) {
-      logger.error("Could not file file " + outFile, e);
-      return;
-    }
+    ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new FileReader(outFile));
+    ProjectSubmission submission = parser.parse();
 
     String outFileName = outFile.getName();
     String filePrefix= outFileName.substring(outFileName.indexOf('.'));
     String xmlFileName = filePrefix + ".xml";
 
     File directory = outFile.getParentFile();
-    File xmlFile = new File(directory, xmlFileName);
+    xmlFile = new File(directory, xmlFileName);
+
 
-    try {
       convertToXml(submission, new FileWriter(xmlFile));
 
-    } catch (JAXBException | IOException e) {
+    }
+    catch (JAXBException | IOException e) {
       logger.error("While writing to " + xmlFile, e);
     }
+    catch (ParseException| InvalidFileContentException e) {
+      logger.error("Exception" + xmlFile, e);
+    }
 
   }
 
diff --git a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
index b2ec19a5c..1f66fb51d 100644
--- a/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
+++ b/grader/src/test/java/edu/pdx/cs410J/grader/scoring/ProjectSubmissionOutputFileParserTest.java
@@ -3,6 +3,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -182,7 +183,10 @@ public void parseCompilerTestWithNoOutput() {
     file.line();
     file.line("*****  Test 1: No arguments");
 
-    ProjectSubmission submission = parse(file);
+    ProjectSubmission submission = null;
+ 
+      submission = parse(file);
+  
     List<TestCaseOutput> testCases = submission.getTestCaseOutputs();
     assertThat(testCases.size(), equalTo(2));
 
@@ -195,7 +199,7 @@ public void parseCompilerTestWithNoOutput() {
 
   @Ignore
   @Test
-  public void parseTest1() {
+  public void parseTest1() throws IOException, ParseException {
     OutputFile file = new OutputFile();
     String testName = "Test 1";
     String description = "No arguments";
@@ -231,9 +235,21 @@ public void parseTest1() {
 
 
   private ProjectSubmission parse(OutputFile file) {
+    ProjectSubmission projectSubmission = null;
+    try {
     String text = file.getText();
     ProjectSubmissionOutputFileParser parser = new ProjectSubmissionOutputFileParser(new StringReader(text));
-    return parser.parse();
+    projectSubmission= parser.parse();
+   
+       parser.parse();
+    } catch (ParseException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    } catch (InvalidFileContentException e) {
+      e.printStackTrace();
+    }
+    return projectSubmission;
   }
 
   private class OutputFile {