Author: dongxu Date: Thu Sep 12 04:11:10 2013 New Revision: 1522306 URL: http://svn.apache.org/r1522306 Log: fixed the requestfactory's quirk
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:11:10 2013 @@ -397,8 +397,11 @@ public class ComposeActivity extends App ======= >>>>>>> add user label, yet issue46 occur bindTo(eventBus); - if (user != null) + + display.getFromList().addItem("demo"); + if (user != null) {//FIXME display.getFromList().addItem(user.getName()); + } } private void bindTo(EventBus eventBus) { @@ -506,7 +509,6 @@ public class ComposeActivity extends App >>>>>>> coping with java.lang.IllegalArgumentException: uid if ("new".equals(place.getToken())) { - System.out.println("new: " + place.getParameters().getOldmessage().getUid()); SendMessageRequest sendReq = requestFactory.sendMessageRequest(); SendMessageAction sendAction = sendReq.create(SendMessageAction.class); <<<<<<< HEAD @@ -546,6 +548,7 @@ public class ComposeActivity extends App } else if ("reply".equals(place.getToken())) { ======= } else if ("forward".equals(place.getToken())) { +<<<<<<< HEAD System.out.println("reply: " + place.getParameters().getOldmessage().getUid()); >>>>>>> coping with java.lang.IllegalArgumentException: uid SendForwardMessageRequest forwardReq = requestFactory.sendForwardMessageRequest(); @@ -557,6 +560,17 @@ public class ComposeActivity extends App forwardAction.setUid(place.getParameters().getOldmessage().getUid()); forwardReq.send(forwardAction).fire(new Receiver<GenericResult>() { >>>>>>> coping with reply and forward sending message +======= + //FIXME will get a NullPointerException given accessing directly from some URL like #/compose:forward + SendForwardMessageRequest req = requestFactory.sendForwardMessageRequest(); + SendForwardMessageAction action = req.create(SendForwardMessageAction.class); + action.setMessage(parseMessage(req)); + ImapFolder f = req.create(ImapFolder.class); + f.setFullName(place.getParameters().getFolder().getFullName()); + action.setFolder(f); + action.setUid(place.getParameters().getOldmessage().getUid()); + req.send(action).fire(new Receiver<GenericResult>() { +>>>>>>> fixed the requestfactory's quirk @Override public void onSuccess(GenericResult response) { afterSend(response); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java Thu Sep 12 04:11:10 2013 @@ -83,11 +83,15 @@ public interface HupaRequestFactory exte >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory now. ======= SubjectRequest subjectRequest(); + ImapFolderRequest folderRequest(); + CheckSessionRequest sessionRequest(); + LoginUserRequest loginRequest(); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. ======= FetchMessagesRequest messagesRequest(); @@ -95,36 +99,67 @@ public interface HupaRequestFactory exte >>>>>>> try to fetch messages, yet can not fire the login event in ModelTable >>>>>>> such that just get a NullPointerException in it. ======= ======= +======= + +>>>>>>> fixed the requestfactory's quirk LogoutUserRequest logoutRequest(); + FetchFoldersRequest fetchFoldersRequest(); + FetchMessagesRequest messagesRequest(); + MoveMessageRequest moveMessageRequest(); +<<<<<<< HEAD >>>>>>> other RFs CreateFolderRequest createFolderRequest(); <<<<<<< HEAD >>>>>>> Succeed creating new folder ======= +======= + + CreateFolderRequest createFolderRequest(); + +>>>>>>> fixed the requestfactory's quirk DeleteFolderRequest deleteFolderRequest(); + RenameFolderRequest renameFolderRequest(); <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> delete and rename folder ======= +======= + +>>>>>>> fixed the requestfactory's quirk DeleteMessageByUidRequest deleteMessageByUidRequest(); + DeleteMessageAllRequest deleteMessageAllRequest(); <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> delete messages, make WestActivity Singleton ======= GetMessageDetailsRequest messageDetailsRequest(); <<<<<<< HEAD >>>>>>> try to get message details, problem is: ======= +======= + + GetMessageDetailsRequest messageDetailsRequest(); + +>>>>>>> fixed the requestfactory's quirk SendMessageRequest sendMessageRequest(); + SendForwardMessageRequest sendForwardMessageRequest(); + SendReplyMessageRequest sendReplyMessageRequest(); <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> forward and reply message to use RF ======= +======= + +>>>>>>> fixed the requestfactory's quirk IdleRequest idleRequest(); + SetFlagRequest setFlagRequest(); >>>>>>> other RFs } \ No newline at end of file Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java Thu Sep 12 04:11:10 2013 @@ -84,10 +84,14 @@ public class SendForwardMessageServiceIm } // Put the original attachments in the list <<<<<<< HEAD +<<<<<<< HEAD Message msg = folder.getMessageByUID(forwardAction.getUid()); ======= Message msg = folder.getMessageByUID(forwardAction.getReplyMessageUid()); >>>>>>> forward and reply message to use RF +======= + Message msg = folder.getMessageByUID(forwardAction.getUid()); +>>>>>>> fixed the requestfactory's quirk try { items = MessageUtils.extractMessageAttachments(logger, msg.getContent()); logger.debug("Forwarding a message, extracted: " + items.size() + " from original."); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java Thu Sep 12 04:11:10 2013 @@ -85,10 +85,14 @@ public class SendReplyMessageServiceImpl // Only original inline images have to be added to the list <<<<<<< HEAD +<<<<<<< HEAD Message msg = folder.getMessageByUID(replyAction.getUid()); ======= Message msg = folder.getMessageByUID(replyAction.getReplyMessageUid()); >>>>>>> forward and reply message to use RF +======= + Message msg = folder.getMessageByUID(replyAction.getUid()); +>>>>>>> fixed the requestfactory's quirk try { items = MessageUtils.extractInlineImages(logger, msg.getContent()); if (items.size() > 0) Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java Thu Sep 12 04:11:10 2013 @@ -60,10 +60,14 @@ public class SendForwardMessageActionImp @Override <<<<<<< HEAD +<<<<<<< HEAD public long getUid() { ======= public long getReplyMessageUid() { >>>>>>> forward and reply message to use RF +======= + public long getUid() { +>>>>>>> fixed the requestfactory's quirk return uid; } @@ -82,6 +86,7 @@ public class SendForwardMessageActionImp return references; } <<<<<<< HEAD +<<<<<<< HEAD @Override public void setInReplyTo(String inReplyTo) { @@ -93,14 +98,21 @@ public class SendForwardMessageActionImp this.references = references; } ======= +======= + +>>>>>>> fixed the requestfactory's quirk @Override - public void setInReplyTo(String inReplyTo) { + public void setInReplyTo(String inReplyTo) { this.inReplyTo = inReplyTo; - } + } @Override - public void setReferences(String references) { + public void setReferences(String references) { this.references = references; +<<<<<<< HEAD } >>>>>>> forward and reply message to use RF +======= + } +>>>>>>> fixed the requestfactory's quirk } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java?rev=1522306&r1=1522305&r2=1522306&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java Thu Sep 12 04:11:10 2013 @@ -32,6 +32,7 @@ import com.google.web.bindery.requestfac @ProxyFor(SendForwardMessageAction.class) <<<<<<< HEAD +<<<<<<< HEAD public interface SendForwardMessageAction extends SendMessageAction { ImapFolder getFolder(); @@ -44,13 +45,23 @@ public interface SendForwardMessageActio long getReplyMessageUid(); >>>>>>> forward and reply message to use RF +======= +public interface SendForwardMessageAction extends SendMessageAction { + + ImapFolder getFolder(); + + long getUid(); +>>>>>>> fixed the requestfactory's quirk void setFolder(ImapFolder folder); void setUid(long uid); <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> forward and reply message to use RF +======= +>>>>>>> fixed the requestfactory's quirk } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org