Author: dongxu Date: Thu Sep 12 03:09:26 2013 New Revision: 1522170 URL: http://svn.apache.org/r1522170 Log: try to get message details, problem is: "Attempting to edit an EntityProxy previously edited by another RequestContext"
Added: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java~HEAD - copied, changed from r1522169, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java Removed: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageDetails.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MailHeaderImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsAction.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsResult.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetailsResult.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 03:09:26 2013 @@ -12,6 +12,7 @@ import org.apache.hupa.client.ui.WidgetD import org.apache.hupa.shared.SConsts; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.mvp.WidgetDisplayable; @@ -30,8 +31,12 @@ import org.apache.hupa.shared.data.Messa >>>>>>> try to change fetch messages to use RF import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.data.MessageDetails; +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.BackEvent; import org.apache.hupa.shared.events.ForwardMessageEvent; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 03:09:26 2013 @@ -37,6 +37,7 @@ import java.util.List; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.SendForwardMessageRequest; import org.apache.hupa.client.rf.SendMessageRequest; @@ -69,6 +70,8 @@ import net.customware.gwt.dispatch.share >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. import org.apache.hupa.client.evo.HupaEvoCallback; +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.client.place.MessageSendPlace; <<<<<<< HEAD >>>>>>> 1. improve the inbox folder place. @@ -77,9 +80,7 @@ import org.apache.hupa.client.ui.WidgetD >>>>>>> Make the evo more clear. import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.Util; -import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.MessageAttachment; -import org.apache.hupa.shared.data.MessageDetails; +import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.data.SMTPMessage; <<<<<<< HEAD import org.apache.hupa.shared.data.User; @@ -94,16 +95,18 @@ import org.apache.hupa.shared.domain.Ima ======= import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. import org.apache.hupa.shared.events.BackEvent; import org.apache.hupa.shared.events.ContactsUpdatedEvent; import org.apache.hupa.shared.events.ContactsUpdatedEventHandler; -import org.apache.hupa.shared.events.FlashEvent; import org.apache.hupa.shared.events.FolderSelectionEvent; import org.apache.hupa.shared.events.FolderSelectionEventHandler; import org.apache.hupa.shared.events.LoadMessagesEvent; import org.apache.hupa.shared.events.LoadMessagesEventHandler; +<<<<<<< HEAD import org.apache.hupa.shared.events.SentMessageEvent; <<<<<<< HEAD <<<<<<< HEAD @@ -124,10 +127,11 @@ import org.apache.hupa.shared.proxy.Imap >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory now. ======= >>>>>>> Allow client can use the domain entity interface. +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.rpc.ContactsResult.Contact; >>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.rpc.ForwardMessage; -import org.apache.hupa.shared.rpc.GenericResult; import org.apache.hupa.shared.rpc.ReplyMessage; import org.apache.hupa.shared.rpc.SendMessage; import org.apache.hupa.widgets.ui.HasEnable; @@ -787,7 +791,7 @@ public class MessageSendActivity extends public void onFinish(IUploader uploader) { if (uploader.getStatus() == Status.SUCCESS) { String name = uploader.getInputName(); - MessageAttachment attachment = new MessageAttachment(); + MessageAttachment attachment = new MessageAttachmentImpl(); attachment.setName(name); attachments.add(attachment); display.getSendEnable().setEnabled(true); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 03:09:26 2013 @@ -265,6 +265,7 @@ import org.apache.hupa.client.place.Mess import org.apache.hupa.client.rf.CreateFolderRequest; import org.apache.hupa.client.rf.DeleteFolderRequest; import org.apache.hupa.client.rf.FetchMessagesRequest; +import org.apache.hupa.client.rf.GetMessageDetailsRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.rf.ImapFolderRequest; import org.apache.hupa.client.rf.RenameFolderRequest; @@ -272,13 +273,15 @@ import org.apache.hupa.client.ui.WidgetC import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.client.widgets.IMAPTreeItem; import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; import org.apache.hupa.shared.domain.CreateFolderAction; import org.apache.hupa.shared.domain.DeleteFolderAction; import org.apache.hupa.shared.domain.GenericResult; +import org.apache.hupa.shared.domain.GetMessageDetailsAction; +import org.apache.hupa.shared.domain.GetMessageDetailsResult; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.RenameFolderAction; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.BackEvent; @@ -899,6 +902,25 @@ System.out.println("1111111"+response); } display.setLoadingMessage(true); + GetMessageDetailsRequest req = requestFactory.messageDetailsRequest(); + GetMessageDetailsAction action = req.create(GetMessageDetailsAction.class); + action.setFolder(event.getFolder()); + action.setUid(message.getUid()); + req.get(action).fire(new Receiver<GetMessageDetailsResult>() { + + @Override + public void onSuccess(GetMessageDetailsResult response) { + + if (decreaseUnseen) { + eventBus.fireEvent(new DecreaseUnseenEvent(user, folder)); + } + display.setLoadingMessage(false); +// showMessage(user, folder, message, response.getMessageDetails()); + + placeController.goTo(messagePlaceProvider.get().with(user, folder, message, + response.getMessageDetails())); + } + }); // dispatcher.execute(new // GetMessageDetails(event.getFolder(), // message.getUid()), new @@ -1073,7 +1095,7 @@ System.out.println("1111111"+response); FetchMessagesRequest req = requestFactory.messagesRequest(); folder = req.edit(editableFolder); -// folder = (ImapFolder) tItem.getUserObject(); + // folder = (ImapFolder) tItem.getUserObject(); eventBus.fireEvent(new LoadMessagesEvent(user, folder)); >>>>>>> fix the frozen autobean issue, yet another occur if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) { @@ -1087,6 +1109,7 @@ System.out.println("1111111"+response); }); <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> try to change fetch messages to use RF ======= //FIXME why another? @@ -1108,6 +1131,29 @@ System.out.println("1111111"+response); // // }); >>>>>>> fix the frozen autobean issue, yet another occur +======= + // FIXME why another? + // display.getTree().addSelectionHandler(new + // SelectionHandler<TreeItem>() { + // + // public void onSelection(SelectionEvent<TreeItem> event) { + // tItem = (IMAPTreeItem) event.getSelectedItem(); + // if (tItem.isEdit()) + // return; + // folder = (ImapFolder) tItem.getUserObject(); + // if + // (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) + // { + // display.getDeleteEnable().setEnabled(false); + // display.getRenameEnable().setEnabled(false); + // } else { + // display.getDeleteEnable().setEnabled(true); + // display.getRenameEnable().setEnabled(true); + // } + // } + // + // }); +>>>>>>> try to get message details, problem is: display.getRenameClick().addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { @@ -1268,7 +1314,7 @@ System.out.println("1111111"+response); this.user = user; this.folder = folder; this.searchValue = searchValue; - + // FIXME goto? placeController.goTo(new MailFolderPlace().with(user, folder, searchValue)); // placeController.goTo(mailInboxPlaceProvider.get().with(user)); @@ -1277,7 +1323,7 @@ System.out.println("1111111"+response); // MailInboxPlace(folder.getName()).with(user)); } - private void showMessage(User user, ImapFolderImpl folder, Message message, MessageDetails details) { + private void showMessage(User user, ImapFolder folder, Message message, MessageDetails details) { placeController.goTo(IMAPMessagePlaceProvider.get()); >>>>>>> try to change fetch messages to use RF } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java Thu Sep 12 03:09:26 2013 @@ -30,10 +30,10 @@ import org.apache.hupa.client.CachingDis import org.apache.hupa.client.HupaCallback; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.MessageAttachment; -import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.BackEvent; import org.apache.hupa.shared.events.ForwardMessageEvent; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java Thu Sep 12 03:09:26 2013 @@ -29,8 +29,8 @@ import org.apache.hupa.client.widgets.Co import org.apache.hupa.client.widgets.MessageHeaders; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.Util; -import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.widgets.ui.Loading; import org.cobogw.gwt.user.client.ui.Button; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java Thu Sep 12 03:09:26 2013 @@ -49,6 +49,7 @@ import org.apache.hupa.client.widgets.Ha import org.apache.hupa.client.widgets.IMAPTreeItem; import org.apache.hupa.shared.data.ImapFolderImpl; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.data.Message; <<<<<<< HEAD <<<<<<< HEAD @@ -73,10 +74,13 @@ import org.apache.hupa.shared.domain.Ima ======= ======= import org.apache.hupa.shared.data.MessageDetails; +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; >>>>>>> try to change fetch messages to use RF import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. import org.apache.hupa.shared.events.BackEvent; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java Thu Sep 12 03:09:26 2013 @@ -65,12 +65,12 @@ import org.apache.hupa.client.HupaCallba import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.Util; -import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.MessageAttachment; -import org.apache.hupa.shared.data.MessageDetails; +import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.data.SMTPMessage; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.BackEvent; import org.apache.hupa.shared.events.ContactsUpdatedEvent; @@ -164,7 +164,7 @@ public class MessageSendPresenter extend public void onFinish(IUploader uploader) { if (uploader.getStatus() == Status.SUCCESS) { String name = uploader.getInputName(); - MessageAttachment attachment = new MessageAttachment(); + MessageAttachment attachment = new MessageAttachmentImpl(); attachment.setName(name); attachments.add(attachment); display.getSendEnable().setEnabled(true); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java Thu Sep 12 03:09:26 2013 @@ -20,6 +20,7 @@ import org.apache.hupa.shared.data.User; import org.apache.hupa.shared.proxy.IMAPFolderProxy; ======= import org.apache.hupa.shared.data.ImapFolderImpl; +<<<<<<< HEAD import org.apache.hupa.shared.data.MessageDetails; <<<<<<< HEAD import org.apache.hupa.shared.data.User; @@ -30,8 +31,11 @@ import org.apache.hupa.shared.proxy.Imap import org.apache.hupa.shared.domain.ImapFolder; >>>>>>> Allow client can use the domain entity interface. ======= +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java Thu Sep 12 03:09:26 2013 @@ -38,6 +38,7 @@ package org.apache.hupa.client.place; >>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.shared.data.ImapFolderImpl; +<<<<<<< HEAD import org.apache.hupa.shared.data.MessageDetails; <<<<<<< HEAD import org.apache.hupa.shared.data.User; @@ -63,8 +64,11 @@ import org.apache.hupa.shared.proxy.Imap import org.apache.hupa.shared.domain.ImapFolder; >>>>>>> Allow client can use the domain entity interface. ======= +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/GetMessageDetailsRequest.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.client.rf; import org.apache.hupa.server.ioc.IocRfServiceLocator; 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=1522170&r1=1522169&r2=1522170&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 03:09:26 2013 @@ -104,5 +104,9 @@ public interface HupaRequestFactory exte ======= DeleteMessageByUidRequest deleteMessageByUidRequest(); DeleteMessageAllRequest deleteMessageAllRequest(); +<<<<<<< HEAD >>>>>>> delete messages, make WestActivity Singleton +======= + GetMessageDetailsRequest messageDetailsRequest(); +>>>>>>> try to get message details, problem is: } \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java Thu Sep 12 03:09:26 2013 @@ -29,8 +29,8 @@ import org.apache.hupa.client.widgets.Co import org.apache.hupa.client.widgets.MessageHeaders; import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.Util; -import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.widgets.ui.Loading; import org.cobogw.gwt.user.client.ui.Button; Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java (original) +++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java Thu Sep 12 03:09:26 2013 @@ -32,10 +32,11 @@ import org.apache.hupa.client.guice.Guic import org.apache.hupa.client.guice.GuiceMvpTestModule.DispatchTestAsync; import org.apache.hupa.client.mvp.MessageSendPresenter.Type; import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.MessageDetails; +import org.apache.hupa.shared.data.MessageDetailsImpl; import org.apache.hupa.shared.data.MessageImpl; import org.apache.hupa.shared.data.SMTPMessage; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.events.FlashEvent; import org.apache.hupa.shared.events.SentMessageEvent; import org.apache.hupa.shared.events.ServerStatusEvent; @@ -218,7 +219,7 @@ public class MessageSendPresenterTest ex oldmessage.setReplyto("repl...@dom.com"); oldmessage.setSubject("Subject"); - MessageDetails oldDetails = new MessageDetails(); + MessageDetails oldDetails = new MessageDetailsImpl(); oldDetails.setText("Message"); oldDetails.setUid(0l); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java Thu Sep 12 03:09:26 2013 @@ -57,8 +57,8 @@ import org.apache.hupa.server.utils.Mess import org.apache.hupa.server.utils.RegexPatterns; import org.apache.hupa.server.utils.SessionUtils; import org.apache.hupa.shared.SConsts; -import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.data.SMTPMessage; +import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.rpc.GenericResult; import org.apache.hupa.shared.rpc.SendMessage; Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java Thu Sep 12 03:09:26 2013 @@ -93,6 +93,7 @@ import org.apache.commons.logging.Log; import org.apache.hupa.server.IMAPStoreCache; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.data.User; @@ -120,7 +121,14 @@ import org.apache.hupa.shared.proxy.Imap import org.apache.hupa.shared.domain.ImapFolder; >>>>>>> Allow client can use the domain entity interface. ======= +======= +import org.apache.hupa.shared.data.MailHeaderImpl; +import org.apache.hupa.shared.data.MessageAttachmentImpl; +import org.apache.hupa.shared.data.MessageDetailsImpl; +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. import org.apache.hupa.shared.rpc.GetMessageDetails; @@ -218,7 +226,7 @@ public class GetMessageDetailsHandler ex protected MessageDetails mimeToDetails(MimeMessage message, String folderName, long uid) throws IOException, MessagingException, UnsupportedEncodingException { - MessageDetails mDetails = new MessageDetails(); + MessageDetails mDetails = new MessageDetailsImpl(); Object con = message.getContent(); @@ -241,7 +249,8 @@ public class GetMessageDetailsHandler ex for (@SuppressWarnings("unchecked") Enumeration<Header> en = message.getAllHeaders(); en.hasMoreElements();) { Header header = en.nextElement(); - mDetails.addHeader(header.getName(), header.getValue()); + mDetails.setMailHeader(new MailHeaderImpl(header.getName(), header.getValue())); +// mDetails.addHeader(header.getName(), header.getValue()); } return mDetails; @@ -311,7 +320,7 @@ public class GetMessageDetailsHandler ex // Inline images are not added to the attachment list // TODO: improve the in-line images detection if (part.getHeader("Content-ID") == null) { - MessageAttachment attachment = new MessageAttachment(); + MessageAttachment attachment = new MessageAttachmentImpl(); attachment.setName(MimeUtility.decodeText(part.getFileName())); attachment.setContentType(part.getContentType()); attachment.setSize(part.getSize()); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java Thu Sep 12 03:09:26 2013 @@ -62,6 +62,7 @@ import org.apache.hupa.server.service.Fe import org.apache.hupa.server.service.FetchMessagesServiceImpl; import org.apache.hupa.server.service.GetMessageDetailsService; import org.apache.hupa.server.service.GetMessageDetailsServiceImpl; +<<<<<<< HEAD import org.apache.hupa.server.service.GetMessageRawService; import org.apache.hupa.server.service.GetMessageRawServiceImpl; import org.apache.hupa.server.service.IdleService; @@ -92,6 +93,8 @@ import org.apache.hupa.server.service.De import org.apache.hupa.server.service.FetchMessagesService; import org.apache.hupa.server.service.FetchMessagesServiceImpl; >>>>>>> try to fetch messages, yet can not fire the login event in ModelTable >>>>>>> such that just get a NullPointerException in it. +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.server.service.ImapFolderService; import org.apache.hupa.server.service.ImapFolderServiceImpl; import org.apache.hupa.server.service.LoginUserService; @@ -137,6 +140,7 @@ import org.apache.hupa.shared.data.Fetch import org.apache.hupa.shared.data.GenericResultImpl; import org.apache.hupa.shared.data.GetMessageDetailsActionImpl; import org.apache.hupa.shared.data.GetMessageDetailsResultImpl; +<<<<<<< HEAD import org.apache.hupa.shared.data.GetMessageRawActionImpl; import org.apache.hupa.shared.data.GetMessageRawResultImpl; import org.apache.hupa.shared.data.IdleActionImpl; @@ -155,6 +159,12 @@ import org.apache.hupa.shared.data.SendR import org.apache.hupa.shared.data.SetFlagActionImpl; import org.apache.hupa.shared.data.SmtpMessageImpl; ======= +======= +import org.apache.hupa.shared.data.ImapFolderImpl; +import org.apache.hupa.shared.data.MailHeaderImpl; +import org.apache.hupa.shared.data.MessageAttachmentImpl; +import org.apache.hupa.shared.data.MessageDetailsImpl; +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.data.RenameFolderActionImpl; >>>>>>> delete and rename folder import org.apache.hupa.shared.data.TagImpl; @@ -176,6 +186,7 @@ import org.apache.hupa.shared.domain.Fet import org.apache.hupa.shared.domain.GenericResult; import org.apache.hupa.shared.domain.GetMessageDetailsAction; import org.apache.hupa.shared.domain.GetMessageDetailsResult; +<<<<<<< HEAD import org.apache.hupa.shared.domain.GetMessageRawAction; import org.apache.hupa.shared.domain.GetMessageRawResult; import org.apache.hupa.shared.domain.IdleAction; @@ -187,6 +198,12 @@ import org.apache.hupa.shared.domain.Mai import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.MoveMessageAction; +======= +import org.apache.hupa.shared.domain.ImapFolder; +import org.apache.hupa.shared.domain.MailHeader; +import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.RenameFolderAction; import org.apache.hupa.shared.domain.SendForwardMessageAction; import org.apache.hupa.shared.domain.SendMessageAction; @@ -258,12 +275,16 @@ public class GuiceServerModule extends A bind(IocRfServiceLocator.class); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> try to get message details, problem is: bind(MailHeader.class).to(MailHeaderImpl.class); bind(User.class).to(UserImpl.class); bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class); bind(ImapFolder.class).to(ImapFolderImpl.class); <<<<<<< HEAD +<<<<<<< HEAD bind(Tag.class).to(TagImpl.class); bind(MessageDetails.class).to(MessageDetailsImpl.class); bind(MessageAttachment.class).to(MessageAttachmentImpl.class); @@ -303,7 +324,14 @@ public class GuiceServerModule extends A <<<<<<< HEAD >>>>>>> try to fetch messages, yet can not fire the login event in ModelTable >>>>>>> such that just get a NullPointerException in it. ======= +======= + bind(Tag.class).to(TagImpl.class); + bind(MessageDetails.class).to(MessageDetailsImpl.class); + bind(MessageAttachment.class).to(MessageAttachmentImpl.class); +>>>>>>> try to get message details, problem is: bind(GenericResult.class).to(GenericResultImpl.class); + bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class); + bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class); bind(CreateFolderAction.class).to(CreateFolderActionImpl.class); <<<<<<< HEAD >>>>>>> Succeed creating new folder @@ -315,7 +343,13 @@ public class GuiceServerModule extends A ======= bind(DeleteMessageAllAction.class).to(DeleteMessageAllActionImpl.class); bind(DeleteMessageByUidAction.class).to(DeleteMessageByUidActionImpl.class); +<<<<<<< HEAD >>>>>>> delete messages, make WestActivity Singleton +======= + bind(GetMessageDetailsAction.class).to(GetMessageDetailsActionImpl.class); + bind(GetMessageDetailsResult.class).to(GetMessageDetailsResultImpl.class); + +>>>>>>> try to get message details, problem is: bind(CheckSessionService.class).to(CheckSessionServiceImpl.class); bind(LoginUserService.class).to(LoginUserServiceImpl.class); @@ -365,7 +399,11 @@ public class GuiceServerModule extends A ======= bind(DeleteMessageAllService.class).to(DeleteMessageAllServiceImpl.class); bind(DeleteMessageByUidService.class).to(DeleteMessageByUidServiceImpl.class); +<<<<<<< HEAD >>>>>>> delete messages, make WestActivity Singleton +======= + bind(GetMessageDetailsService.class).to(GetMessageDetailsServiceImpl.class); +>>>>>>> try to get message details, problem is: bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsService.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.server.service; import org.apache.hupa.shared.domain.GetMessageDetailsAction; Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/GetMessageDetailsServiceImpl.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.server.service; import static org.apache.hupa.server.utils.RegexPatterns.regex_badAttrs; @@ -125,6 +128,11 @@ public class GetMessageDetailsServiceImp boolean isHTML = handleParts(message, con, sbPlain, attachmentList); +<<<<<<< HEAD +======= + System.out.println(isHTML); + +>>>>>>> try to get message details, problem is: if (isHTML) { mDetails.setText(filterHtmlDocument(sbPlain.toString(), folderName, uid)); } else { Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java (original) +++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java Thu Sep 12 03:09:26 2013 @@ -25,7 +25,7 @@ import com.sun.mail.imap.IMAPStore; import org.apache.hupa.server.HupaGuiceTestCase; import org.apache.hupa.server.utils.TestUtils; import org.apache.hupa.shared.SConsts; -import org.apache.hupa.shared.data.MessageDetails; +import org.apache.hupa.shared.domain.MessageDetails; import javax.mail.Folder; import javax.mail.Message; Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java (original) +++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/TestUtils.java Thu Sep 12 03:09:26 2013 @@ -55,12 +55,16 @@ import org.apache.hupa.shared.domain.Smt >>>>>>> first commit import org.apache.hupa.server.handler.AbstractSendMessageHandler; import org.apache.hupa.server.mock.MockIMAPFolder; -import org.apache.hupa.shared.data.MessageAttachment; +import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.data.SMTPMessage; <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= +import org.apache.hupa.shared.domain.MessageAttachment; +>>>>>>> try to get message details, problem is: import com.sun.mail.imap.IMAPStore; @@ -216,6 +220,7 @@ public class TestUtils extends TestCase <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD MessageAttachment msgAttach = new MessageAttachmentImpl(); ======= MessageAttachment msgAttach = new MessageAttachment(); @@ -223,6 +228,9 @@ public class TestUtils extends TestCase ======= MessageAttachment msgAttach = new MessageAttachment(); >>>>>>> first commit +======= + MessageAttachment msgAttach = new MessageAttachmentImpl(); +>>>>>>> try to get message details, problem is: msgAttach.setName(fileItem.getFieldName()); msgAttach.setContentType(fileItem.getContentType()); msgAttach.setSize((int) fileItem.getSize()); Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsActionImpl.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.GetMessageDetailsAction; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GetMessageDetailsResultImpl.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.GetMessageDetailsResult; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MailHeaderImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MailHeaderImpl.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MailHeaderImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MailHeaderImpl.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.MailHeader; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java Thu Sep 12 03:09:26 2013 @@ -95,11 +95,4 @@ public class MessageAttachmentImpl imple public int getSize() { return size; } - - @Override - public void setImage(boolean image) { - //FIXME just for MessageSendActivity's NullPointerException, with adding the RequestContext's create List<MeeageAttachment> - } - - } Copied: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java~HEAD (from r1522169, james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java%7EHEAD?p2=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java%7EHEAD&p1=james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageAttachmentImpl.java&r1=1522169&r2=1522170&rev=1522170&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java Thu Sep 12 03:09:26 2013 @@ -21,6 +21,8 @@ package org.apache.hupa.shared.data; import java.util.ArrayList; +import org.apache.hupa.shared.domain.MessageAttachment; + public class SMTPMessage extends AbstractMessage{ private static final long serialVersionUID = 7331361994526216161L; private ArrayList<String> bcc; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsAction.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsAction.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.domain; import com.google.web.bindery.requestfactory.shared.ProxyFor; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsResult.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GetMessageDetailsResult.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.domain; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MailHeader.java Thu Sep 12 03:09:26 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -17,6 +18,8 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> try to get message details, problem is: package org.apache.hupa.shared.domain; import com.google.web.bindery.requestfactory.shared.ProxyFor; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/MessageAttachment.java Thu Sep 12 03:09:26 2013 @@ -38,8 +38,11 @@ public interface MessageAttachment exten boolean isImage(); +<<<<<<< HEAD void setImage(boolean image); String getContentType(); +======= +>>>>>>> try to get message details, problem is: } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ForwardMessageEvent.java Thu Sep 12 03:09:26 2013 @@ -25,6 +25,7 @@ package org.apache.hupa.shared.events; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageDetails; @@ -64,8 +65,11 @@ import org.apache.hupa.shared.proxy.Imap import org.apache.hupa.shared.domain.ImapFolder; >>>>>>> Allow client can use the domain entity interface. ======= +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java Thu Sep 12 03:09:26 2013 @@ -24,6 +24,7 @@ package org.apache.hupa.shared.events; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageDetails; @@ -63,8 +64,11 @@ import org.apache.hupa.shared.proxy.Imap import org.apache.hupa.shared.domain.ImapFolder; >>>>>>> Allow client can use the domain entity interface. ======= +======= +>>>>>>> try to get message details, problem is: import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetailsResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetailsResult.java?rev=1522170&r1=1522169&r2=1522170&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetailsResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetailsResult.java Thu Sep 12 03:09:26 2013 @@ -21,7 +21,7 @@ package org.apache.hupa.shared.rpc; import java.io.Serializable; -import org.apache.hupa.shared.data.MessageDetails; +import org.apache.hupa.shared.domain.MessageDetails; import net.customware.gwt.dispatch.shared.Result; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org