From e7b600736eeee00f460ea3e1a8d6d7524289ecc1 Mon Sep 17 00:00:00 2001 From: Obai Albek Date: Mon, 2 Jun 2025 00:38:01 +0200 Subject: [PATCH] Bugfix --- MailSystem/src/domain/EasyMail.java | 54 ++++++++++----------- MailSystem/src/domain/user/UserManager.java | 2 +- MailSystem/src/gui/EasyMailWindow.java | 2 + MailSystem/src/gui/RegisterWindow.java | 5 +- MailSystem/src/gui/SentWindow.java | 2 +- MailSystem/src/gui/TemplateWindow.java | 7 +++ 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/MailSystem/src/domain/EasyMail.java b/MailSystem/src/domain/EasyMail.java index 2c31e57..b2d7c05 100644 --- a/MailSystem/src/domain/EasyMail.java +++ b/MailSystem/src/domain/EasyMail.java @@ -15,7 +15,8 @@ public class EasyMail { this.userManager = new UserManager(); try { this.currentUser = userManager.addUser ("obai","albek","obai.albek",1,1,"Januar",new char[] {'1','2','3','4','5','6'} , new char[]{'1','2','3','4','5','6'}); - } catch (Exception e) { + //obai.albek@easymail.de + } catch (Exception e) { e.printStackTrace(); } } @@ -80,39 +81,38 @@ public class EasyMail { return this.currentUser.getUsermail().getUsername(); } - public ArrayList sendAllEmailstoSentWindow() { - ArrayList allEmails = this.currentUser.getUsermail().getSentFolder().listAllEmails(); - ArrayList treffer = new ArrayList<>(); - - for (Email tempEmail : allEmails) - treffer.add(tempEmail.showEmailsInSent()); - - return treffer; + + public ArrayList sendAllEmailsToSentWindow() { + ArrayList allEmails = currentUser.getUsermail().getSentFolder().listAllEmails(); + return extractEmails(allEmails, true); // true = showEmailsInSent } - public ArrayListsendAllEmailsToInboxWindow() { - ArrayList allEmails = this.currentUser.getUsermail().getInbox().listAllEmails(); - ArrayList treffer = new ArrayList<>(); - - for (Email tempEmail : allEmails) - treffer.add(tempEmail.showEmails()); - - return treffer; - + public ArrayList sendAllEmailsToInboxWindow() { + ArrayList allEmails = currentUser.getUsermail().getInbox().listAllEmails(); + return extractEmails(allEmails, false); // false = normal showEmails } + + public ArrayList sendAllEmailsToTrashWindow() { + ArrayList allEmails = currentUser.getUsermail().getTrashFolder().listAllEmails(); + return extractEmails(allEmails, false); + } + - public ArrayListsendAllEmailsToTrashWindow() { - ArrayList allEmails = this.currentUser.getUsermail().getTrashFolder().listAllEmails(); - ArrayList treffer = new ArrayList<>(); - - for (Email tempEmail : allEmails) - treffer.add(tempEmail.showEmails()); - - return treffer; - + private ArrayList extractEmails(ArrayList emails, boolean isSent) { + ArrayList result = new ArrayList<>(); + for (Email email : emails) { + if (isSent) + result.add(email.showEmailsInSent()); + else + result.add(email.showEmails()); + + } + return result; } + + private void validateEmailOperation(String subject) { if (subject == null || subject.trim().isEmpty()) { throw new IllegalArgumentException("Subject field is required!"); diff --git a/MailSystem/src/domain/user/UserManager.java b/MailSystem/src/domain/user/UserManager.java index 4516f5d..eff9c7d 100644 --- a/MailSystem/src/domain/user/UserManager.java +++ b/MailSystem/src/domain/user/UserManager.java @@ -11,7 +11,7 @@ public class UserManager { public UserManager(){ this.users = new ArrayList<>(); - // obai.albek@easymail.de + } public User addUser(String firstName, String lastName, String username, int year, int day, String monthName, diff --git a/MailSystem/src/gui/EasyMailWindow.java b/MailSystem/src/gui/EasyMailWindow.java index b5fc757..71556d3 100644 --- a/MailSystem/src/gui/EasyMailWindow.java +++ b/MailSystem/src/gui/EasyMailWindow.java @@ -52,6 +52,8 @@ public class EasyMailWindow extends TemplateWindow { } }); navigationPanel.add(trash); + + } private void initComposePanel() { diff --git a/MailSystem/src/gui/RegisterWindow.java b/MailSystem/src/gui/RegisterWindow.java index cd0c391..1407f0c 100644 --- a/MailSystem/src/gui/RegisterWindow.java +++ b/MailSystem/src/gui/RegisterWindow.java @@ -60,14 +60,13 @@ public class RegisterWindow extends TemplateWindow { } - - + private void initUI() { JPanel panel = createPanel(81, 80, 573, 709, new Color(230, 230, 230), true); contentPane.add(panel); panel.setLayout(null); - JLabel titleLabel = createLabel("Register - EasyMail", 85, 11, 387, 53, 30); + JLabel titleLabel = createLabel("Register - EasyMail", 160, 11, 387, 53, 30); panel.add(titleLabel); // First Name diff --git a/MailSystem/src/gui/SentWindow.java b/MailSystem/src/gui/SentWindow.java index 27d77af..e8531be 100644 --- a/MailSystem/src/gui/SentWindow.java +++ b/MailSystem/src/gui/SentWindow.java @@ -76,7 +76,7 @@ public class SentWindow extends TemplateWindow { } public void getAllSentEmails() { - ArrayList getEmails = fassade.sendAllEmailstoSentWindow(); + ArrayList getEmails = fassade.sendAllEmailsToSentWindow(); String[] splitEmail; if (getEmails.size() > 0) for (String tempEmail : getEmails) { diff --git a/MailSystem/src/gui/TemplateWindow.java b/MailSystem/src/gui/TemplateWindow.java index f53d690..a5433c7 100644 --- a/MailSystem/src/gui/TemplateWindow.java +++ b/MailSystem/src/gui/TemplateWindow.java @@ -57,6 +57,13 @@ public abstract class TemplateWindow extends JFrame { editProfile = createLabel("Edit profile", 10, 189, 165, 39, 22); editProfile.setForeground(Color.BLUE); profilePanel.add(editProfile); + editProfile.setCursor(new Cursor(Cursor.HAND_CURSOR)); + editProfile.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + System.out.println("Test"); + } + }); String[] getDetails = fassade.sendUserDetails(); String fullName = getDetails[0];