Author: dongxu Date: Thu Sep 12 03:04:05 2013 New Revision: 1522163 URL: http://svn.apache.org/r1522163 Log: try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it.
Removed: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/Tag.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.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/IMAPMessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.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/FetchMessagesBaseServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesAction.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesResult.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 03:04:05 2013 @@ -23,6 +23,7 @@ package org.apache.hupa.client.activity; import java.util.ArrayList; import java.util.List; +<<<<<<< HEAD import java.util.Set; import org.apache.hupa.client.activity.MessageSendActivity.Type; @@ -378,6 +379,8 @@ public class IMAPMessageListActivity ext ======= >>>>>>> Change to new mvp framework - first step package org.apache.hupa.client.activity; +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import java.util.ArrayList; @@ -1094,7 +1097,7 @@ public class IMAPMessageListActivity ext public HasEnable getDeleteEnable(); public void reloadData(); public void removeMessages(ArrayList<Message> messages); - public ArrayList<Message> getSelectedMessages(); + public List<Message> getSelectedMessages(); public void reset(); public HasDialog getConfirmDeleteDialog(); public HasDialog getConfirmDeleteAllDialog(); @@ -1117,7 +1120,7 @@ public class IMAPMessageListActivity ext public HasChangeHandlers getRowsPerPageChange(); public HasClickHandlers getSearchClick(); public HasValue<String> getSearchValue(); - public void fillSearchOracle(ArrayList<Message> messages); + public void fillSearchOracle(List<Message> messages); public void setExpandLoading(boolean expanding); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 03:04:05 2013 @@ -69,6 +69,7 @@ import org.apache.hupa.client.rf.LoginUs import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.FlashEvent; +import org.apache.hupa.shared.events.LoginEvent; import org.apache.hupa.shared.events.SessionExpireEvent; import org.apache.hupa.shared.events.SessionExpireEventHandler; <<<<<<< HEAD @@ -425,6 +426,7 @@ public class LoginActivity extends Abstr loginRequest.login(user, pass).fire(new Receiver<User>() { @Override public void onSuccess(User response) { + eventBus.fireEvent(new LoginEvent(response)); placeController.goTo(new MailFolderPlace().with(response)); } @Override Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java Thu Sep 12 03:04:05 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.mvp; import java.util.ArrayList; +import java.util.List; import net.customware.gwt.dispatch.client.DispatchAsync; import net.customware.gwt.presenter.client.EventBus; @@ -128,8 +129,8 @@ public class IMAPMessageListPresenter ex public HasClickHandlers getDeleteAllClick(); public HasEnable getDeleteEnable(); public void reloadData(); - public void removeMessages(ArrayList<Message> messages); - public ArrayList<Message> getSelectedMessages(); + public void removeMessages(List<Message> messages); + public List<Message> getSelectedMessages(); public void reset(); public HasDialog getConfirmDeleteDialog(); public HasDialog getConfirmDeleteAllDialog(); @@ -152,7 +153,7 @@ public class IMAPMessageListPresenter ex public HasChangeHandlers getRowsPerPageChange(); public HasClickHandlers getSearchClick(); public HasValue<String> getSearchValue(); - public void fillSearchOracle(ArrayList<Message> messages); + public void fillSearchOracle(List<Message> messages); public void setExpandLoading(boolean expanding); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Thu Sep 12 03:04:05 2013 @@ -625,7 +625,7 @@ public class IMAPMessageListView extends * (non-Javadoc) * @see org.apache.hupa.client.mvp.IMAPMessageListPresenter.Display#getSelectedMessages() */ - public ArrayList<Message> getSelectedMessages() { + public List<Message> getSelectedMessages() { return mailTable.getSelectedRows(); } @@ -633,7 +633,7 @@ public class IMAPMessageListView extends * (non-Javadoc) * @see org.apache.hupa.client.mvp.IMAPMessageListPresenter.Display#removeMessages(java.util.ArrayList) */ - public void removeMessages(ArrayList<Message> messages) { + public void removeMessages(List<Message> messages) { mailTable.removeRows(messages); } @@ -788,7 +788,7 @@ public class IMAPMessageListView extends * (non-Javadoc) * @see org.apache.hupa.client.mvp.MainPresenter.Display#fillSearchOracle(java.util.ArrayList) */ - public void fillSearchOracle(ArrayList<Message> messages) { + public void fillSearchOracle(List<Message> messages) { for (Message m : messages) { String subject = m.getSubject(); String from = m.getFrom(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/FetchMessagesRequest.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. 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=1522163&r1=1522162&r2=1522163&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:04:05 2013 @@ -86,5 +86,9 @@ public interface HupaRequestFactory exte ImapFolderRequest folderRequest(); CheckSessionRequest sessionRequest(); LoginUserRequest loginRequest(); +<<<<<<< HEAD >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= + FetchMessagesRequest messagesRequest(); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. } \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java Thu Sep 12 03:04:05 2013 @@ -1342,7 +1342,7 @@ public class IMAPMessageListView extends * (non-Javadoc) * @see org.apache.hupa.client.mvp.IMAPMessageListPresenter.Display#getSelectedMessages() */ - public ArrayList<Message> getSelectedMessages() { + public List<Message> getSelectedMessages() { return mailTable.getSelectedRows(); } @@ -1505,7 +1505,7 @@ public class IMAPMessageListView extends * (non-Javadoc) * @see org.apache.hupa.client.mvp.MainPresenter.Display#fillSearchOracle(java.util.ArrayList) */ - public void fillSearchOracle(ArrayList<Message> messages) { + public void fillSearchOracle(List<Message> messages) { for (Message m : messages) { String subject = m.getSubject(); String from = m.getFrom(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java Thu Sep 12 03:04:05 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.ui; import java.util.ArrayList; import java.util.Iterator; +<<<<<<< HEAD import net.customware.gwt.dispatch.client.DispatchAsync; <<<<<<< HEAD @@ -41,6 +42,13 @@ import org.apache.hupa.shared.data.ImapF import org.apache.hupa.shared.data.Message; ======= >>>>>>> try to change fetch messages to use RF +======= +import org.apache.hupa.client.rf.FetchMessagesRequest; +import org.apache.hupa.client.rf.HupaRequestFactory; +import org.apache.hupa.shared.data.ImapFolderImpl; +import org.apache.hupa.shared.domain.FetchMessagesAction; +import org.apache.hupa.shared.domain.FetchMessagesResult; +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.User; @@ -57,6 +65,7 @@ import org.apache.hupa.shared.events.Mes <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; ======= >>>>>>> Change to new mvp framework - first step @@ -70,19 +79,23 @@ import org.apache.hupa.shared.proxy.Imap >>>>>>> Allow client can use the domain entity interface. import org.apache.hupa.shared.rpc.FetchMessages; import org.apache.hupa.shared.rpc.FetchMessagesResult; +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import com.google.gwt.event.shared.EventBus; import com.google.gwt.gen2.table.client.MutableTableModel; import com.google.gwt.gen2.table.client.TableModelHelper; import com.google.gwt.gen2.table.client.TableModelHelper.Request; import com.google.inject.Inject; +import com.google.web.bindery.requestfactory.shared.Receiver; /** * TableModel which retrieve the messages for the user - * + * */ public class MessageTableModel extends MutableTableModel<Message> { +<<<<<<< HEAD private EventBus eventBus; private User user; <<<<<<< HEAD @@ -206,4 +219,139 @@ public class MessageTableModel extends M protected boolean onSetRowValue(int row, Message rowValue) { return true; } +======= + private EventBus eventBus; + private User user; + private ImapFolder folder; + private String searchValue; + @Inject private HupaRequestFactory requestFactory; + + @Inject + public MessageTableModel(EventBus eventBus) { + + this.eventBus = eventBus; + // this.dispatcher = dispatcher; + + // bind some Events + eventBus.addHandler(LoadMessagesEvent.TYPE, new LoadMessagesEventHandler() { + + public void onLoadMessagesEvent(LoadMessagesEvent loadMessagesEvent) { + user = loadMessagesEvent.getUser(); + folder = loadMessagesEvent.getFolder(); + searchValue = loadMessagesEvent.getSearchValue(); + } + }); + eventBus.addHandler(FolderSelectionEvent.TYPE, new FolderSelectionEventHandler() { + + public void onFolderSelectionEvent(FolderSelectionEvent event) { + user = event.getUser(); + folder = event.getFolder(); + searchValue = null; + } + }); + eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { + + public void onLogin(LoginEvent event) { + user = event.getUser(); + folder = new ImapFolderImpl(user.getSettings().getInboxFolderName()); + searchValue = null; + } + }); + eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() { + + public void onLogout(LogoutEvent logoutEvent) { + user = null; + folder = null; + searchValue = null; + } + }); + + } + + @Override + public void requestRows(final Request request, + final com.google.gwt.gen2.table.client.TableModel.Callback<Message> callback) { + + // if the given user or folder is null, its safe to return an empty list + if (user == null || folder == null) { + callback.onRowsReady(request, new TableModelHelper.Response<Message>() { + @Override + public Iterator<Message> getRowValues() { + return new ArrayList<Message>().iterator(); + } + + }); + return; + } + FetchMessagesRequest req = requestFactory.messagesRequest(); + FetchMessagesAction action = req.create(FetchMessagesAction.class); + action.setFolder(folder); + action.setOffset(request.getNumRows()); + action.setSearchString(searchValue); + action.setStart(request.getStartRow()); + req.fetch(action).fire(new Receiver<FetchMessagesResult>() { + @Override + public void onSuccess(final FetchMessagesResult result) { + folder.setMessageCount(result.getRealCount()); + folder.setUnseenMessageCount(result.getRealUnreadCount()); + setRowCount(result.getRealCount()); + callback.onRowsReady(request, new TableModelHelper.Response<Message>() { + @Override + public Iterator<Message> getRowValues() { + if (result != null && result.getMessages() != null) { + return result.getMessages().iterator(); + } else { + return new ArrayList<Message>().iterator(); + } + } + }); + + // Notify presenter to update folder tree view + eventBus.fireEvent(new MessagesReceivedEvent(folder, result.getMessages())); + } + }); + + // dispatcher.execute(new FetchMessages(folder, request.getStartRow(), + // request.getNumRows(), searchValue),new + // HupaEvoCallback<FetchMessagesResult>(dispatcher, eventBus) { + // public void callback(final FetchMessagesResult result) { + // // Update folder information before notifying presenter + // folder.setMessageCount(result.getRealCount()); + // folder.setUnseenMessageCount(result.getRealUnreadCount()); + // + // setRowCount(result.getRealCount()); + // callback.onRowsReady(request, new + // TableModelHelper.Response<Message>() { + // @Override + // public Iterator<Message> getRowValues() { + // if (result != null && result.getMessages() != null) { + // return result.getMessages().iterator(); + // } else { + // return new ArrayList<Message>().iterator(); + // } + // } + // }); + // + // // Notify presenter to update folder tree view + // eventBus.fireEvent(new MessagesReceivedEvent(folder, + // result.getMessages())); + // } + // }); + } + + @Override + protected boolean onRowInserted(int beforeRow) { + return true; + } + + @Override + protected boolean onRowRemoved(int row) { + return true; + } + + @Override + protected boolean onSetRowValue(int row, Message rowValue) { + return true; + } +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java Thu Sep 12 03:04:05 2013 @@ -64,8 +64,9 @@ import org.apache.hupa.server.preference import org.apache.hupa.server.utils.MessageUtils; import org.apache.hupa.shared.data.ImapFolderImpl; import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; -import org.apache.hupa.shared.data.Tag; +import org.apache.hupa.shared.data.TagImpl; import org.apache.hupa.shared.domain.ImapFolder; +import org.apache.hupa.shared.domain.Tag; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.rpc.FetchMessages; import org.apache.hupa.shared.rpc.FetchMessagesResult; @@ -361,8 +362,8 @@ public abstract class AbstractFetchMessa ArrayList<Tag> tags = new ArrayList<Tag>(); for (String flag : m.getFlags().getUserFlags()) { - if (flag.startsWith(Tag.PREFIX)) { - tags.add(new Tag(flag.substring(Tag.PREFIX.length()))); + if (flag.startsWith(TagImpl.PREFIX)) { + tags.add(new TagImpl(flag.substring(TagImpl.PREFIX.length()))); } } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/TagMessagesHandler.java Thu Sep 12 03:04:05 2013 @@ -31,7 +31,7 @@ import net.customware.gwt.dispatch.share import org.apache.commons.logging.Log; import org.apache.hupa.server.IMAPStoreCache; -import org.apache.hupa.shared.data.Tag; +import org.apache.hupa.shared.domain.Tag; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.rpc.GenericResult; import org.apache.hupa.shared.rpc.TagMessage; 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=1522163&r1=1522162&r2=1522163&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:04:05 2013 @@ -26,15 +26,19 @@ import java.util.Properties; import javax.mail.Session; <<<<<<< HEAD +<<<<<<< HEAD ======= import javax.servlet.http.HttpSession; >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import org.apache.commons.logging.Log; import org.apache.hupa.server.IMAPStoreCache; import org.apache.hupa.server.InMemoryIMAPStoreCache; import org.apache.hupa.server.guice.providers.DefaultUserSettingsProvider; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.server.guice.providers.JavaMailSessionProvider; import org.apache.hupa.server.guice.providers.LogProvider; import org.apache.hupa.server.preferences.InImapUserPreferencesStorage; @@ -61,16 +65,26 @@ import org.apache.hupa.server.service.Id import org.apache.hupa.server.service.IdleServiceImpl; ======= import org.apache.hupa.server.guice.providers.HttpSessionProvider; +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import org.apache.hupa.server.guice.providers.JavaMailSessionProvider; import org.apache.hupa.server.guice.providers.LogProvider; +import org.apache.hupa.server.preferences.InImapUserPreferencesStorage; +import org.apache.hupa.server.preferences.UserPreferencesStorage; import org.apache.hupa.server.service.CheckSessionService; import org.apache.hupa.server.service.CheckSessionServiceImpl; +<<<<<<< HEAD >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= +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. import org.apache.hupa.server.service.ImapFolderService; import org.apache.hupa.server.service.ImapFolderServiceImpl; import org.apache.hupa.server.service.LoginUserService; import org.apache.hupa.server.service.LoginUserServiceImpl; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.server.service.LogoutUserService; import org.apache.hupa.server.service.LogoutUserServiceImpl; import org.apache.hupa.server.service.MoveMessageService; @@ -143,12 +157,22 @@ import org.apache.hupa.shared.domain.Set import org.apache.hupa.shared.domain.SmtpMessage; import org.apache.hupa.shared.domain.Tag; ======= +======= +import org.apache.hupa.shared.data.FetchMessagesActionImpl; +import org.apache.hupa.shared.data.FetchMessagesResultImpl; +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.SettingsImpl; +import org.apache.hupa.shared.data.TagImpl; import org.apache.hupa.shared.data.UserImpl; +import org.apache.hupa.shared.domain.FetchMessagesAction; +import org.apache.hupa.shared.domain.FetchMessagesResult; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Settings; +<<<<<<< HEAD >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= +import org.apache.hupa.shared.domain.Tag; +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import org.apache.hupa.shared.domain.User; import com.google.inject.AbstractModule; @@ -189,6 +213,7 @@ public class GuiceServerModule extends A bind(User.class).to(UserImpl.class); bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class); bind(ImapFolder.class).to(ImapFolderImpl.class); +<<<<<<< HEAD bind(Tag.class).to(TagImpl.class); bind(MessageDetails.class).to(MessageDetailsImpl.class); bind(MessageAttachment.class).to(MessageAttachmentImpl.class); @@ -221,11 +246,17 @@ public class GuiceServerModule extends A bind(Settings.class).toProvider(DefaultUserSettingsProvider.class).in(Singleton.class); bind(ImapFolder.class).to(ImapFolderImpl.class); >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= + bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class); + bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class); + bind(Tag.class).to(TagImpl.class); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. bind(CheckSessionService.class).to(CheckSessionServiceImpl.class); bind(LoginUserService.class).to(LoginUserServiceImpl.class); bind(ImapFolderService.class).to(ImapFolderServiceImpl.class); <<<<<<< HEAD +<<<<<<< HEAD bind(FetchFoldersService.class).to(FetchFoldersServiceImpl.class); bind(FetchMessagesService.class).to(FetchMessagesServiceImpl.class); bind(CreateFolderService.class).to(CreateFolderServiceImpl.class); @@ -253,6 +284,9 @@ public class GuiceServerModule extends A bind(Session.class).toProvider(JavaMailSessionProvider.class); bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class); ======= +======= + bind(FetchMessagesService.class).to(FetchMessagesServiceImpl.class); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class); @@ -261,6 +295,7 @@ public class GuiceServerModule extends A // bind(HttpSession.class).toProvider(HttpSessionProvider.class); >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. bind(Properties.class).toInstance(properties); + bind(UserPreferencesStorage.class).to(InImapUserPreferencesStorage.class); } protected Class<? extends IMAPStoreCache> getIMAPStoreCacheClass() { Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesBaseServiceImpl.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. package org.apache.hupa.server.service; import java.io.IOException; @@ -44,7 +47,10 @@ import org.apache.hupa.shared.domain.Fet import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Tag; import org.apache.hupa.shared.domain.User; +<<<<<<< HEAD import org.apache.hupa.shared.exception.HupaException; +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import com.google.inject.Inject; import com.sun.mail.imap.IMAPStore; @@ -53,11 +59,19 @@ public abstract class FetchMessagesBaseS @Inject protected UserPreferencesStorage userPreferences; +<<<<<<< HEAD public FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException{ User user = getUser(); ImapFolder folder = action.getFolder(); if (folder == null) { folder = new ImapFolderImpl(user.getSettings().getInboxFolderName()); +======= + public FetchMessagesResult fetch(FetchMessagesAction action){ + User user = getUser(); + ImapFolder folder = action.getFolder(); + if (folder == null) { + folder = (ImapFolder)new ImapFolderImpl(user.getSettings().getInboxFolderName()); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. } com.sun.mail.imap.IMAPFolder f = null; int start = action.getStart(); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java Thu Sep 12 03:04:05 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -31,4 +32,13 @@ import org.apache.hupa.shared.exception. public interface FetchMessagesService { FetchMessagesResult fetch(FetchMessagesAction action) throws HupaException; List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException; +======= +package org.apache.hupa.server.service; + +import org.apache.hupa.shared.domain.FetchMessagesAction; +import org.apache.hupa.shared.domain.FetchMessagesResult; + +public interface FetchMessagesService { + public FetchMessagesResult fetch(FetchMessagesAction action); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesServiceImpl.java Thu Sep 12 03:04:05 2013 @@ -1,3 +1,4 @@ +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -31,12 +32,22 @@ import javax.mail.Multipart; import javax.mail.Part; import javax.mail.UIDFolder; import javax.mail.internet.MimeMessage.RecipientType; +======= +package org.apache.hupa.server.service; + +import java.util.ArrayList; +import java.util.List; + +import javax.mail.Message; +import javax.mail.MessagingException; +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import javax.mail.search.BodyTerm; import javax.mail.search.FromStringTerm; import javax.mail.search.OrTerm; import javax.mail.search.SearchTerm; import javax.mail.search.SubjectTerm; +<<<<<<< HEAD import org.apache.hupa.server.handler.JavamailUtil; import org.apache.hupa.server.preferences.UserPreferencesStorage; import org.apache.hupa.server.utils.MessageUtils; @@ -103,6 +114,16 @@ public class FetchMessagesServiceImpl ex protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException, HupaException { +======= +import org.apache.hupa.shared.domain.FetchMessagesAction; + +import com.sun.mail.imap.IMAPFolder; + +public class FetchMessagesServiceImpl extends FetchMessagesBaseServiceImpl implements FetchMessagesService{ + + @Override + protected MessageConvertArray getMessagesToConvert(IMAPFolder f, FetchMessagesAction action) throws MessagingException { +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. String searchString = action.getSearchString(); int start = action.getStart(); @@ -156,6 +177,7 @@ public class FetchMessagesServiceImpl ex return new MessageConvertArray(exists, messages); } +<<<<<<< HEAD public List<org.apache.hupa.shared.domain.Message> convert(int offset, com.sun.mail.imap.IMAPFolder folder, Message[] messages) throws MessagingException { List<org.apache.hupa.shared.domain.Message> mList = new ArrayList<org.apache.hupa.shared.domain.Message>(); // Setup fetchprofile to limit the stuff which is fetched @@ -288,4 +310,6 @@ public class FetchMessagesServiceImpl ex return messages; } } +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderService.java Thu Sep 12 03:04:05 2013 @@ -2,10 +2,8 @@ package org.apache.hupa.server.service; import java.util.List; -import net.customware.gwt.dispatch.shared.ActionException; - import org.apache.hupa.shared.domain.ImapFolder; public interface ImapFolderService { - List<ImapFolder> requestFolders() throws ActionException; + List<ImapFolder> requestFolders() throws Exception; } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java Thu Sep 12 03:04:05 2013 @@ -126,7 +126,7 @@ public class ImapFolderServiceImpl exten // List of mail 'root' imap folders List<ImapFolder> imapFolders = new ArrayList<ImapFolder>(); - public List<ImapFolder> requestFolders() throws ActionException { + public List<ImapFolder> requestFolders() throws Exception { User user = getUser(); try { IMAPStore store = cache.get(user); @@ -141,7 +141,7 @@ public class ImapFolderServiceImpl exten return imapFolders; } catch (Exception e) { e.printStackTrace(); - throw new ActionException("Unable to get folders for User " + user); + throw new Exception("Unable to get folders for User " + user); } } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/AbstractMessage.java Thu Sep 12 03:04:05 2013 @@ -19,20 +19,14 @@ package org.apache.hupa.shared.data; -import java.io.Serializable; -import java.util.ArrayList; +import java.util.List; -public class AbstractMessage implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 5208272852772006815L; +public class AbstractMessage{ private String from; private String subject; private String replyto; - private ArrayList<String> to; - private ArrayList<String> cc; + private List<String> to; + private List<String> cc; private boolean hasAttachment; public String toString() { @@ -82,11 +76,11 @@ public class AbstractMessage implements } - public void setCc(ArrayList<String> cc) { + public void setCc(List<String> cc) { this.cc = cc; } - public ArrayList<String> getCc() { + public List<String> getCc() { return cc; } @@ -108,11 +102,11 @@ public class AbstractMessage implements return subject; } - public ArrayList<String> getTo() { + public List<String> getTo() { return to; } - public void setTo(ArrayList<String> to) { + public void setTo(List<String> to) { this.to = to; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesActionImpl.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.ImapFolder; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/FetchMessagesResultImpl.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. package org.apache.hupa.shared.data; import java.util.List; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java Thu Sep 12 03:04:05 2013 @@ -46,6 +46,7 @@ import org.apache.hupa.shared.proxy.Imap ======= import org.apache.hupa.shared.domain.ImapFolder; +<<<<<<< HEAD >>>>>>> Allow client can use the domain entity interface. /** @@ -117,9 +118,12 @@ public class IMAPFolder extends EntityBa ======= +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. public class ImapFolderImpl implements ImapFolder { >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory >>>>>>> now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java +<<<<<<< HEAD /** >>>>>>> As the FetchFolders RequestFactory, but can not run correctly. * @@ -141,6 +145,8 @@ public class ImapFolderImpl implements I private List<IMAPFolder> children = new ArrayList<IMAPFolder>(); >>>>>>> ======= +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. private List<ImapFolder> children = new ArrayList<ImapFolder>(); >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory >>>>>>> now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java private String fullName; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageImpl.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/MessageImpl.java Thu Sep 12 03:04:05 2013 @@ -19,10 +19,11 @@ package org.apache.hupa.shared.data; -import java.util.ArrayList; import java.util.Date; +import java.util.List; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.Tag; /** * @@ -30,13 +31,9 @@ import org.apache.hupa.shared.domain.Mes */ public class MessageImpl extends AbstractMessage implements Message{ - /** - * - */ - private static final long serialVersionUID = -101492974974136423L; private long uid; - private ArrayList<IMAPFlag> flags; - private ArrayList<Tag> tags; + private List<IMAPFlag> flags; + private List<Tag> tags; private Date rDate; public enum IMAPFlag { @@ -45,19 +42,19 @@ public class MessageImpl extends Abstrac - public void setFlags(ArrayList<IMAPFlag> flags) { + public void setFlags(List<IMAPFlag> flags) { this.flags = flags; } - public ArrayList<IMAPFlag> getFlags() { + public List<IMAPFlag> getFlags() { return flags; } - public void setTags(ArrayList<Tag> tags) { + public void setTags(List<Tag> tags) { this.tags = tags; } - public ArrayList<Tag> getTags() { + public List<Tag> getTags() { return tags; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesAction.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesAction.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. 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/FetchMessagesResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesResult.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/FetchMessagesResult.java Thu Sep 12 03:04:05 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 fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. package org.apache.hupa.shared.domain; import java.util.List; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java Thu Sep 12 03:04:05 2013 @@ -28,9 +28,12 @@ import java.util.List; import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; <<<<<<< HEAD +<<<<<<< HEAD ======= import org.apache.hupa.shared.data.Tag; >>>>>>> try to change fetch messages to use RF +======= +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. import com.google.web.bindery.requestfactory.shared.ProxyFor; import com.google.web.bindery.requestfactory.shared.ValueProxy; @@ -39,10 +42,14 @@ import com.google.web.bindery.requestfac public interface Message extends ValueProxy { <<<<<<< HEAD +<<<<<<< HEAD List<IMAPFlag> getFlags(); ======= ArrayList<IMAPFlag> getFlags(); >>>>>>> try to change fetch messages to use RF +======= + List<IMAPFlag> getFlags(); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. Date getReceivedDate(); @@ -63,6 +70,7 @@ public interface Message extends ValuePr List<String> getTo(); <<<<<<< HEAD +<<<<<<< HEAD void setTo(List<String> to); void setCc(List<String> cc); @@ -71,12 +79,18 @@ public interface Message extends ValuePr void setCc(ArrayList<String> cc); >>>>>>> try to change fetch messages to use RF +======= + void setTo(List<String> to); + + void setCc(List<String> cc); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. void setReplyto(String string); void setUid(long uid); <<<<<<< HEAD +<<<<<<< HEAD void setFlags(List<IMAPFlag> iFlags); void setTags(List<Tag> tags); @@ -85,6 +99,11 @@ public interface Message extends ValuePr void setTags(ArrayList<Tag> tags); >>>>>>> try to change fetch messages to use RF +======= + void setFlags(List<IMAPFlag> iFlags); + + void setTags(List<Tag> tags); +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. void setHasAttachments(boolean hasAttachment); Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java Thu Sep 12 03:04:05 2013 @@ -20,12 +20,16 @@ package org.apache.hupa.shared.events; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import java.util.List; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; ======= import java.util.ArrayList; +======= +import java.util.List; +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. <<<<<<< HEAD import org.apache.hupa.shared.data.Message; @@ -62,6 +66,7 @@ public class MessagesReceivedEvent exten public final static Type<MessagesReceivedEventHandler> TYPE = new Type<MessagesReceivedEventHandler>(); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD private List<Message> messages; private ImapFolder folder; @@ -90,12 +95,19 @@ public class MessagesReceivedEvent exten ======= public MessagesReceivedEvent(ImapFolder folder, ArrayList<Message> messages) { >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory now. +======= + private List<Message> messages; + private ImapFolder folder; + + public MessagesReceivedEvent(ImapFolder folder, List<Message> messages) { +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. this.messages = messages; this.folder = folder; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD public List<Message> getMessages() { return messages; } @@ -105,6 +117,9 @@ public class MessagesReceivedEvent exten ======= >>>>>>> first commit public ArrayList<Message> getMessages() { +======= + public List<Message> getMessages() { +>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. return messages; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/TagMessage.java Thu Sep 12 03:04:05 2013 @@ -26,7 +26,7 @@ import java.util.ArrayList; import net.customware.gwt.dispatch.shared.Action; import org.apache.hupa.shared.data.ImapFolderImpl; -import org.apache.hupa.shared.data.Tag; +import org.apache.hupa.shared.domain.Tag; public class TagMessage implements Action<GenericResult>, Serializable { Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java?rev=1522163&r1=1522162&r2=1522163&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RefetchPagingScrollTable.java Thu Sep 12 03:04:05 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.widgets.ui; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import com.google.gwt.gen2.table.client.FixedWidthFlexTable; import com.google.gwt.gen2.table.client.FixedWidthGrid; @@ -77,7 +78,7 @@ public class RefetchPagingScrollTable<Ro * * @return rows */ - public ArrayList<RowType> getSelectedRows() { + public List<RowType> getSelectedRows() { return selectedRows; } @@ -86,7 +87,7 @@ public class RefetchPagingScrollTable<Ro * * @param rows */ - public void removeRows(ArrayList<RowType> rows) { + public void removeRows(List<RowType> rows) { ArrayList<Integer> rowsIndex = new ArrayList<Integer>(); for (RowType rowType : rows) { int rowIndex = getRowValues().indexOf(rowType); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org