Before digging in to issue #208, move the grade book GUI code into it…

…s own package.
JoyOfCodingPDX · Jul 22, 2017 · 784accd · 784accd
1 parent e12f8d1
commit 784accd
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 42 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...du/pdx/cs410J/grader/AssignmentPanel.java → ...10J/grader/gradebook/AssignmentPanel.java b/...du/pdx/cs410J/grader/AssignmentPanel.java → ...10J/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/...ava/edu/pdx/cs410J/grader/ClassPanel.java → ...x/cs410J/grader/gradebook/ClassPanel.java b/...ava/edu/pdx/cs410J/grader/ClassPanel.java → ...x/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/...a/edu/pdx/cs410J/grader/GradeBookGUI.java → ...cs410J/grader/gradebook/GradeBookGUI.java b/...a/edu/pdx/cs410J/grader/GradeBookGUI.java → ...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/...edu/pdx/cs410J/grader/GradeBookPanel.java → ...410J/grader/gradebook/GradeBookPanel.java b/...edu/pdx/cs410J/grader/GradeBookPanel.java → ...410J/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/...ava/edu/pdx/cs410J/grader/GradePanel.java → ...x/cs410J/grader/gradebook/GradePanel.java b/...ava/edu/pdx/cs410J/grader/GradePanel.java → ...x/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/...cs410J/grader/LetterGradeRangesPanel.java → ...der/gradebook/LetterGradeRangesPanel.java b/...cs410J/grader/LetterGradeRangesPanel.java → ...der/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/...dx/cs410J/grader/NewAssignmentDialog.java → ...grader/gradebook/NewAssignmentDialog.java b/...dx/cs410J/grader/NewAssignmentDialog.java → ...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/...ava/edu/pdx/cs410J/grader/NotesPanel.java → ...x/cs410J/grader/gradebook/NotesPanel.java b/...ava/edu/pdx/cs410J/grader/NotesPanel.java → ...x/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/...a/edu/pdx/cs410J/grader/StudentPanel.java → ...cs410J/grader/gradebook/StudentPanel.java b/...a/edu/pdx/cs410J/grader/StudentPanel.java → ...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/...a/edu/pdx/cs410J/grader/StudentsList.java → ...cs410J/grader/gradebook/StudentsList.java b/...a/edu/pdx/cs410J/grader/StudentsList.java → ...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.*;