Issue 208 project submissions scoring ui

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

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;

grader/src/main/java/edu/pdx/cs410J/grader/GraderTools.java

@@ -3,7 +3,10 @@
 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 edu.pdx.cs410J.grader.scoring.ProjectSubmissionXmlConverter;
+import edu.pdx.cs410J.grader.scoring.ui.ProjectSubmissionsScorer;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintStream;
@@ -72,6 +75,12 @@ private static Class getToolClass(String tool) {
       case "fixGwtZips":
         return GwtZipFixer.class;
 
+      case "scoreProjectSubmissions":
+        return ProjectSubmissionsScorer.class;
+
+      case "convertProjectOutFilesToXml":
+        return ProjectSubmissionXmlConverter.class;
+
       default:
         usage("Unknown tool: " + tool);
         return null;
@@ -93,16 +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("    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();
 

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;

grader/src/main/java/edu/pdx/cs410J/grader/AssignmentPanel.java → 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);
   }
+
 }

grader/src/main/java/edu/pdx/cs410J/grader/ClassPanel.java → 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;
@@ -262,7 +263,7 @@ void displayAssignments(GradeBook book) {
     assignmentNames.addAll(book.getAssignmentNames());
     this.assignmentsList.setListData(assignmentNames);
   }
-  
+
   /**
    * Displays an assignment in the appropriate fields
    */
@@ -290,7 +291,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);
@@ -322,7 +323,7 @@ public void windowClosing(WindowEvent e) {
       });
 
     frame.getContentPane().add(classPanel);
-    
+
     frame.pack();
     frame.setVisible(true);
   }

grader/src/main/java/edu/pdx/cs410J/grader/GradeBookGUI.java → 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.
  *

grader/src/main/java/edu/pdx/cs410J/grader/GradeBookPanel.java → 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;

grader/src/main/java/edu/pdx/cs410J/grader/GradePanel.java → 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;

grader/src/main/java/edu/pdx/cs410J/grader/LetterGradeRangesPanel.java → grader/src/main/java/edu/pdx/cs410J/grader/gradebook/LetterGradeRangesPanel.java

@@ -1,4 +1,8 @@
-package edu.pdx.cs410J.grader;
+package edu.pdx.cs410J.grader.gradebook;
+
+import edu.pdx.cs410J.grader.GradeBook;
+import edu.pdx.cs410J.grader.LetterGrade;
+import edu.pdx.cs410J.grader.Student;
 
 import javax.swing.*;
 import java.awt.*;

grader/src/main/java/edu/pdx/cs410J/grader/NewAssignmentDialog.java → 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;

grader/src/main/java/edu/pdx/cs410J/grader/NotesPanel.java → 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.*;

grader/src/main/java/edu/pdx/cs410J/grader/StudentPanel.java → 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.*;

grader/src/main/java/edu/pdx/cs410J/grader/StudentsList.java → 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.*;

grader/src/main/java/edu/pdx/cs410J/grader/poa/EventBusThatPublishesUnhandledExceptionEvents.java → 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;

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);
+  }
+}

grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionEvent.java → 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;

grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionPresenter.java → 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;

grader/src/main/java/edu/pdx/cs410J/grader/poa/UnhandledExceptionView.java → 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 {
 

grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/TopLevelJFrame.java → 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;
 

grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UIMain.java

@@ -0,0 +1,37 @@
+package edu.pdx.cs410J.grader.mvp.ui;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+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);
+  }
+}

grader/src/main/java/edu/pdx/cs410J/grader/poa/ui/UnhandledExceptionDialog.java → grader/src/main/java/edu/pdx/cs410J/grader/mvp/ui/UnhandledExceptionDialog.java

@@ -1,8 +1,8 @@
-package edu.pdx.cs410J.grader.poa.ui;
+package edu.pdx.cs410J.grader.mvp.ui;
 
 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.*;

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