Skip to content

Commit

Permalink
updated branch with updates to packaging in main
Browse files Browse the repository at this point in the history
  • Loading branch information
jltng committed Nov 29, 2022
2 parents 28c055a + b11b56d commit abbe8cf
Show file tree
Hide file tree
Showing 169 changed files with 1,145 additions and 839 deletions.
52 changes: 28 additions & 24 deletions src/main/java/Main.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import course_creation_use_case.*;
//import course_enrolment_use_case.CourseEnrolmentDsGateway;
import course_enrolment_use_case.CourseEnrolmentInputBoundary;
import course_enrolment_use_case.CourseEnrolmentInteractor;
import course_enrolment_use_case.CourseEnrolmentOutputBoundary;
import entities.*;
import event_creation_screens.*;
import event_creation_use_case.*;
import progress_tracker_use_case.*;
import screens.*;
import user_register_usecase.*;
import screens.calendar_scheduler.*;
import screens.course_progress.*;
import screens.courses_features.*;
import screens.login_registration.*;
import screens.task_management.event_creation_screens.*;
import use_cases.course_features.course_creation_use_case.*;
import use_cases.course_tracker.progress_tracker_use_case.*;
import screens.collaborative_task_scheduling.*;
import use_cases.collaborative_task_scheduling.scheduling_ct_use_case.*;
import use_cases.calendar_scheduler.schedule_conflict_use_case.ScheduleConflictPresenter;
import use_cases.calendar_scheduler.scheduler_use_case.SchedulerPresenter;
import use_cases.login_registration.user_register_usecase.*;
import use_cases.task_management.event_creation_use_case.*;

import javax.swing.*;
import java.awt.*;
Expand Down Expand Up @@ -39,40 +43,40 @@ public static void main(String[] args) {
User user = ((UserRegInteractor) userInteractor).getUser();

EventCreationPresenter eventPresenter = new EventCreationResponseFormatter();
EventCreationInputBoundary eventInteractor = new EventCreationInteractor(eventPresenter, (StudentUser) user);
EventCreationController eventCreationController = new EventCreationController(eventInteractor);
// EventCreationInputBoundary eventInteractor = new EventCreationInteractor(eventPresenter, (StudentUser) user);
// EventCreationController eventCreationController = new EventCreationController(eventInteractor);

ProgressTrackerOutputBoundary trackerPresenter = new ProgressTrackerPresenter();
ProgressTrackerInputBoundary trackerInteractor = new ProgressTrackerInteractor (trackerPresenter);
ProgressTrackerController trackerController = new ProgressTrackerController(trackerInteractor, user, "", allTasks, allUsers, allCourses);

CourseCreationDsGateway course;
try {
course = new FileCourse("./courses.csv");
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException("Could not create file.");
}
CourseCreationOutputBoundary presenter = new CourseCreationPresenter();
CourseMap courseMap = new CourseMap();
CourseCreationInputBoundary interactor = new CourseCreationInteractor(course, presenter, courseMap);
CourseCreationController courseCreationController = new CourseCreationController(interactor);
// try {
// course = new FileCourse("./courses.csv");
// } catch (IOException | ClassNotFoundException e) {
// throw new RuntimeException("Could not create file.");
// }
// CourseCreationOutputBoundary presenter = new CourseCreationPresenter();
// CourseMap courseMap = new CourseMap();
// CourseCreationInputBoundary interactor = new CourseCreationInteractor(course, presenter, courseMap);
// CourseCreationController courseCreationController = new CourseCreationController(interactor);

// CourseEnrolmentOutputBoundary enrolmentPresenter = new CourseEnrolmentPresenter();
// CourseEnrolmentInputBoundary enrolmentInteractor = new CourseEnrolmentInteractor (enrolmentPresenter, courseMap, user.getName());
// CourseEnrolmentController enrolmentController = new CourseEnrolmentController(enrolmentInteractor);

// Build the GUI
EventCreationScreen taskScreen = new EventCreationScreen(eventCreationController, screens, cardLayout);
screens.add("toDoList", taskScreen);
// EventCreationScreen taskScreen = new EventCreationScreen(eventCreationController, screens, cardLayout);
// screens.add("toDoList", taskScreen);

CalendarScreen calendarScreen = new CalendarScreen((StudentUser) user, allTasks, screens, cardLayout);
screens.add("calendar", calendarScreen);

ProgressTrackerScreen progressTrackerScreen = new ProgressTrackerScreen(trackerController);
screens.add("tracker", progressTrackerScreen);

CourseCreationScreen courseCreationScreen = new CourseCreationScreen(courseCreationController, screens, cardLayout);
screens.add("course", courseCreationScreen);
// CourseCreationScreen courseCreationScreen = new CourseCreationScreen(courseCreationController, screens, cardLayout);
// screens.add("course", courseCreationScreen);

// CourseEnrolmentScreen courseEnrolmentScreen = new CourseEnrolmentScreen(enrolmentController);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/entities/TaskMap.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package entities;

import read_write.ReadWriter;
import use_cases.task_management.read_write.ReadWriter;

import java.io.IOException;
import java.io.Serializable;
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/logout_usecase/LogoutRequestModel.java

This file was deleted.

65 changes: 0 additions & 65 deletions src/main/java/scheduling_ct_screens/EnterTimeAndTask.java

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/scheduling_ct_screens/LabelTextPanel.java

This file was deleted.

20 changes: 0 additions & 20 deletions src/main/java/scheduling_ct_screens/PresentOutput.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/main/java/scheduling_ct_screens/ScheduleCTController.java

This file was deleted.

23 changes: 0 additions & 23 deletions src/main/java/scheduling_ct_screens/ScheduleCTPresenter.java

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/scheduling_ct_use_case/ScheduleCTInputBoundary.java

This file was deleted.

Loading

0 comments on commit abbe8cf

Please sign in to comment.