Changed screens.

Author: Junyu11111

src/main/java/flashcardCreator/FcCMain.java

@@ -3,9 +3,10 @@
 import flashcardCreator.fcCScreens.FcCScreen;
 import dataAccess.*;
 
+import javax.swing.*;
 import java.io.IOException;
 
-public class FcCMain{
+public class FcCMain extends JFrame {
     public FcCMain(int flashcardSetId){
         DBGateway gateway;
         try{
@@ -19,7 +20,14 @@ public FcCMain(int flashcardSetId){
         FcCPresenter presenter = new FcCResponseFormatter();
         FcCInputBoundary interactor = new FcCInterator(gateway,presenter);
         FcCController controller = new FcCController(interactor, flashcardSetId);
-        new FcCScreen(controller);
+        FcCScreen fcCScreen= new FcCScreen(controller, this);
+        this.add(fcCScreen);
+        this.setSize(1000, 500);
+        this.setVisible(true);
+        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    }
+    public static void main(String[] args) {
+        new FcCMain(0);
     }
 
 }

src/main/java/flashcardCreator/fcCScreens/FcCFailureScreen.java

@@ -1,27 +1,32 @@
 package flashcardCreator.fcCScreens;
 
 import flashcardCreator.FcCController;
+import flashcardCreator.FcCMain;
 import flashcardCreator.FcCResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class FcCScreen extends JFrame implements ActionListener {
+public class FcCScreen extends JPanel implements ActionListener {
     FcCController controller;
     JTextArea term_text;
     JTextArea definition_text;
-    public FcCScreen(FcCController controller){
+    JFrame fcCMain;
+    public FcCScreen(FcCController controller, JFrame fcCMain){
+        this.fcCMain = fcCMain;
         this.controller = controller;
+        this.setLayout(new BorderLayout());
         JPanel buttonPanel = new JPanel(new FlowLayout());
         JPanel labelPanel = new JPanel(new GridLayout(1,2));
         JPanel textPanel = new JPanel(new GridLayout(1,2));
 
         JButton confirm = new JButton("confirm");
         JButton cancel = new JButton("cancel");
         confirm.addActionListener(this);
-        cancel.addActionListener(e -> {dispose();});
+        cancel.addActionListener(e -> {
+            this.fcCMain.dispose();});
         buttonPanel.add(confirm);
         buttonPanel.add(cancel);
 
@@ -42,7 +47,6 @@ public FcCScreen(FcCController controller){
         this.add(buttonPanel, BorderLayout.SOUTH);
         this.setSize(1000,500);
         this.setVisible(true);
-        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
 
 
@@ -52,12 +56,23 @@ public FcCScreen(FcCController controller){
     public void actionPerformed(ActionEvent e) {
         try{
             FcCResponseModel responseModel = controller.create(term_text.getText(), definition_text.getText());
-            new FcCSuccessScreen(controller, responseModel);
-            dispose();
+            int action = JOptionPane.showConfirmDialog(this,
+                    "Card created:\n"+responseModel.getTerm()+ "\n" + responseModel.getDefinition()
+                            +"\ncreate another card?");
+            if(action == JOptionPane.YES_OPTION){
+                term_text.setText("");
+                definition_text.setText("");
+            }else {
+                fcCMain.dispose();
+            }
         }catch (RuntimeException error){
-            new FcCFailureScreen(controller,error.toString());
-            dispose();
+            int action = JOptionPane.showConfirmDialog(this,
+                    error + "\nRecreate?");
+            if(action == JOptionPane.YES_OPTION){
+                term_text.setText("");
+            }else {
+                fcCMain.dispose();
+            }
         }
-
     }
 }

src/main/java/flashcardCreator/fcCScreens/FcCScreen.java

@@ -1,12 +1,11 @@
 package flashcardRemover;
 
 import dataAccess.*;
-import flashcardRemover.fcRScreens.FcRFailureScreen;
-import flashcardRemover.fcRScreens.FcRSuccessScreen;
 
+import javax.swing.*;
 import java.io.IOException;
 
-public class FcRMain{
+public class FcRMain extends JFrame {
     public FcRMain(int flashcardSetId, int flashcardId){
         DBGateway gateway;
         try{
@@ -20,13 +19,20 @@ public FcRMain(int flashcardSetId, int flashcardId){
         FcRPresenter presenter = new FcRResponseFormatter();
         FcRInputBoundary interactor = new FcRInterator(gateway,presenter);
         FcRController controller = new FcRController(interactor, flashcardSetId);
-
+        this.setVisible(false);
         try {
             FcRResponseModel responseModel = controller.delete(flashcardSetId, flashcardId);
-            new FcRSuccessScreen(responseModel);
+            JOptionPane.showMessageDialog(this,
+                    responseModel.getTerm() + " deleted from " + responseModel.getCardSetName() +
+                    " at " + responseModel.getDeleteDate());
+            this.dispose();
         }catch (RuntimeException error){
-            new FcRFailureScreen(error.toString());
+            JOptionPane.showMessageDialog(this, "Deletion failed:\n" + error);
+            this.dispose();
         }
     }
+    public static void main(String[] args) {
+        new FcRMain(0, 4);
+    }
 
 }