1 | if (item.getSpamItem().isMoveTrashSelected() == false) {↵ | | 1 | if (item.getSpamItem().isIncomingTrashSelected()) {↵
|
2 | // move message to user-configured folder (generally "Junk"↵ | | 2 | // move message to ↵
|
3 | // folder)↵ | | |
|
4 | IMailFolder destFolder = FolderTreeModel.getInstance()↵ | | 3 | trash↵
|
| | | 4 | IMailbox trash = (IMailbox) ((RootFolder) inboxFolder↵
|
5 | .getFolder(item.getSpamItem().getMoveCustomFolder());↵ | | 5 | .getRootFolder()).getTrashFolder();↵
|
|
6 | // create reference↵ | | 6 | // create reference↵
|
7 | MailFolderCommandReference ref2 = new MailFolderCommandReference(↵ | | 7 | MailFolderCommandReference ref2 = new MailFolderCommandReference(↵
|
8 | srcFolder, destFolder, new Object[] { uids[j] });↵ | | 8 | inboxFolder, trash, new Object[] { uid });↵
|
|
9 | CommandProcessor.getInstance().addOp(↵ | | 9 | CommandProcessor.getInstance().addOp(↵
|
10 | new MoveMessageCommand(ref2));↵ | | 10 | new MoveMessageCommand(ref2));↵
|
|
11 | } else {↵ | | 11 | } else {↵
|
12 | // move message to trash↵ | | 12 | // move message to user-configured folder (generally "Junk"↵
|
| | | 13 | // folder)↵
|
13 | IMailbox trash = (IMailbox) ((RootFolder) srcFolder↵ | | 14 | IMailbox destFolder = (IMailbox) FolderTreeModel↵
|
14 | .getRootFolder()).getTrash↵ | | 15 | .getInstance()↵
|
15 | Folder();↵ | | 16 | .getFolder(item.getSpamItem().getIncomingCustomFolder());↵
|
|
16 | // create reference↵ | | 17 | // create reference↵
|
17 | MailFolderCommandReference ref2 = new MailFolderCommandReference(↵ | | 18 | MailFolderCommandReference ref2 = new MailFolderCommandReference(↵
|
18 | srcFolder, trash, new Object[] { uids[j] });↵ | | 19 | inboxFolder, destFolder, new Object[] { uid });↵
|
|
19 | CommandProcessor.getInstance().addOp(↵ | | 20 | CommandProcessor.getInstance().addOp(↵
|
20 | new MoveMessageCommand(ref2));↵ | | 21 | new MoveMessageCommand(ref2));↵
|
|
21 | } | | 22 | }↵
|
|
| | | 23 | return true;
|