Bugfix
parent
6fdcf38847
commit
e7b600736e
|
@ -15,7 +15,8 @@ public class EasyMail {
|
||||||
this.userManager = new UserManager();
|
this.userManager = new UserManager();
|
||||||
try {
|
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'});
|
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();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,39 +81,38 @@ public class EasyMail {
|
||||||
return this.currentUser.getUsermail().getUsername();
|
return this.currentUser.getUsermail().getUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayList<String> sendAllEmailstoSentWindow() {
|
|
||||||
ArrayList<Email> allEmails = this.currentUser.getUsermail().getSentFolder().listAllEmails();
|
|
||||||
ArrayList<String> treffer = new ArrayList<>();
|
|
||||||
|
|
||||||
for (Email tempEmail : allEmails)
|
public ArrayList<String> sendAllEmailsToSentWindow() {
|
||||||
treffer.add(tempEmail.showEmailsInSent());
|
ArrayList<Email> allEmails = currentUser.getUsermail().getSentFolder().listAllEmails();
|
||||||
|
return extractEmails(allEmails, true); // true = showEmailsInSent
|
||||||
return treffer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayList<String>sendAllEmailsToInboxWindow() {
|
public ArrayList<String> sendAllEmailsToInboxWindow() {
|
||||||
ArrayList<Email> allEmails = this.currentUser.getUsermail().getInbox().listAllEmails();
|
ArrayList<Email> allEmails = currentUser.getUsermail().getInbox().listAllEmails();
|
||||||
ArrayList<String> treffer = new ArrayList<>();
|
return extractEmails(allEmails, false); // false = normal showEmails
|
||||||
|
|
||||||
for (Email tempEmail : allEmails)
|
|
||||||
treffer.add(tempEmail.showEmails());
|
|
||||||
|
|
||||||
return treffer;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ArrayList<String>sendAllEmailsToTrashWindow() {
|
public ArrayList<String> sendAllEmailsToTrashWindow() {
|
||||||
ArrayList<Email> allEmails = this.currentUser.getUsermail().getTrashFolder().listAllEmails();
|
ArrayList<Email> allEmails = currentUser.getUsermail().getTrashFolder().listAllEmails();
|
||||||
ArrayList<String> treffer = new ArrayList<>();
|
return extractEmails(allEmails, false);
|
||||||
|
|
||||||
for (Email tempEmail : allEmails)
|
|
||||||
treffer.add(tempEmail.showEmails());
|
|
||||||
|
|
||||||
return treffer;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private ArrayList<String> extractEmails(ArrayList<Email> emails, boolean isSent) {
|
||||||
|
ArrayList<String> 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) {
|
private void validateEmailOperation(String subject) {
|
||||||
if (subject == null || subject.trim().isEmpty()) {
|
if (subject == null || subject.trim().isEmpty()) {
|
||||||
throw new IllegalArgumentException("Subject field is required!");
|
throw new IllegalArgumentException("Subject field is required!");
|
||||||
|
|
|
@ -11,7 +11,7 @@ public class UserManager {
|
||||||
|
|
||||||
public UserManager(){
|
public UserManager(){
|
||||||
this.users = new ArrayList<>();
|
this.users = new ArrayList<>();
|
||||||
// obai.albek@easymail.de
|
|
||||||
|
|
||||||
}
|
}
|
||||||
public User addUser(String firstName, String lastName, String username, int year, int day, String monthName,
|
public User addUser(String firstName, String lastName, String username, int year, int day, String monthName,
|
||||||
|
|
|
@ -52,6 +52,8 @@ public class EasyMailWindow extends TemplateWindow {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
navigationPanel.add(trash);
|
navigationPanel.add(trash);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initComposePanel() {
|
private void initComposePanel() {
|
||||||
|
|
|
@ -61,13 +61,12 @@ public class RegisterWindow extends TemplateWindow {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void initUI() {
|
private void initUI() {
|
||||||
JPanel panel = createPanel(81, 80, 573, 709, new Color(230, 230, 230), true);
|
JPanel panel = createPanel(81, 80, 573, 709, new Color(230, 230, 230), true);
|
||||||
contentPane.add(panel);
|
contentPane.add(panel);
|
||||||
panel.setLayout(null);
|
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);
|
panel.add(titleLabel);
|
||||||
|
|
||||||
// First Name
|
// First Name
|
||||||
|
|
|
@ -76,7 +76,7 @@ public class SentWindow extends TemplateWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getAllSentEmails() {
|
public void getAllSentEmails() {
|
||||||
ArrayList<String> getEmails = fassade.sendAllEmailstoSentWindow();
|
ArrayList<String> getEmails = fassade.sendAllEmailsToSentWindow();
|
||||||
String[] splitEmail;
|
String[] splitEmail;
|
||||||
if (getEmails.size() > 0)
|
if (getEmails.size() > 0)
|
||||||
for (String tempEmail : getEmails) {
|
for (String tempEmail : getEmails) {
|
||||||
|
|
|
@ -57,6 +57,13 @@ public abstract class TemplateWindow extends JFrame {
|
||||||
editProfile = createLabel("Edit profile", 10, 189, 165, 39, 22);
|
editProfile = createLabel("Edit profile", 10, 189, 165, 39, 22);
|
||||||
editProfile.setForeground(Color.BLUE);
|
editProfile.setForeground(Color.BLUE);
|
||||||
profilePanel.add(editProfile);
|
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[] getDetails = fassade.sendUserDetails();
|
||||||
String fullName = getDetails[0];
|
String fullName = getDetails[0];
|
||||||
|
|
Loading…
Reference in New Issue