connected delete flashcard set to main page, and passed user to DeletionScreen for later use

Author: lucasprates74

src/data/FlashcardSets.csv

@@ -1,4 +1,3 @@
 title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
 test set 1,for testing study use case,false,0,testUser,0,1,2,3
 empty test set,for testing study use case with empty set,true,1,testUser
-new test set,new set for testing flashcards,false,2,testUser

src/data/Users.csv

@@ -1,4 +1,4 @@
 username,password,isAdmin,flashcardSetIds
 jempio,ilovejempio,false
 ducas,badpassword,false
-testUser,password,false,0,1,2
+testUser,password,false,0,1

src/main/java/MainPage/FlashcardSetDataPanel.java

@@ -2,6 +2,8 @@
 
 import EditorMainPage.EditorMainPage;
 import dataAccess.DBGateway;
+import delete_flashcardset_use_case.*;
+import loginAndSignupUseCase.UserLoginResponseModel;
 import quizUseCase.*;
 import quizUseCase.screens.QuizSettingsScreen;
 import studyMode.*;
@@ -13,7 +15,8 @@
 public class FlashcardSetDataPanel extends JPanel {
 
     public FlashcardSetDataPanel(String title, String description,
-                                 int flashcardSetId, DBGateway gateway) {
+                                 int flashcardSetId, DBGateway gateway,
+                                 UserLoginResponseModel user) {
         Border border = BorderFactory.createTitledBorder(title);
 
 
@@ -47,6 +50,12 @@ public FlashcardSetDataPanel(String title, String description,
 
             new QuizSettingsScreen(controller, flashcardSetId);
         });
+        delete.addActionListener(e -> {
+            DelFlashcardSetOutputBoundary presenter = new DelFlashcardSetPresenter();
+            DelFlashcardSetInputBoundary interactor = new DelFlashcardSetInteractor(gateway, presenter);
+            DelFlashcardSetController controller = new DelFlashcardSetController(interactor);
+            new DeletionScreen(flashcardSetId, controller, user);
+        });
 
         this.add(buttons);
         this.setBorder(border);

src/main/java/MainPage/HomePage.java

@@ -50,10 +50,10 @@ public HomePage(UserLoginResponseModel user) throws IOException {
         addFlashcardSetButton.addActionListener(e -> {
             FlashcardSetOutputBoundary presenter = new FlashcardSetPresenter();
             FlashcardSetFactory setFactory = new FlashcardSetFactory();
-            FlashcardSetInteractor interactor = new FlashcardSetInteractor(flashcardSetDataAccess, presenter,
+            FlashcardSetInteractor interactor = new FlashcardSetInteractor(gateway, presenter,
                     setFactory);
             FlashcardSetController controller = new FlashcardSetController(interactor);
-            new CreationScreen(controller, this);
+            new CreationScreen(controller, user);
 
         });
 
@@ -86,7 +86,7 @@ public HomePage(UserLoginResponseModel user) throws IOException {
             this.add(labelPanel);
         }
         else {
-            this.add(new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway));
+            this.add(new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway, user));
         }
         this.setSize(1000, 1000);
         this.setVisible(true);

src/main/java/MainPage/ListOfFlashcardSetsDataPanel.java

@@ -2,28 +2,26 @@
 
 
 import dataAccess.DBGateway;
-import dataAccess.FlashcardDataAccess;
-import dataAccess.FlashcardSetDataAccess;
+import loginAndSignupUseCase.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 public class ListOfFlashcardSetsDataPanel extends JPanel {
 
     public ListOfFlashcardSetsDataPanel(Map<Integer, String[]> idsToFlashcardSetData,
-                                        DBGateway gateway) {
+                                        DBGateway gateway, UserLoginResponseModel user) {
         Set<Integer> flashcardSetIds = idsToFlashcardSetData.keySet();
 
         for (int flashcardSetId : flashcardSetIds) {
            String[] data = idsToFlashcardSetData.get(flashcardSetId);
            String title = data[0];
            String description = data[1];
 
-           this.add(new FlashcardSetDataPanel(title, description, flashcardSetId, gateway));
+           this.add(new FlashcardSetDataPanel(title, description, flashcardSetId, gateway, user));
         }
 
         this.setLayout(new FlowLayout());
@@ -32,17 +30,17 @@ public ListOfFlashcardSetsDataPanel(Map<Integer, String[]> idsToFlashcardSetData
     }
 
     public static void main(String[] args) throws IOException {
-        JFrame f = new JFrame();
-
-        Map<Integer, String[]> map = new HashMap<>();
-        map.put(0, new String[] {"test set", "for testing study use case"});
-        map.put(1, new String[] {"empty test set", "for testing study use case with empty set"});
-        DBGateway gateway = new DBGateway(new FlashcardDataAccess(DBGateway.getFlashcardPath()),
-                new FlashcardSetDataAccess(DBGateway.getFlashcardSetPath()),
-                null);
-
-        f.add(new ListOfFlashcardSetsDataPanel(map, gateway));
-        f.setVisible(true);
-        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        JFrame f = new JFrame();
+//
+//        Map<Integer, String[]> map = new HashMap<>();
+//        map.put(0, new String[] {"test set", "for testing study use case"});
+//        map.put(1, new String[] {"empty test set", "for testing study use case with empty set"});
+//        DBGateway gateway = new DBGateway(new FlashcardDataAccess(DBGateway.getFlashcardPath()),
+//                new FlashcardSetDataAccess(DBGateway.getFlashcardSetPath()),
+//                null);
+//
+//        f.add(new ListOfFlashcardSetsDataPanel(map, gateway, user));
+//        f.setVisible(true);
+//        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     }
 }

src/main/java/delete_flashcardset_use_case/DeletionScreen.java

@@ -1,5 +1,8 @@
 package delete_flashcardset_use_case;
 
+import entityRequestModels.UserDsRequestModel;
+import loginAndSignupUseCase.UserLoginResponseModel;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -8,12 +11,14 @@
 
 // Frameworks/Drivers (Blue) layer
 
-public class DeletionScreen extends JPanel implements ActionListener {
+public class DeletionScreen extends JFrame implements ActionListener {
     /**
      * The id of the flashcard set to be deleted
      */
     int flashcardSetID;
 
+    UserLoginResponseModel user;
+
     /**
      * The controller
      */
@@ -27,10 +32,9 @@ public class DeletionScreen extends JPanel implements ActionListener {
     /**
      * A window with a title and a JButton.
      */
-    public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller, JFrame application) {
+    public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller, UserLoginResponseModel user) {
         this.flashcardSetID = flashcardSetID;
         this.controller = controller;
-        this.application = application;
 
         JLabel name = new JLabel("Flashcard Set Deletion Screen");
         name.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -48,11 +52,14 @@ public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller,
         delete.addActionListener(this);
         cancel.addActionListener(this);
 
-        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
 
         this.add(name);
 //        this.add(id);
         this.add(confirmationButtons);
+
+        this.setVisible(true);
+        this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
     }
 
     /**
@@ -79,7 +86,7 @@ public void actionPerformed(ActionEvent evt) {
                     controller.delete(flashcardSetID);
                     JOptionPane.showMessageDialog(this, "Flashcard Set #"
                             + flashcardSetID + " has been deleted.");
-                    application.dispose();  // exit deletion screen
+                    this.dispose();  // exit deletion screen
                 } catch (FlashcardSetNotFound e) {
                     JOptionPane.showMessageDialog(this, e.getMessage());
                 }