Refactor code to pass CI

src/main/java/TutorLink/command/Command.java → src/main/java/tutorlink/commandpackage/Command.java

@@ -1,6 +1,6 @@
-package TutorLink.command;
+package TutorLink.commandpackage;
 
-import TutorLink.list.List;
+import TutorLink.listpackage.ItemList;
 
 /**
  * Represents an interpreted Command from the user. A <code>Command</code> object corresponds to a
@@ -10,12 +10,12 @@ public abstract class Command {
     /**
      * Executes the required operations to perform the command issued by the user.
      */
-    abstract public void execute(List list);
+    public abstract void execute(ItemList list);
 
     /**
      * Checks if the command is an exit command.
      *
      * @return whether the current command is an ExitCommand
      */
-    abstract public boolean isExit();
+    public abstract boolean isExit();
 }

src/main/java/TutorLink/command/assignment_command/AddAssignmentCommand.java → src/main/java/tutorlink/commandpackage/assignmentcommand/AddAssignmentCommand.java

@@ -1,17 +1,15 @@
-package TutorLink.command.assignment_command;
+package TutorLink.commandpackage.AssignmentCommand;
 
-import TutorLink.list.List;
 import tutorlink.assignment.Assignment;
-
-import java.util.ArrayList;
+import TutorLink.listpackage.ItemList;
 
 public class AddAssignmentCommand extends AssignmentCommand {
     public AddAssignmentCommand(Assignment assignment) {
         super(assignment);
     }
 
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
 
     }
 

src/main/java/TutorLink/command/assignment_command/AssignmentCommand.java → src/main/java/tutorlink/commandpackage/assignmentcommand/AssignmentCommand.java

@@ -1,10 +1,8 @@
-package TutorLink.command.assignment_command;
+package TutorLink.commandpackage.AssignmentCommand;
 
-import TutorLink.command.Command;
+import TutorLink.commandpackage.Command;
 import tutorlink.assignment.Assignment;
 
-import java.util.ArrayList;
-
 public abstract class AssignmentCommand extends Command {
     private Assignment assignment;
 

src/main/java/TutorLink/command/assignment_command/DeleteAssignmentCommand.java → src/main/java/tutorlink/commandpackage/assignmentcommand/DeleteAssignmentCommand.java

@@ -1,18 +1,16 @@
-package TutorLink.command.assignment_command;
+package TutorLink.commandpackage.AssignmentCommand;
 
-import TutorLink.list.List;
+import TutorLink.listpackage.ItemList;
 import tutorlink.assignment.Assignment;
 
-import java.util.ArrayList;
-
 public class DeleteAssignmentCommand extends AssignmentCommand{
     public DeleteAssignmentCommand(Assignment assignment) {
         super(assignment);
     }
 
 
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
 
     }
 }

src/main/java/TutorLink/command/attendance_command/AddAttendanceCommand.java → src/main/java/tutorlink/commandpackage/attendancecommand/AddAttendanceCommand.java

@@ -1,18 +1,16 @@
-package TutorLink.command.attendance_command;
+package TutorLink.commandpackage.AttendanceCommand;
 
-import TutorLink.list.List;
+import TutorLink.listpackage.ItemList;
 import tutorlink.attendance.Attendance;
 
-import java.util.ArrayList;
-
 public class AddAttendanceCommand extends AttendanceCommand{
 
     public AddAttendanceCommand(Attendance attendance) {
         super(attendance);
     }
 
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
 
     }
 }

src/main/java/TutorLink/command/attendance_command/AttendanceCommand.java → src/main/java/tutorlink/commandpackage/attendancecommand/AttendanceCommand.java

@@ -1,6 +1,6 @@
-package TutorLink.command.attendance_command;
+package TutorLink.commandpackage.AttendanceCommand;
 
-import TutorLink.command.Command;
+import TutorLink.commandpackage.Command;
 import tutorlink.attendance.Attendance;
 
 public abstract class AttendanceCommand extends Command {

src/main/java/TutorLink/command/attendance_command/DeleteAttendanceCommand.java → src/main/java/tutorlink/commandpackage/attendancecommand/DeleteAttendanceCommand.java

@@ -1,18 +1,16 @@
-package TutorLink.command.attendance_command;
+package TutorLink.commandpackage.AttendanceCommand;
 
-import TutorLink.list.List;
+import tutorlink.listpackage.ItemList;
 import tutorlink.attendance.Attendance;
 
-import java.util.ArrayList;
-
 public class DeleteAttendanceCommand extends AttendanceCommand{
 
     public DeleteAttendanceCommand(Attendance attendance) {
         super(attendance);
     }
 
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
 
     }
 }

src/main/java/TutorLink/command/student_command/addStudentCommand.java → src/main/java/tutorlink/commandpackage/studentcommand/AddStudentCommand.java

@@ -1,20 +1,18 @@
-package TutorLink.command.student_command;
+package TutorLink.commandpackage.StudentCommand;
 
