You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/01/26 16:08:52 UTC
[3/3] james-project git commit: Merge remote-tracking branch
'lduzan/James-1920_implement_move_to_trash'
Merge remote-tracking branch 'lduzan/James-1920_implement_move_to_trash'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d747e7d2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d747e7d2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d747e7d2
Branch: refs/heads/master
Commit: d747e7d246923c0ea2aa8ebc35d670e7d8129a9d
Parents: 7426bb6 ab8bc8d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Jan 26 17:08:14 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Jan 26 17:08:14 2017 +0100
----------------------------------------------------------------------
.../integration/SetMessagesMethodTest.java | 9 +++++----
.../methods/SetMessagesUpdateProcessor.java | 21 ++------------------
.../SetMessagesCreationProcessorTest.java | 1 +
3 files changed, 8 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d747e7d2/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
----------------------------------------------------------------------
diff --cc server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
index 90aa5ff,c188d28..faf228c
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
@@@ -35,8 -33,8 +33,7 @@@ import org.apache.james.jmap.model.SetE
import org.apache.james.jmap.model.SetMessagesRequest;
import org.apache.james.jmap.model.SetMessagesResponse;
import org.apache.james.jmap.model.UpdateMessagePatch;
- import org.apache.james.jmap.model.mailbox.Role;
import org.apache.james.jmap.utils.SystemMailboxesProvider;
-import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org