Skip to content

Commit 6be9352

Browse files
committed
Addressed the warning: "Return value of the method is never used" in DelFlashcardSetController.
Fixed it by making minor changes in DeletionScreen.
1 parent 6604d3b commit 6be9352

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

src/main/java/delete_flashcard_set_use_case/DeletionScreen.java

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package delete_flashcard_set_use_case;
22

3-
43
import data_access.DBGateway;
54
import login_and_signup_use_case.UserLoginResponseModel;
6-
import view.Screen;
75

86
import javax.swing.*;
97
import java.awt.*;
@@ -13,18 +11,30 @@
1311

1412
// Frameworks/Drivers (Blue) layer
1513

16-
public class DeletionScreen extends Screen implements ActionListener {
14+
/**
15+
* The flashcard set deletion screen.
16+
*
17+
* @author Edward Ishii
18+
*/
19+
public class DeletionScreen extends JFrame implements ActionListener {
1720
/**
18-
* The id of the flashcard set to be deleted
21+
* The id of the flashcard set to be deleted.
1922
*/
2023
int flashcardSetID;
2124

25+
/**
26+
* The user.
27+
*/
2228
UserLoginResponseModel user;
2329

2430
/**
25-
* The controller
31+
* The controller.
2632
*/
2733
DelFlashcardSetController controller;
34+
35+
/**
36+
* The database gateway.
37+
*/
2838
DBGateway gateway;
2939

3040
// /**
@@ -37,7 +47,7 @@ public class DeletionScreen extends Screen implements ActionListener {
3747
*/
3848
public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller, UserLoginResponseModel user,
3949
DBGateway gateway) {
40-
this.user=user;
50+
this.user = user;
4151
this.flashcardSetID = flashcardSetID;
4252
this.controller = controller;
4353
this.gateway = gateway;
@@ -78,19 +88,16 @@ public void actionPerformed(ActionEvent evt) {
7888
// Exit deletion screen if user cancels deletion
7989
if (Objects.equals(evt.getActionCommand(), "Cancel")) {
8090
this.dispose();
81-
}
82-
83-
else { // Delete was pressed
91+
} else { // Delete was pressed
8492
// try {
8593
// int id = Integer.parseInt(flashcardSetID.getText()); // check input is an integer
8694

8795
// Ask for confirmation
8896
String title;
8997
// Admin deletion
90-
if (user.getFlashcardSets().get(flashcardSetID) == null){
91-
title = gateway.getFlashcardSet(flashcardSetID).getTitle();
92-
}
93-
else{
98+
if (user.getFlashcardSets().get(flashcardSetID) == null) {
99+
title = gateway.getFlashcardSet(flashcardSetID).getTitle();
100+
} else {
94101
// User deletion
95102
title = user.getFlashcardSets().get(flashcardSetID)[0];
96103
}
@@ -101,8 +108,9 @@ public void actionPerformed(ActionEvent evt) {
101108
"Confirmation", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
102109
if (confirmation == 0) {
103110
try {
104-
controller.delete(flashcardSetID);
105-
JOptionPane.showMessageDialog(this, title + " has been deleted.");
111+
DelFlashcardSetResponseModel responseModel = controller.delete(flashcardSetID);
112+
responseModel.setMessage(title + " has been deleted.");
113+
JOptionPane.showMessageDialog(this, responseModel.getMessage());
106114
this.dispose(); // exit deletion screen
107115
} catch (FlashcardSetNotFound e) {
108116
JOptionPane.showMessageDialog(this, e.getMessage());

0 commit comments

Comments
 (0)