Author: dongxu Date: Thu Sep 12 03:06:54 2013 New Revision: 1522167 URL: http://svn.apache.org/r1522167 Log: delete messages, make WestActivity Singleton
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/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.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/ioc/GuiceServerModule.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAction.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAllAction.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageByUidAction.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageResult.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=1522167&r1=1522166&r2=1522167&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:06:54 2013 @@ -395,10 +395,16 @@ import org.apache.hupa.client.HandlerReg import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; +import org.apache.hupa.client.rf.DeleteMessageAllRequest; +import org.apache.hupa.client.rf.DeleteMessageByUidRequest; +import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.shared.data.MessageImpl; import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; +import org.apache.hupa.shared.domain.DeleteMessageAllAction; +import org.apache.hupa.shared.domain.DeleteMessageByUidAction; +import org.apache.hupa.shared.domain.DeleteMessageResult; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.User; @@ -514,9 +520,12 @@ import com.google.gwt.user.client.ui.Sou import com.google.gwt.user.client.ui.TableListener; import com.google.inject.Inject; import com.google.inject.Provider; +import com.google.web.bindery.requestfactory.shared.Receiver; + @SuppressWarnings("deprecation") public class IMAPMessageListActivity extends AbstractActivity { +<<<<<<< HEAD private String searchValue; private User user; <<<<<<< HEAD @@ -533,8 +542,20 @@ public class IMAPMessageListActivity ext private ImapFolder folder; >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory now. private ShowMessageTableListener tableListener = new ShowMessageTableListener(); +======= + private String searchValue; + private User user; + private ImapFolder folder; + private ShowMessageTableListener tableListener = new ShowMessageTableListener(); +>>>>>>> delete messages, make WestActivity Singleton + + @Inject private Displayable display; + @Inject private EventBus eventBus; + @Inject private PlaceController placeController; + @Inject private Provider<MessageSendPlace> messageSendPlaceProvider; + @Inject private HupaRequestFactory requestFactory; - +<<<<<<< HEAD <<<<<<< HEAD private final Displayable display; private final EventBus eventBus; @@ -550,12 +571,15 @@ public class IMAPMessageListActivity ext @Inject private Provider<MessageSendPlace> messageSendPlaceProvider; >>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & >>>>>>> Simply injection code +======= +>>>>>>> delete messages, make WestActivity Singleton @Override public void start(AcceptsOneWidget container, EventBus eventBus) { bind(); revealDisplay(user, folder, searchValue); container.setWidget(display.asWidget()); } +<<<<<<< HEAD private void bind(){ ======= @@ -586,222 +610,258 @@ public class IMAPMessageListActivity ext }); <<<<<<< HEAD +======= + + private void bind() { + eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() { + + public void onLogout(LogoutEvent logoutEvent) { + IMAPMessageListActivity.this.display.reset(); + IMAPMessageListActivity.this.display.getSearchValue().setValue(""); + } + + }); +>>>>>>> delete messages, make WestActivity Singleton eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() { - public void onMessagesReceived(MessagesReceivedEvent event) { + public void onMessagesReceived(MessagesReceivedEvent event) { - // fill the oracle - display.fillSearchOracle(event.getMessages()); - } + // fill the oracle + display.fillSearchOracle(event.getMessages()); + } - }); + }); display.getSearchClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - String searchValue = null; - if (display.getSearchValue().getValue().trim().length() > 0) { - searchValue = display.getSearchValue().getValue().trim(); - } - eventBus.fireEvent(new LoadMessagesEvent(user, folder, searchValue)); - } + public void onClick(ClickEvent event) { + String searchValue = null; + if (display.getSearchValue().getValue().trim().length() > 0) { + searchValue = display.getSearchValue().getValue().trim(); + } + eventBus.fireEvent(new LoadMessagesEvent(user, folder, searchValue)); + } - }); + }); eventBus.addHandler(MoveMessageEvent.TYPE, new MoveMessageEventHandler() { - public void onMoveMessageHandler(MoveMessageEvent event) { - final Message message = event.getMessage(); -// dispatcher.execute(new MoveMessage(event.getOldFolder(), event.getNewFolder(), message.getUid()), new HupaEvoCallback<MoveMessageResult>(dispatcher, eventBus) { -// public void callback(MoveMessageResult result) { -// ArrayList<Message> messageArray = new ArrayList<Message>(); -// messageArray.add(message); -// display.removeMessages(messageArray); -// } -// }); - } - - }); + public void onMoveMessageHandler(MoveMessageEvent event) { + final Message message = event.getMessage(); + // dispatcher.execute(new MoveMessage(event.getOldFolder(), + // event.getNewFolder(), message.getUid()), new + // HupaEvoCallback<MoveMessageResult>(dispatcher, eventBus) { + // public void callback(MoveMessageResult result) { + // ArrayList<Message> messageArray = new ArrayList<Message>(); + // messageArray.add(message); + // display.removeMessages(messageArray); + // } + // }); + } + + }); display.getSelectAllClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - display.deselectAllMessages(); - display.selectAllMessages(); - } - - }); + public void onClick(ClickEvent event) { + display.deselectAllMessages(); + display.selectAllMessages(); + } + + }); display.getSelectNoneClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - display.deselectAllMessages(); - } - - }); + public void onClick(ClickEvent event) { + display.deselectAllMessages(); + } + + }); display.getDeleteClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() { - public void onClick(com.google.gwt.event.dom.client.ClickEvent event) { - if (folder.getFullName().equals(user.getSettings().getTrashFolderName())) { - display.getConfirmDeleteDialog().show(); - } else { - deleteMessages(); - } - - } - - }); + public void onClick(com.google.gwt.event.dom.client.ClickEvent event) { + if (folder.getFullName().equals(user.getSettings().getTrashFolderName())) { + display.getConfirmDeleteDialog().show(); + } else { + deleteMessages(); + } + + } + + }); display.getConfirmDeleteDialogClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - deleteMessages(); - } - - }); + public void onClick(ClickEvent event) { + deleteMessages(); + } + + }); display.getNewClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() { - public void onClick(com.google.gwt.event.dom.client.ClickEvent event) { -// eventBus.fireEvent(new NewMessageEvent()); - placeController.goTo(messageSendPlaceProvider.get().with(user, null, null, null, Type.NEW)); - } - - }); + public void onClick(com.google.gwt.event.dom.client.ClickEvent event) { + // eventBus.fireEvent(new NewMessageEvent()); + placeController.goTo(messageSendPlaceProvider.get().with(user, null, null, null, Type.NEW)); + } + + }); display.getDeleteAllClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - display.getConfirmDeleteAllDialog().center(); - } - - }); + public void onClick(ClickEvent event) { + display.getConfirmDeleteAllDialog().center(); + } + + }); display.getConfirmDeleteAllDialogClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { -// dispatcher.execute(new DeleteAllMessages(folder), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) { -// public void callback(DeleteMessageResult result) { -// display.reset(); -// display.reloadData(); -//// eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount())); -// } -// }); - } - - }); - display.getMarkSeenClick().addClickHandler( new ClickHandler() { - public void onClick(ClickEvent event) { - final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages()); - ArrayList<Long> uids = new ArrayList<Long>(); - for (Message m : selectedMessages) { - if (m.getFlags().contains(IMAPFlag.SEEN) == false) { - uids.add(m.getUid()); - } else { - selectedMessages.remove(m); - } - } -// dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, true, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) { -// public void callback(GenericResult result) { -// for (Message m : selectedMessages) { -// if (m.getFlags().contains(IMAPFlag.SEEN) == false) { -// m.getFlags().add(IMAPFlag.SEEN); -// } -// } -// display.redraw(); -// eventBus.fireEvent(new DecreaseUnseenEvent(user, folder,selectedMessages.size())); -// } -// }); - } + public void onClick(ClickEvent event) { + DeleteMessageAllRequest req = requestFactory.deleteMessageAllRequest(); + DeleteMessageAllAction action = req.create(DeleteMessageAllAction.class); + action.setFolder(folder); + req.delete(action).fire(new Receiver<DeleteMessageResult>() { + @Override + public void onSuccess(DeleteMessageResult response) { + display.reset(); + display.reloadData(); + eventBus.fireEvent(new DecreaseUnseenEvent(user, folder, response.getCount())); + } + }); + } + + }); + display.getMarkSeenClick().addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages()); + ArrayList<Long> uids = new ArrayList<Long>(); + for (Message m : selectedMessages) { + if (m.getFlags().contains(IMAPFlag.SEEN) == false) { + uids.add(m.getUid()); + } else { + selectedMessages.remove(m); + } + } + // dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, true, + // uids), new HupaEvoCallback<GenericResult>(dispatcher, + // eventBus) { + // public void callback(GenericResult result) { + // for (Message m : selectedMessages) { + // if (m.getFlags().contains(IMAPFlag.SEEN) == false) { + // m.getFlags().add(IMAPFlag.SEEN); + // } + // } + // display.redraw(); + // eventBus.fireEvent(new DecreaseUnseenEvent(user, + // folder,selectedMessages.size())); + // } + // }); + } - }); + }); display.getMarkUnseenClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages()); - ArrayList<Long> uids = new ArrayList<Long>(); - for (Message m : selectedMessages) { - if (m.getFlags().contains(IMAPFlag.SEEN)) { - uids.add(m.getUid()); - } else { - selectedMessages.remove(m); - } - } - -// dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, false, uids), new HupaEvoCallback<GenericResult>(dispatcher, eventBus) { -// public void callback(GenericResult result) { -// for (Message m : selectedMessages) { -// if (m.getFlags().contains(IMAPFlag.SEEN)) { -// m.getFlags().remove(IMAPFlag.SEEN); -// } -// } -// display.redraw(); -// eventBus.fireEvent(new IncreaseUnseenEvent(user, folder,selectedMessages.size())); -// } -// }); - } - - - }); - eventBus.addHandler(FolderSelectionEvent.TYPE, new FolderSelectionEventHandler() {//TODO + public void onClick(ClickEvent event) { + final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages()); + ArrayList<Long> uids = new ArrayList<Long>(); + for (Message m : selectedMessages) { + if (m.getFlags().contains(IMAPFlag.SEEN)) { + uids.add(m.getUid()); + } else { + selectedMessages.remove(m); + } + } + + // dispatcher.execute(new SetFlag(folder, IMAPFlag.SEEN, false, + // uids), new HupaEvoCallback<GenericResult>(dispatcher, + // eventBus) { + // public void callback(GenericResult result) { + // for (Message m : selectedMessages) { + // if (m.getFlags().contains(IMAPFlag.SEEN)) { + // m.getFlags().remove(IMAPFlag.SEEN); + // } + // } + // display.redraw(); + // eventBus.fireEvent(new IncreaseUnseenEvent(user, + // folder,selectedMessages.size())); + // } + // }); + } + + }); + eventBus.addHandler(FolderSelectionEvent.TYPE, new FolderSelectionEventHandler() {// TODO + + public void onFolderSelectionEvent(FolderSelectionEvent event) { + folder = event.getFolder(); + user = event.getUser(); + } + + }); + new HandlerRegistrationAdapter(display.getDataTableSelection().addRowSelectionHandler( + new RowSelectionHandler() { + public void onRowSelection(RowSelectionEvent event) { + if (event.getSelectedRows().size() == 0) { + display.getDeleteEnable().setEnabled(false); + display.getMarkSeenEnable().setEnabled(false); + display.getMarkUnseenEnable().setEnabled(false); + } else { + display.getDeleteEnable().setEnabled(true); + display.getMarkSeenEnable().setEnabled(true); + display.getMarkUnseenEnable().setEnabled(true); + } + } - public void onFolderSelectionEvent(FolderSelectionEvent event) { - folder = event.getFolder(); - user = event.getUser(); - } - - }); - new HandlerRegistrationAdapter(display.getDataTableSelection().addRowSelectionHandler(new RowSelectionHandler() { - public void onRowSelection(RowSelectionEvent event) { - if (event.getSelectedRows().size() == 0) { - display.getDeleteEnable().setEnabled(false); - display.getMarkSeenEnable().setEnabled(false); - display.getMarkUnseenEnable().setEnabled(false); - } else { - display.getDeleteEnable().setEnabled(true); - display.getMarkSeenEnable().setEnabled(true); - display.getMarkUnseenEnable().setEnabled(true); - } - } - - - - })); + })); display.getRefreshClick().addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - display.reset(); - display.reloadData(); - } - - }); - new HandlerRegistrationAdapter(display.getDataTablePageChange().addPageChangeHandler(new PageChangeHandler() {//TODO + public void onClick(ClickEvent event) { + display.reset(); + display.reloadData(); + } + + }); + new HandlerRegistrationAdapter(display.getDataTablePageChange().addPageChangeHandler(new PageChangeHandler() {// TODO + + public void onPageChange(PageChangeEvent event) { + // firePresenterRevealedEvent(true); + // firePresenterChangedEvent(); + } - public void onPageChange(PageChangeEvent event) { - //firePresenterRevealedEvent(true); -// firePresenterChangedEvent(); - } - - })); + })); display.getRowsPerPageChange().addChangeHandler(new ChangeHandler() { - public void onChange(ChangeEvent event) { - //firePresenterRevealedEvent(true); -// firePresenterChangedEvent(); - } - - }); + public void onChange(ChangeEvent event) { + // firePresenterRevealedEvent(true); + // firePresenterChangedEvent(); + } + + }); display.addTableListener(tableListener); } - private void deleteMessages() { - final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages()); - ArrayList<Long> uids = new ArrayList<Long>(); - for (Message m : selectedMessages) { - uids.add(m.getUid()); - } - // maybe its better to just remove the messages from the table and expect the removal will work - display.removeMessages(selectedMessages); - -// dispatcher.execute(new DeleteMessageByUid(folder,uids), new HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) { -// public void callback(DeleteMessageResult result) { -// eventBus.fireEvent(new DecreaseUnseenEvent(user,folder,result.getCount())); -// } -// }); - } - public IMAPMessageListActivity with(MailFolderPlace place){ + private void deleteMessages() { + List<Message> ml = display.getSelectedMessages(); + final List<Message> selectedMessages = new ArrayList<Message>(ml); + List<Long> uids = new ArrayList<Long>(); + for (Message m : selectedMessages) { + uids.add(m.getUid()); + } + // maybe its better to just remove the messages from the table and + // expect the removal will work + display.removeMessages(selectedMessages); + DeleteMessageByUidRequest req = requestFactory.deleteMessageByUidRequest(); + DeleteMessageByUidAction action = req.create(DeleteMessageByUidAction.class); + action.setMessageUids(uids); + action.setFolder(folder); + req.delete(action).fire(new Receiver<DeleteMessageResult>() { + @Override + public void onSuccess(DeleteMessageResult response) { + eventBus.fireEvent(new DecreaseUnseenEvent(user, folder, response.getCount())); + } + }); + + // dispatcher.execute(new DeleteMessageByUid(folder,uids), new + // HupaEvoCallback<DeleteMessageResult>(dispatcher, eventBus) { + // public void callback(DeleteMessageResult result) { + // eventBus.fireEvent(new + // DecreaseUnseenEvent(user,folder,result.getCount())); + // } + // }); + } + public IMAPMessageListActivity with(MailFolderPlace place) { this.user = place.getUser(); this.folder = place.getFolder(); this.searchValue = place.getSearchValue(); @@ -1049,6 +1109,7 @@ public class IMAPMessageListActivity ext return this; } +<<<<<<< HEAD protected void onRevealDisplay() { if (user != null && folder != null) { display.reloadData(); @@ -1158,4 +1219,89 @@ public class IMAPMessageListActivity ext >>>>>>> Change to new mvp framework - first step ======= >>>>>>> Change to new mvp framework - first step +======= + protected void onRevealDisplay() { + if (user != null && folder != null) { + display.reloadData(); + } + } + public void revealDisplay(User user, ImapFolder folder, String searchValue) { + this.user = user; + + if (this.user == null || !this.user.getName().equals(user.getName()) || this.folder == null + || !this.folder.getFullName().equals(folder.getFullName()) + || (searchValue == null && this.searchValue != null) + || (searchValue != null && searchValue.equals(this.searchValue) == false)) { + display.reset(); + display.deselectAllMessages(); + } + display.setExpandLoading(false); + this.searchValue = searchValue; + this.folder = folder; + + onRevealDisplay(); + } + + public interface Displayable extends WidgetDisplayable { + public HasRowSelectionHandlers getDataTableSelection(); + public HasPageLoadHandlers getDataTableLoad(); + public void addTableListener(TableListener listener); + public void removeTableListener(TableListener listener); + public void setPostFetchMessageCount(int count); + public HasClickHandlers getNewClick(); + public Message getData(int rowIndex); + public HasClickHandlers getDeleteClick(); + public HasClickHandlers getDeleteAllClick(); + public HasEnable getDeleteEnable(); + public void reloadData(); + public void removeMessages(List<Message> messages); + public List<Message> getSelectedMessages(); + public void reset(); + public HasDialog getConfirmDeleteDialog(); + public HasDialog getConfirmDeleteAllDialog(); + public HasClickHandlers getConfirmDeleteDialogClick(); + public HasClickHandlers getConfirmDeleteAllDialogClick(); + public void selectAllMessages(); + public void deselectAllMessages(); + public HasClickHandlers getSelectAllClick(); + public HasClickHandlers getSelectNoneClick(); + public HasClickHandlers getMarkSeenClick(); + public HasClickHandlers getMarkUnseenClick(); + public HasEnable getMarkSeenEnable(); + public HasEnable getMarkUnseenEnable(); + public HasClickHandlers getRefreshClick(); + public void redraw(); + public HasPageChangeHandlers getDataTablePageChange(); + public void goToPage(int page); + public int getCurrentPage(); + public int getRowsPerPageIndex(); + public HasChangeHandlers getRowsPerPageChange(); + public HasClickHandlers getSearchClick(); + public HasValue<String> getSearchValue(); + public void fillSearchOracle(List<Message> messages); + public void setExpandLoading(boolean expanding); + + } + + private final class ShowMessageTableListener implements TableListener { + + public void onCellClicked(SourcesTableEvents sender, int row, int cell) { + + display.setExpandLoading(true); + Message message = display.getData(row); + + // mark the message as seen and redraw the table to reflect this + if (message.getFlags().contains(MessageImpl.IMAPFlag.SEEN) == false) { + // add flag, fire event and redraw + message.getFlags().add(MessageImpl.IMAPFlag.SEEN); + eventBus.fireEvent(new DecreaseUnseenEvent(user, folder, 1)); + + display.redraw(); + + } + eventBus.fireEvent(new ExpandMessageEvent(user, folder, message)); + } + + } +>>>>>>> delete messages, make WestActivity Singleton } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 03:06:54 2013 @@ -149,9 +149,12 @@ import org.apache.hupa.client.mvp.WestAc import org.apache.hupa.client.evo.AppController; import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; import org.apache.hupa.client.mapper.CachingTopActivityMapper; -import org.apache.hupa.client.mapper.CachingWestActivityMapper; import org.apache.hupa.client.mapper.MainContentActivityMapper; +<<<<<<< HEAD >>>>>>> Make the evo more clear. +======= +import org.apache.hupa.client.mapper.WestActivityMapper; +>>>>>>> delete messages, make WestActivity Singleton import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.AppLayout; @@ -404,6 +407,8 @@ public class AppGinModule extends Abstra >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. bind(PagingScrollTableRowDragController.class).in(Singleton.class); + bind(WestActivity.class).in(Singleton.class); + // Places bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in(Singleton.class); @@ -469,6 +474,7 @@ public class AppGinModule extends Abstra @Singleton @Named("WestRegion") <<<<<<< HEAD +<<<<<<< HEAD public ActivityManager getVerticalMasterRegionActivityMapper(WestActivityMapper activityMapper, >>>>>>> Change to new mvp framework - first step ======= @@ -481,6 +487,9 @@ public class AppGinModule extends Abstra ======= public ActivityManager getWestRegionActivityMapper(CachingWestActivityMapper activityMapper, EventBus eventBus) { >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= + public ActivityManager getWestRegionActivityMapper(WestActivityMapper activityMapper, EventBus eventBus) { +>>>>>>> delete messages, make WestActivity Singleton return new ActivityManager(activityMapper, eventBus); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageAllRequest.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton 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/DeleteMessageByUidRequest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/DeleteMessageByUidRequest.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton 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=1522167&r1=1522166&r2=1522167&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:06:54 2013 @@ -99,5 +99,10 @@ public interface HupaRequestFactory exte ======= DeleteFolderRequest deleteFolderRequest(); RenameFolderRequest renameFolderRequest(); +<<<<<<< HEAD >>>>>>> delete and rename folder +======= + DeleteMessageByUidRequest deleteMessageByUidRequest(); + DeleteMessageAllRequest deleteMessageAllRequest(); +>>>>>>> delete messages, make WestActivity Singleton } \ 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=1522167&r1=1522166&r2=1522167&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:06:54 2013 @@ -1350,7 +1350,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); } 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=1522167&r1=1522166&r2=1522167&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:06:54 2013 @@ -285,10 +285,15 @@ public class MessageTableModel extends M } FetchMessagesRequest req = requestFactory.messagesRequest(); final FetchMessagesAction action = req.create(FetchMessagesAction.class); - + final ImapFolder input = req.create(ImapFolder.class); + input.setChildren(folder.getChildren()); + input.setDelimiter(folder.getDelimiter()); + input.setFullName(folder.getFullName()); + input.setName(folder.getName()); + input.setUnseenMessageCount(folder.getUnseenMessageCount()); // FIXME cannot put setFolder to the first place + action.setFolder(input); action.setOffset(request.getNumRows()); - action.setFolder(folder); action.setSearchString(searchValue); action.setStart(request.getStartRow()); req.fetch(action).fire(new Receiver<FetchMessagesResult>() { 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=1522167&r1=1522166&r2=1522167&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:06:54 2013 @@ -53,8 +53,11 @@ import org.apache.hupa.server.service.De import org.apache.hupa.server.service.DeleteMessageAllServiceImpl; import org.apache.hupa.server.service.DeleteMessageByUidService; import org.apache.hupa.server.service.DeleteMessageByUidServiceImpl; +<<<<<<< HEAD import org.apache.hupa.server.service.FetchFoldersService; import org.apache.hupa.server.service.FetchFoldersServiceImpl; +======= +>>>>>>> delete messages, make WestActivity Singleton import org.apache.hupa.server.service.FetchMessagesService; import org.apache.hupa.server.service.FetchMessagesServiceImpl; import org.apache.hupa.server.service.GetMessageDetailsService; @@ -123,7 +126,12 @@ import org.apache.hupa.server.service.Re import org.apache.hupa.server.service.RenameFolderServiceImpl; import org.apache.hupa.shared.data.CreateFolderActionImpl; import org.apache.hupa.shared.data.DeleteFolderActionImpl; +<<<<<<< HEAD >>>>>>> delete and rename folder +======= +import org.apache.hupa.shared.data.DeleteMessageAllActionImpl; +import org.apache.hupa.shared.data.DeleteMessageByUidActionImpl; +>>>>>>> delete messages, make WestActivity Singleton import org.apache.hupa.shared.data.FetchMessagesActionImpl; import org.apache.hupa.shared.data.FetchMessagesResultImpl; import org.apache.hupa.shared.data.GenericResultImpl; @@ -154,10 +162,15 @@ import org.apache.hupa.shared.data.UserI import org.apache.hupa.shared.domain.CreateFolderAction; import org.apache.hupa.shared.domain.DeleteFolderAction; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.domain.DeleteMessageAllAction; import org.apache.hupa.shared.domain.DeleteMessageByUidAction; ======= >>>>>>> delete and rename folder +======= +import org.apache.hupa.shared.domain.DeleteMessageAllAction; +import org.apache.hupa.shared.domain.DeleteMessageByUidAction; +>>>>>>> delete messages, make WestActivity Singleton import org.apache.hupa.shared.domain.FetchMessagesAction; import org.apache.hupa.shared.domain.FetchMessagesResult; import org.apache.hupa.shared.domain.GenericResult; @@ -297,7 +310,12 @@ public class GuiceServerModule extends A ======= bind(DeleteFolderAction.class).to(DeleteFolderActionImpl.class); bind(RenameFolderAction.class).to(RenameFolderActionImpl.class); +<<<<<<< HEAD >>>>>>> delete and rename folder +======= + bind(DeleteMessageAllAction.class).to(DeleteMessageAllActionImpl.class); + bind(DeleteMessageByUidAction.class).to(DeleteMessageByUidActionImpl.class); +>>>>>>> delete messages, make WestActivity Singleton bind(CheckSessionService.class).to(CheckSessionServiceImpl.class); bind(LoginUserService.class).to(LoginUserServiceImpl.class); @@ -342,7 +360,12 @@ public class GuiceServerModule extends A ======= bind(DeleteFolderService.class).to(DeleteFolderServiceImpl.class); bind(RenameFolderService.class).to(RenameFolderServiceImpl.class); +<<<<<<< HEAD >>>>>>> delete and rename folder +======= + bind(DeleteMessageAllService.class).to(DeleteMessageAllServiceImpl.class); + bind(DeleteMessageByUidService.class).to(DeleteMessageByUidServiceImpl.class); +>>>>>>> delete messages, make WestActivity Singleton bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllService.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.server.service; import org.apache.hupa.shared.domain.DeleteMessageAction; Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageAllServiceImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.server.service; import javax.mail.Folder; @@ -26,7 +29,10 @@ import javax.mail.MessagingException; import org.apache.hupa.shared.domain.DeleteMessageAction; import org.apache.hupa.shared.domain.DeleteMessageAllAction; import org.apache.hupa.shared.domain.User; +<<<<<<< HEAD import org.apache.hupa.shared.exception.HupaException; +======= +>>>>>>> delete messages, make WestActivity Singleton import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPStore; @@ -34,7 +40,11 @@ import com.sun.mail.imap.IMAPStore; public class DeleteMessageAllServiceImpl extends DeleteMessageBaseServiceImpl implements DeleteMessageAllService { @Override +<<<<<<< HEAD protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException { +======= + protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception { +>>>>>>> delete messages, make WestActivity Singleton DeleteMessageAllAction action = (DeleteMessageAllAction) actionBase; User user = getUser(); try { @@ -48,7 +58,11 @@ public class DeleteMessageAllServiceImpl } catch (MessagingException e) { String errorMsg = "Error while deleting all messages in folder " + action.getFolder() + " for user " + user; logger.error(errorMsg, e); +<<<<<<< HEAD throw new HupaException(errorMsg); +======= + throw new Exception(errorMsg); +>>>>>>> delete messages, make WestActivity Singleton } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageBaseServiceImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.server.service; import javax.mail.Flags; @@ -28,12 +31,19 @@ import org.apache.hupa.shared.domain.Del import org.apache.hupa.shared.domain.DeleteMessageResult; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.User; +<<<<<<< HEAD import org.apache.hupa.shared.exception.HupaException; +======= +>>>>>>> delete messages, make WestActivity Singleton import com.sun.mail.imap.IMAPStore; public abstract class DeleteMessageBaseServiceImpl extends AbstractService{ +<<<<<<< HEAD public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException { +======= + public DeleteMessageResult delete(DeleteMessageAction action) throws Exception { +>>>>>>> delete messages, make WestActivity Singleton ImapFolder folder = action.getFolder(); User user = getUser(); try { @@ -85,7 +95,11 @@ public abstract class DeleteMessageBaseS } catch (MessagingException e) { logger.error("Error while deleting messages for user " + user + " in folder" + action.getFolder(), e); +<<<<<<< HEAD throw new HupaException("Error while deleting messages"); +======= + throw new Exception("Error while deleting messages"); +>>>>>>> delete messages, make WestActivity Singleton } } @@ -96,5 +110,9 @@ public abstract class DeleteMessageBaseS * @param action * @return messages */ +<<<<<<< HEAD protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException; +======= + protected abstract Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception; +>>>>>>> delete messages, make WestActivity Singleton } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidService.java Thu Sep 12 03:06:54 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,12 +18,20 @@ * under the License. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.server.service; import org.apache.hupa.shared.domain.DeleteMessageAction; import org.apache.hupa.shared.domain.DeleteMessageResult; +<<<<<<< HEAD import org.apache.hupa.shared.exception.HupaException; public interface DeleteMessageByUidService { public DeleteMessageResult delete(DeleteMessageAction action) throws HupaException; +======= + +public interface DeleteMessageByUidService { + public DeleteMessageResult delete(DeleteMessageAction action) throws Exception; +>>>>>>> delete messages, make WestActivity Singleton } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/DeleteMessageByUidServiceImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.server.service; import java.util.ArrayList; @@ -29,14 +32,21 @@ import org.apache.hupa.shared.domain.Del import org.apache.hupa.shared.domain.DeleteMessageByUidAction; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.User; +<<<<<<< HEAD import org.apache.hupa.shared.exception.HupaException; +======= +>>>>>>> delete messages, make WestActivity Singleton import com.sun.mail.imap.IMAPStore; public class DeleteMessageByUidServiceImpl extends DeleteMessageBaseServiceImpl implements DeleteMessageByUidService{ @Override +<<<<<<< HEAD protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws HupaException { +======= + protected Message[] getMessagesToDelete(DeleteMessageAction actionBase) throws Exception { +>>>>>>> delete messages, make WestActivity Singleton DeleteMessageByUidAction action = (DeleteMessageByUidAction)actionBase; ImapFolder folder = action.getFolder(); List<Long> uids = action.getMessageUids(); @@ -63,7 +73,11 @@ public class DeleteMessageByUidServiceIm logger.error("Error while deleting messages with uids " + action.getMessageUids() + " for user " + user + " in folder" + action.getFolder(), e); +<<<<<<< HEAD throw new HupaException("Error while deleting messages", e); +======= + throw new Exception("Error while deleting messages", e); +>>>>>>> delete messages, make WestActivity Singleton } } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageActionImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.DeleteMessageAction; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageAllActionImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.DeleteMessageAllAction; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageByUidActionImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.data; import java.util.List; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/DeleteMessageResultImpl.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.data; import org.apache.hupa.shared.domain.DeleteMessageResult; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAction.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAction.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.domain; import com.google.web.bindery.requestfactory.shared.ValueProxy; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAllAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAllAction.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAllAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageAllAction.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton 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/DeleteMessageByUidAction.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageByUidAction.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageByUidAction.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageByUidAction.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.domain; import java.util.List; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageResult.java?rev=1522167&r1=1522166&r2=1522167&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/DeleteMessageResult.java Thu Sep 12 03:06:54 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. * ****************************************************************/ +======= +>>>>>>> delete messages, make WestActivity Singleton package org.apache.hupa.shared.domain; import com.google.web.bindery.requestfactory.shared.ProxyFor; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org