Fix master

src/main/java/Validation/OwnershipChecker.java

@@ -1,8 +1,9 @@
 package Validation;
 
-import classes.quiz_utilities.Quiz;
-import database.quiz_utilities.QuizDAO;
+import classes.Quiz;
+import database.QuizDAO;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;

src/main/java/classes/quiz_utilities/AnswerChecker.java → src/main/java/classes/AnswerChecker.java

@@ -1,6 +1,4 @@
-package classes.quiz_utilities;
-
-import java.sql.SQLException;
+package classes;
 
 public interface AnswerChecker {
     /**
@@ -10,5 +8,5 @@ public interface AnswerChecker {
      * @param userAnswer the user's answer input
      * @return points in double according to answer correctness
      */
-    double getPoints(String questionID, GeneralAnswer userAnswer) throws SQLException;
+    double getPoints(String questionID, GeneralAnswer userAnswer);
 }

src/main/java/classes/quiz_utilities/GeneralAnswer.java → src/main/java/classes/GeneralAnswer.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 import java.util.List;
 
@@ -9,10 +9,6 @@ public GeneralAnswer(String questionID) {
         this.questionID = questionID;
     }
 
-    protected GeneralAnswer() {
-        questionID = null;
-    }
-
     public String getQuestionID() {
         return questionID;
     }

src/main/java/classes/quiz_utilities/MockQuestion.java → src/main/java/classes/MockQuestion.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 public class MockQuestion implements Question {
     private String question;

src/main/java/classes/quiz_utilities/MockQuiz.java → src/main/java/classes/MockQuiz.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 import java.util.Date;
 
@@ -12,15 +12,13 @@ public class MockQuiz implements Quiz{
     private int timeLimit;
     private String type;
     private boolean visible;
-    private String format;
-    public MockQuiz(String author, Date created, String id,  String type, String name, String format){
+    public MockQuiz(String author, Date created, String id,  String type, String name){
         this.id = id;
         this.author = author;
         this.creationDate = created;
         this.type = type;
         this.name = name;
         timeLimit = (int)1e9;
-        this.format = format;
     }
     public void setName(String name) {
         this.name = name;
@@ -61,18 +59,7 @@ public int getTimeLimit() {
     public String getType() {
         return type;
     }
-
-    @Override
-    public String getPageFormat() {
-        return format;
-    }
-
     public void setVisible(boolean visible) {
         this.visible = visible;
     }
-
-    @Override
-    public void setPageFormat(String pageFormat) {
-        format = pageFormat;
-    }
 }

src/main/java/classes/quiz_utilities/Question.java → src/main/java/classes/Question.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 public interface Question {
     /*

src/main/java/classes/QuestionDAO.java

@@ -1,7 +1,5 @@
 package classes;
 
-import classes.quiz_utilities.Question;
-
 import java.util.List;
 
 public interface QuestionDAO {

src/main/java/classes/quiz_utilities/Quiz.java → src/main/java/classes/Quiz.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 import java.util.Date;
 
@@ -30,11 +30,10 @@ public interface Quiz {
      */
     String getType();
 
-    String getPageFormat();
 
     void setVisible(boolean visible);
 
-    void setPageFormat(String pageFormat);
+
     void setNumQuestions(int numQuestions);
     void setTopic(String topic);
     void setTimeLimit(int timeLimit);

src/main/java/classes/quiz_utilities/QuizChecker.java → src/main/java/classes/QuizChecker.java

@@ -1,7 +1,6 @@
-package classes.quiz_utilities;
+package classes;
 
 
-import java.sql.SQLException;
 import java.util.Map;
 
 public interface QuizChecker {
@@ -11,5 +10,5 @@ public interface QuizChecker {
      * @param userAnswers a map from question ID to user answers
      * @return a map from question ID to whether the answer was correct (T/F)
      */
-    Map<String, Double> checkedAnswers(Map<String, GeneralAnswer> userAnswers) throws SQLException;
+    Map<String, Double> checkAnswer(Map<String, GeneralAnswer> userAnswers);
 }

src/main/java/classes/QuizResult.java

@@ -1,26 +1,22 @@
 package classes;
 
-import classes.quiz_utilities.Quiz;
-import classes.quiz_utilities.RealQuiz;
-
 import java.sql.Timestamp;
 
 public class QuizResult {
     private String username;
-    private Quiz quiz;
-    private double score;
+    private String quizId;
+    private int score;
     private Timestamp submitTime;
 
-    public QuizResult(String username, Quiz quiz, double score, Timestamp submitTime) {
+    public QuizResult(String username, String quizId, int score, Timestamp submitTime) {
         this.username = username;
-        this.quiz = quiz;
+        this.quizId = quizId;
         this.score = score;
         this.submitTime = submitTime;
     }
 
     public String getUsername() { return username; }
-    public String getQuizId() { return quiz.getID(); }
-    public String getQuizName() {return quiz.getName();}
-    public double getScore() { return score; }
+    public String getQuizId() { return quizId; }
+    public int getScore() { return score; }
     public Timestamp getSubmitTime() { return submitTime; }
 }

src/main/java/classes/quiz_utilities/RealQuestion.java → src/main/java/classes/RealQuestion.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 
 import java.util.Objects;

src/main/java/classes/quiz_utilities/RealQuiz.java → src/main/java/classes/RealQuiz.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 import java.util.Date;
 
@@ -12,16 +12,14 @@ public class RealQuiz implements Quiz {
     private String topic;
     private int timeLimit;
     private boolean visible;
-    private String pageFormat;
 
-    public RealQuiz(String author, Date date, String id, String type, String name, String pageFormat) {
+    public RealQuiz(String author, Date date, String id, String type, String name) {
         this.author = author;
         this.date = date;
         this.id = id;
         this.type = type;
         this.name = name;
         this.visible = false;
-        this.pageFormat = pageFormat;
     }
 
     @Override
@@ -64,11 +62,6 @@ public String getType() {
         return type;
     }
 
-    @Override
-    public String getPageFormat() {
-        return pageFormat;
-    }
-
     @Override
     public void setVisible(boolean param) {
         this.visible = param;
@@ -93,9 +86,4 @@ public void setTimeLimit(int timeLimit) {
     public void setName(String newName) {
         this.name = newName;
     }
-
-    @Override
-    public void setPageFormat(String pageFormat) {
-        this.pageFormat = pageFormat;
-    }
 }

src/main/java/classes/quiz_utilities/SingleAnswer.java → src/main/java/classes/SingleAnswer.java

@@ -1,4 +1,4 @@
-package classes.quiz_utilities;
+package classes;
 
 import java.util.Collections;
 import java.util.List;