-import TutorLink.list.List;
-import tutorlink.student.Student;
-import TutorLink.list.StudentList;
-
-import java.util.ArrayList;
+import TutorLink.listpackage.ItemList;
+import TutorLink.listpackage.StudentList;
+import TutorLink.studentpackage.StudentClass;
 
 public class AddStudentCommand extends StudentCommand {
 
-    public AddStudentCommand(Student student) {
+    public AddStudentCommand(StudentClass student) {
         super(student);
     }
 
     // Implement the generic execute method to handle the List type
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
         if (list instanceof StudentList) {
             ((StudentList) list).addStudent(student);
         } else {

src/main/java/TutorLink/command/student_command/DeleteStudentCommand.java → src/main/java/tutorlink/commandpackage/studentcommand/DeleteStudentCommand.java

@@ -1,18 +1,19 @@
-package TutorLink.command.student_command;
+package TutorLink.commandpackage.StudentCommand;
+
+import TutorLink.listpackage.ItemList;
+import TutorLink.listpackage.StudentList;
+import TutorLink.studentpackage.StudentClass;
 
-import TutorLink.list.List;
-import TutorLink.list.StudentList;
-import tutorlink.student.Student;
 
 public class DeleteStudentCommand extends StudentCommand {
 
-    public DeleteStudentCommand(Student student) {
+    public DeleteStudentCommand(StudentClass student) {
         super(student);
     }
 
     // Implement the generic execute method to handle the List type
     @Override
-    public void execute(List list) {
+    public void execute(ItemList list) {
         if (list instanceof StudentList) {
             ((StudentList) list).deleteStudent(student);
         } else {

src/main/java/tutorlink/commandpackage/studentcommand/StudentCommand.java

@@ -0,0 +1,17 @@
+package TutorLink.commandpackage.StudentCommand;
+
+import TutorLink.commandpackage.Command;
+import TutorLink.studentpackage.StudentClass;
+
+public abstract class StudentCommand extends Command {
+    protected StudentClass student;
+
+    public StudentCommand(StudentClass student) {
+        this.student = student;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+}

src/main/java/TutorLink/course/Course.java → src/main/java/tutorlink/coursepackage/Course.java

@@ -1,7 +1,7 @@
-package TutorLink.course;
+package TutorLink.coursepackage;
 
-import TutorLink.list.AssignmentList;
-import TutorLink.list.AttendanceList;
+import TutorLink.listpackage.AssignmentList;
+import TutorLink.listpackage.AttendanceList;
 import tutorlink.assignment.Assignment;
 import tutorlink.course.LetterGrade;
 

src/main/java/TutorLink/list/AssignmentList.java → src/main/java/tutorlink/listpackage/AssignmentList.java

@@ -1,12 +1,10 @@
-package TutorLink.list;
+package TutorLink.listpackage;
 
-import TutorLink.list.List;
 import tutorlink.assignment.Assignment;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
-public class AssignmentList extends List {
+public class AssignmentList extends ItemList {
     private int numberOfAssignments;
     ArrayList<Assignment> assignmentArrayList;
 

src/main/java/TutorLink/list/AttendanceList.java → src/main/java/tutorlink/listpackage/AttendanceList.java

@@ -1,11 +1,10 @@
-package TutorLink.list;
+package TutorLink.listpackage;
 
-import TutorLink.list.List;
 import tutorlink.attendance.Attendance;
 
 import java.util.ArrayList;
 
-public class AttendanceList extends List {
+public class AttendanceList extends ItemList {
     private ArrayList<Attendance> attendanceArrayList;
     private int numberOfAttendance;
 

src/main/java/TutorLink/list/CourseList.java → src/main/java/tutorlink/listpackage/CourseList.java

@@ -1,11 +1,11 @@
-package TutorLink.list;
+package TutorLink.listpackage;
 
 
-import TutorLink.course.Course;
+import TutorLink.coursepackage.Course;
 
 import java.util.ArrayList;
 
-public class CourseList extends List {
+public class CourseList extends ItemList {
     private int numberOfCourses;
     ArrayList<Course> courseArrayList;
 

src/main/java/tutorlink/listpackage/ItemList.java

@@ -0,0 +1,4 @@
+package TutorLink.listpackage;
+
+public class ItemList {
+}

src/main/java/tutorlink/listpackage/StudentList.java

@@ -0,0 +1,29 @@
+package TutorLink.listpackage;
+
+import TutorLink.studentpackage.StudentClass;
+
+import java.util.ArrayList;
+
+public class StudentList extends ItemList {
+    private ArrayList<StudentClass> studentArrayList;
+
+    public StudentList() {
+        this.studentArrayList = new ArrayList<>();
+    }
+
+    public void deleteStudent(StudentClass student) {
+        studentArrayList.remove(student);
+    }
+
+    public void addStudent(StudentClass student) {
+        studentArrayList.add(student);
+    }
+
+    public int getNumberOfStudents() {
+        return studentArrayList.size();
+    }
+
+    public ArrayList<StudentClass> getStudentArrayList() {
+        return studentArrayList;
+    }
+}