Author: dongxu Date: Thu Sep 12 02:50:25 2013 New Revision: 1522148 URL: http://svn.apache.org/r1522148 Log: 1. improve the inbox folder place. 2. commit all of the activities except contacts.
Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java~HEAD - copied, changed from r1522147, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailInboxPlace.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/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/activity/MessageSendActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/AppController.java Thu Sep 12 02:50:25 2013 @@ -1,7 +1,7 @@ package org.apache.hupa.client; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.ui.AppLayout; import com.google.gwt.event.shared.EventBus; @@ -58,7 +58,7 @@ public class AppController { public void onPlaceChange(PlaceChangeEvent event) { Place newPlace = event.getNewPlace(); if (newPlace != currentPlace) { - if (newPlace instanceof MailInboxPlace) { + if (isAuth(newPlace, currentPlace)) { appPanelView.setDefaultLayout(); } else if (newPlace instanceof DefaultPlace) { appPanelView.setLoginLayout(); @@ -66,6 +66,10 @@ public class AppController { currentPlace = newPlace; } } + + public boolean isAuth(Place newPlace, Place currentPlace){ + return (newPlace instanceof MailFolderPlace) && !(currentPlace instanceof MailFolderPlace); + } } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/CachingDispatchAsync.java Thu Sep 12 02:50:25 2013 @@ -166,7 +166,7 @@ public class CachingDispatchAsync extend final Class<?> clz = action.getClass(); if (running.contains(clz)) { System.err.println("ATTENTION: avoiding a parallel execution of the action: " + action.getClass().getName()); - new RuntimeException().printStackTrace(); +// new RuntimeException().printStackTrace(); return; } else { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 02:50:25 2013 @@ -4,10 +4,18 @@ import java.util.ArrayList; import java.util.List; import org.apache.hupa.client.CachingDispatchAsync; +<<<<<<< HEAD import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.shared.SConsts; +======= +import org.apache.hupa.client.HupaEvoCallback; +import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.shared.SConsts; +import org.apache.hupa.shared.data.IMAPFolder; +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.data.Message; import org.apache.hupa.shared.data.MessageAttachment; import org.apache.hupa.shared.data.MessageDetails; @@ -16,7 +24,10 @@ import org.apache.hupa.shared.events.Bac import org.apache.hupa.shared.events.ForwardMessageEvent; import org.apache.hupa.shared.events.LoadMessagesEvent; import org.apache.hupa.shared.events.ReplyMessageEvent; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.rpc.DeleteMessageByUid; import org.apache.hupa.shared.rpc.DeleteMessageResult; @@ -122,7 +133,11 @@ public class IMAPMessageActivity extend private MessageDetails messageDetails; private Message message; private CachingDispatchAsync dispatcher; +<<<<<<< HEAD private IMAPFolderProxy folder; +======= + private IMAPFolder folder; +>>>>>>> 1. improve the inbox folder place. private User user; private final Displayable display; private final EventBus eventBus; 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=1522148&r1=1522147&r2=1522148&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 02:50:25 2013 @@ -425,16 +425,20 @@ import com.google.gwt.event.dom.client.C ======= ======= import org.apache.hupa.client.HandlerRegistrationAdapter; -import org.apache.hupa.client.HupaCallback; import org.apache.hupa.client.HupaEvoCallback; +<<<<<<< HEAD >>>>>>> +======= +import org.apache.hupa.client.activity.MessageSendActivity.Type; +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.mvp.WidgetDisplayable; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; -import org.apache.hupa.shared.data.User; import org.apache.hupa.shared.data.Message.IMAPFlag; +import org.apache.hupa.shared.data.User; import org.apache.hupa.shared.events.DecreaseUnseenEvent; import org.apache.hupa.shared.events.ExpandMessageEvent; import org.apache.hupa.shared.events.FolderSelectionEvent; @@ -447,7 +451,6 @@ import org.apache.hupa.shared.events.Mes import org.apache.hupa.shared.events.MessagesReceivedEventHandler; import org.apache.hupa.shared.events.MoveMessageEvent; import org.apache.hupa.shared.events.MoveMessageEventHandler; -import org.apache.hupa.shared.events.NewMessageEvent; import org.apache.hupa.shared.rpc.DeleteAllMessages; import org.apache.hupa.shared.rpc.DeleteMessageByUid; import org.apache.hupa.shared.rpc.DeleteMessageResult; @@ -535,14 +538,16 @@ public class IMAPMessageListActivity ext ======= >>>>>>> At first make the inbox work, but only when click the refresh button. >>>>>>> The page also be working, the other folder will be like the same. private DispatchAsync dispatcher; + private final Provider<MessageSendPlace> messageSendPlaceProvider; @Inject public IMAPMessageListActivity(Displayable display, EventBus eventBus, PlaceController placeController, - DispatchAsync dispatcher){ + DispatchAsync dispatcher,Provider<MessageSendPlace> messageSendPlaceProvider){ this.display = display; this.eventBus = eventBus; this.placeController = placeController; this.dispatcher = dispatcher; + this.messageSendPlaceProvider = messageSendPlaceProvider; // add this event on constructor because we don't want to remove it on unbind @@ -856,7 +861,8 @@ public class IMAPMessageListActivity ext 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()); +// eventBus.fireEvent(new NewMessageEvent()); + placeController.goTo(messageSendPlaceProvider.get().with(user, null, null, null, Type.NEW)); } }); @@ -1098,9 +1104,12 @@ public class IMAPMessageListActivity ext } <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> Change to new mvp framework - first step +======= +>>>>>>> 1. improve the inbox folder place. eventBus.fireEvent(new ExpandMessageEvent(user,folder,message)); } 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=1522148&r1=1522147&r2=1522148&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 02:50:25 2013 @@ -61,7 +61,7 @@ import org.apache.hupa.client.place.Mail import org.apache.hupa.client.HupaConstants; import org.apache.hupa.client.HupaEvoCallback; import org.apache.hupa.client.mvp.WidgetDisplayable; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.shared.events.FlashEvent; import org.apache.hupa.shared.events.SessionExpireEvent; import org.apache.hupa.shared.events.SessionExpireEventHandler; @@ -322,6 +322,7 @@ public class LoginActivity extends Abstr // eventBus.fireEvent(new LoginEvent(result.getUser())); // LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get().with(result.getUser())); LoginActivity.this.placeController.goTo(new MailFolderPlace().with(result.getUser())); +<<<<<<< HEAD ======= Window.alert("success"); // eventBus.fireEvent(new LoginEvent(result.getUser())); @@ -336,6 +337,8 @@ public class LoginActivity extends Abstr // LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get().with(result.getUser())); LoginActivity.this.placeController.goTo(new MailInboxPlace("!").with(result.getUser())); >>>>>>> At first make the inbox work, but only when click the refresh button. >>>>>>> The page also be working, the other folder will be like the same. +======= +>>>>>>> 1. improve the inbox folder place. doReset(); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 02:50:25 2013 @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -20,6 +21,8 @@ ======= >>>>>>> 1. improve the inbox folder place. +======= +>>>>>>> 1. improve the inbox folder place. package org.apache.hupa.client.activity; import gwtupload.client.IUploadStatus.Status; @@ -32,6 +35,7 @@ import java.util.ArrayList; import java.util.List; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.SendForwardMessageRequest; import org.apache.hupa.client.rf.SendMessageRequest; @@ -57,6 +61,15 @@ import net.customware.gwt.dispatch.share import org.apache.hupa.client.evo.HupaEvoCallback; import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.ui.WidgetDisplayable; +======= +import net.customware.gwt.dispatch.client.DispatchAsync; +import net.customware.gwt.dispatch.shared.Action; + +import org.apache.hupa.client.HupaEvoCallback; +import org.apache.hupa.client.mvp.WidgetDisplayable; +import org.apache.hupa.client.mvp.MessageSendPresenter.Type; +import org.apache.hupa.client.place.MessageSendPlace; +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.Util; import org.apache.hupa.shared.data.IMAPFolder; @@ -65,6 +78,9 @@ import org.apache.hupa.shared.data.Messa import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.data.SMTPMessage; import org.apache.hupa.shared.data.User; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.events.BackEvent; import org.apache.hupa.shared.events.ContactsUpdatedEvent; @@ -75,12 +91,16 @@ import org.apache.hupa.shared.events.Fol import org.apache.hupa.shared.events.LoadMessagesEvent; import org.apache.hupa.shared.events.LoadMessagesEventHandler; import org.apache.hupa.shared.events.SentMessageEvent; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; import org.apache.hupa.shared.rpc.ContactsResult.Contact; <<<<<<< HEAD import org.apache.hupa.widgets.ui.HasEnable; ======= +======= +import org.apache.hupa.shared.rpc.ContactsResult.Contact; +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.rpc.ForwardMessage; import org.apache.hupa.shared.rpc.GenericResult; import org.apache.hupa.shared.rpc.ReplyMessage; @@ -88,12 +108,19 @@ import org.apache.hupa.shared.rpc.SendMe import org.apache.hupa.widgets.ui.HasEnable; import com.google.gwt.activity.shared.AbstractActivity; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; <<<<<<< HEAD +<<<<<<< HEAD +======= +import com.google.gwt.place.shared.PlaceController; +>>>>>>> 1. improve the inbox folder place. ======= import com.google.gwt.place.shared.PlaceController; >>>>>>> 1. improve the inbox folder place. @@ -103,17 +130,24 @@ import com.google.gwt.user.client.ui.Has import com.google.gwt.user.client.ui.HasText; import com.google.inject.Inject; <<<<<<< HEAD +<<<<<<< HEAD import com.google.web.bindery.requestfactory.shared.Receiver; public class MessageSendActivity extends AppBaseActivity { ======= +======= +>>>>>>> 1. improve the inbox folder place. public class MessageSendActivity extends AbstractActivity { private DispatchAsync dispatcher; private ArrayList<MessageAttachment> attachments = new ArrayList<MessageAttachment>(); private Type type = Type.NEW; +<<<<<<< HEAD private IMAPFolderProxy folder; +======= + private IMAPFolder folder; +>>>>>>> 1. improve the inbox folder place. private Message oldmessage; protected SMTPMessage message = null; @@ -126,6 +160,9 @@ public class MessageSendActivity extends private MessageSendPlace place; private User user; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. @Override @@ -135,9 +172,12 @@ public class MessageSendActivity extends container.setWidget(display.asWidget()); } <<<<<<< HEAD +<<<<<<< HEAD public MessageSendActivity with(MessageSendPlace place) { ======= +======= +>>>>>>> 1. improve the inbox folder place. @Inject public MessageSendActivity(Displayable display, EventBus eventBus, PlaceController placeController, DispatchAsync dispatcher){ @@ -150,6 +190,9 @@ public class MessageSendActivity extends public MessageSendActivity with(MessageSendPlace place){ this.place = place; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. this.user = place.getUser(); this.folder = place.getFolder(); @@ -160,6 +203,7 @@ public class MessageSendActivity extends } <<<<<<< HEAD +<<<<<<< HEAD private void bind() { eventBus.addHandler(LoadMessagesEvent.TYPE, new LoadMessagesEventHandler() { public void onLoadMessagesEvent(LoadMessagesEvent loadMessagesEvent) { @@ -453,6 +497,8 @@ public class MessageSendActivity extends private SendMessageRequest sendReq; ======= +======= +>>>>>>> 1. improve the inbox folder place. private void bind(){ eventBus.addHandler(LoadMessagesEvent.TYPE, new LoadMessagesEventHandler() { public void onLoadMessagesEvent(LoadMessagesEvent loadMessagesEvent) { @@ -544,7 +590,11 @@ public class MessageSendActivity extends }); } +<<<<<<< HEAD public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) { +======= + public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, String mailto, Type type) { +>>>>>>> 1. improve the inbox folder place. this.reset(); this.oldmessage = oldmessage; this.oldDetails = oldDetails; @@ -594,7 +644,11 @@ public class MessageSendActivity extends display.getEditorFocus().setFocus(true); } +<<<<<<< HEAD public void revealDisplay(User user, IMAPFolderProxy folder, Message oldmessage, MessageDetails oldDetails, Type type) { +======= + public void revealDisplay(User user, IMAPFolder folder, Message oldmessage, MessageDetails oldDetails, Type type) { +>>>>>>> 1. improve the inbox folder place. this.revealDisplay(user, folder, oldmessage, oldDetails, null, type); } @@ -706,6 +760,9 @@ public class MessageSendActivity extends } } }; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. public interface Displayable extends WidgetDisplayable { public HasText getFromText(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 02:50:25 2013 @@ -302,11 +302,10 @@ import org.apache.hupa.shared.rpc.GetMes import org.apache.hupa.shared.rpc.GetMessageDetailsResult; ======= import org.apache.hupa.client.HupaEvoCallback; -import org.apache.hupa.client.mvp.MessageSendPresenter.Type; -import org.apache.hupa.client.mvp.MainPresenter; +import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.client.mvp.WidgetContainerDisplayable; import org.apache.hupa.client.place.IMAPMessagePlace; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.widgets.HasDialog; import org.apache.hupa.client.widgets.IMAPTreeItem; @@ -402,6 +401,7 @@ public class WestActivity extends Abstra private final Provider<IMAPMessagePlace> IMAPMessagePlaceProvider; private final Provider<MessageSendPlace> messageSendPlaceProvider; private final Provider<IMAPMessagePlace> messagePlaceProvider; +<<<<<<< HEAD private DispatchAsync dispatcher; private User user; @@ -427,6 +427,8 @@ public class WestActivity extends Abstra private final Provider<IMAPMessagePlace> IMAPMessagePlaceProvider; private final Provider<MessageSendPlace> messageSendPlaceProvider; >>>>>>> +======= +>>>>>>> 1. improve the inbox folder place. private DispatchAsync dispatcher; private User user; @@ -435,10 +437,17 @@ public class WestActivity extends Abstra private HasEditable editableTreeItem; private String searchValue; + private Place currentPlace; + + public void setCurrentPlace(Place place){ + this.currentPlace = place; + } + @Inject public WestActivity(Displayable display, EventBus eventBus, PlaceController placeController, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD DispatchAsync dispatcher){ >>>>>>> Change to new mvp framework - first step ======= @@ -447,6 +456,9 @@ public class WestActivity extends Abstra ======= DispatchAsync dispatcher,Provider<IMAPMessagePlace> IMAPMessagePlaceProvider,Provider<MessageSendPlace> messageSendPlaceProvider){ >>>>>>> At first make the inbox work, but only when click the refresh button. >>>>>>> The page also be working, the other folder will be like the same. +======= + DispatchAsync dispatcher,Provider<IMAPMessagePlace> IMAPMessagePlaceProvider,Provider<MessageSendPlace> messageSendPlaceProvider,Provider<IMAPMessagePlace> messagePlaceProvider){ +>>>>>>> 1. improve the inbox folder place. this.dispatcher = dispatcher; this.display = display; this.eventBus = eventBus; @@ -457,6 +469,7 @@ public class WestActivity extends Abstra this.IMAPMessagePlaceProvider = IMAPMessagePlaceProvider; this.messageSendPlaceProvider = messageSendPlaceProvider; this.messagePlaceProvider = messagePlaceProvider; +<<<<<<< HEAD ======= >>>>>>> Change to new mvp framework - first step ======= @@ -466,6 +479,8 @@ public class WestActivity extends Abstra this.IMAPMessagePlaceProvider = IMAPMessagePlaceProvider; this.messageSendPlaceProvider = messageSendPlaceProvider; >>>>>>> +======= +>>>>>>> 1. improve the inbox folder place. } @@ -478,6 +493,7 @@ public class WestActivity extends Abstra } <<<<<<< HEAD +<<<<<<< HEAD public WestActivity with(MailFolderPlace place){ this.currentPlace = place; this.user = place.getUser(); @@ -485,6 +501,11 @@ public class WestActivity extends Abstra public WestActivity with(User user){ this.user = user; >>>>>>> Change to new mvp framework - first step +======= + public WestActivity with(MailFolderPlace place){ + this.currentPlace = place; + this.user = place.getUser(); +>>>>>>> 1. improve the inbox folder place. return this; } @@ -644,12 +665,18 @@ public class WestActivity extends Abstra } display.setLoadingMessage(false); <<<<<<< HEAD +<<<<<<< HEAD // showMessage(user, folder, message, result.getMessageDetails()); placeController.goTo(messagePlaceProvider.get().with(user,folder, message,result.getMessageDetails())); ======= showMessage(user, folder, message, result.getMessageDetails()); >>>>>>> +======= +// showMessage(user, folder, message, result.getMessageDetails()); + + placeController.goTo(messagePlaceProvider.get().with(user,folder, message,result.getMessageDetails())); +>>>>>>> 1. improve the inbox folder place. } }); } @@ -944,7 +971,7 @@ public class WestActivity extends Abstra this.user = user; this.folder = folder; this.searchValue = searchValue; - placeController.goTo(new MailInboxPlace().with(user,folder, searchValue)); + placeController.goTo(new MailFolderPlace().with(user,folder, searchValue)); // placeController.goTo(mailInboxPlaceProvider.get().with(user)); // System.out.println("111"); // placeController.goTo(new MailInboxPlace(folder.getName()).with(user)); @@ -955,26 +982,15 @@ public class WestActivity extends Abstra } private void showNewMessage() { - placeController.goTo(this.messageSendPlaceProvider.get()); -// sendPresenter.revealDisplay(user); + placeController.goTo(this.messageSendPlaceProvider.get().with(user, null, null, null, Type.NEW)); } private void showForwardMessage(ForwardMessageEvent event) { - placeController.goTo(this.messageSendPlaceProvider.get()); -// sendPresenter.revealDisplay(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails(), Type.FORWARD); + placeController.goTo(this.messageSendPlaceProvider.get().with(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails(), Type.FORWARD)); } private void showReplyMessage(ReplyMessageEvent event) { - if (event.getReplyAll()) { - placeController.goTo(this.messageSendPlaceProvider.get()); -// sendPresenter.revealDisplay(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails(), Type.REPLY_ALL); - } else { - placeController.goTo(this.messageSendPlaceProvider.get()); -// sendPresenter.revealDisplay(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails(), Type.REPLY); - - } - placeController.goTo(this.messageSendPlaceProvider.get()); -// sendPresenter.revealDisplay(); + placeController.goTo(this.messageSendPlaceProvider.get().with(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails(), event.getReplyAll()?Type.REPLY_ALL:Type.REPLY)); } >>>>>>> public interface Displayable extends WidgetContainerDisplayable { 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=1522148&r1=1522147&r2=1522148&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 02:50:25 2013 @@ -122,8 +122,10 @@ import org.apache.hupa.client.mapper.Mai ======= import org.apache.hupa.client.AppController; import org.apache.hupa.client.CachingDispatchAsync; +import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; import org.apache.hupa.client.activity.LoginActivity; +import org.apache.hupa.client.activity.MessageSendActivity; import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.WestActivity; import org.apache.hupa.client.dnd.PagingScrollTableRowDragController; @@ -141,6 +143,9 @@ import org.apache.hupa.client.ui.AppLayo import org.apache.hupa.client.ui.AppLayoutImpl; import org.apache.hupa.client.ui.IMAPMessageListView; <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.ui.IMAPMessageView; import org.apache.hupa.client.ui.LoginView; import org.apache.hupa.client.ui.MessageSendView; @@ -357,6 +362,7 @@ public class AppGinModule extends Abstra bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class); bind(MessageSendActivity.Displayable.class).to(MessageSendView.class); bind(IMAPMessageActivity.Displayable.class).to(IMAPMessageView.class); +<<<<<<< HEAD ======= ======= bind(TopActivity.Displayable.class).to(TopView.class); @@ -364,6 +370,8 @@ public class AppGinModule extends Abstra bind(WestActivity.Displayable.class).to(WestView.class); bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class); >>>>>>> Change to new mvp framework - first step +======= +>>>>>>> 1. improve the inbox folder place. bind(PagingScrollTableRowDragController.class).in(Singleton.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPlaceHistoryMapper.java Thu Sep 12 02:50:25 2013 @@ -1,14 +1,18 @@ package org.apache.hupa.client.mvp; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.place.MessageSendPlace; import com.google.gwt.place.shared.PlaceHistoryMapper; import com.google.gwt.place.shared.WithTokenizers; @WithTokenizers({ DefaultPlace.Tokenizer.class, - MailInboxPlace.Tokenizer.class + MailFolderPlace.Tokenizer.class, + MessageSendPlace.Tokenizer.class, + IMAPMessagePlace.Tokenizer.class }) public interface AppPlaceHistoryMapper extends PlaceHistoryMapper { } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/CachingWestActivityMapper.java Thu Sep 12 02:50:25 2013 @@ -1,7 +1,7 @@ package org.apache.hupa.client.mvp; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.MailFolderPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -20,7 +20,8 @@ public class CachingWestActivityMapper i FilteredActivityMapper.Filter filter = new FilteredActivityMapper.Filter() { @Override public Place filter(Place place) { - return place instanceof MailInboxPlace ? new MailInboxPlace("!").with(((MailInboxPlace)place).getUser()): place; // FIXME with user + return (place instanceof DefaultPlace || place instanceof MailFolderPlace) ? place + : new MailFolderPlace(); } }; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainContentActivityMapper.java Thu Sep 12 02:50:25 2013 @@ -1,9 +1,13 @@ package org.apache.hupa.client.mvp; +import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; import org.apache.hupa.client.activity.LoginActivity; +import org.apache.hupa.client.activity.MessageSendActivity; import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.place.MessageSendPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -15,26 +19,34 @@ public class MainContentActivityMapper i private final Provider<LoginActivity> loginActivityProvider; private final Provider<IMAPMessageListActivity> messageListActivityProvider; + private final Provider<MessageSendActivity> messageSendActivityProvider; + private final Provider<IMAPMessageActivity> messageActivityProvider; @Inject public MainContentActivityMapper(Provider<IMAPMessageListActivity> messageListActivityProvider, - Provider<LoginActivity> loginActivityProvider) { + Provider<LoginActivity> loginActivityProvider,Provider<MessageSendActivity> messageSendActivityProvider,Provider<IMAPMessageActivity> messageActivityProvider) { this.messageListActivityProvider = messageListActivityProvider; this.loginActivityProvider = loginActivityProvider; + this.messageSendActivityProvider = messageSendActivityProvider; + this.messageActivityProvider = messageActivityProvider; } public Activity getActivity(Place place) { - if (place instanceof MailInboxPlace) { + if (place instanceof MailFolderPlace) { // return messageListActivityProvider.get().with(((MailInboxPlace) place).getUser()); - MailInboxPlace p = ((MailInboxPlace)place); - if(p.getMailId().equalsIgnoreCase("inbox")){ + MailFolderPlace p = ((MailFolderPlace)place); + if(p.getFolderName().equalsIgnoreCase("inbox")){ return messageListActivityProvider.get().with(p.getUser(),p.getFolder(), p.getSearchValue()); - } else if(p.getMailId().equalsIgnoreCase("trash")){ + } else if(p.getFolderName().equalsIgnoreCase("trash")){ return messageListActivityProvider.get().with(p.getUser(),p.getFolder(), p.getSearchValue()); } } else if (place instanceof DefaultPlace) { return loginActivityProvider.get(); + } else if(place instanceof MessageSendPlace){ + return messageSendActivityProvider.get().with((MessageSendPlace)place); + } else if(place instanceof IMAPMessagePlace){ + return messageActivityProvider.get().with((IMAPMessagePlace)place); } return null; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/WestActivityMapper.java Thu Sep 12 02:50:25 2013 @@ -1,7 +1,7 @@ package org.apache.hupa.client.mvp; import org.apache.hupa.client.activity.WestActivity; -import org.apache.hupa.client.place.MailInboxPlace; +import org.apache.hupa.client.place.MailFolderPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -18,8 +18,8 @@ public class WestActivityMapper implemen } public Activity getActivity(Place place) { - if (place instanceof MailInboxPlace) { - return westActivityProvider.get().with(((MailInboxPlace)place).getUser()); + if (place instanceof MailFolderPlace) { + return westActivityProvider.get().with(((MailFolderPlace)place)); } return null; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java Thu Sep 12 02:50:25 2013 @@ -1,24 +1,39 @@ package org.apache.hupa.client.place; <<<<<<< HEAD +<<<<<<< HEAD +======= +import org.apache.hupa.client.activity.IMAPMessageActivity; +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.data.User; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; ======= >>>>>>> +======= + +>>>>>>> 1. improve the inbox folder place. import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceTokenizer; import com.google.gwt.place.shared.Prefix; public class IMAPMessagePlace extends Place { <<<<<<< HEAD +<<<<<<< HEAD private Message message; private MessageDetails messageDetails; private IMAPFolderProxy folder; +======= + + private Message message; + private MessageDetails messageDetails; + private IMAPFolder folder; +>>>>>>> 1. improve the inbox folder place. private User user; public Message getMessage() { @@ -28,6 +43,7 @@ public class IMAPMessagePlace extends Pl public MessageDetails getMessageDetails() { return messageDetails; } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { return folder; @@ -42,6 +58,18 @@ public class IMAPMessagePlace extends Pl @Prefix("IMAPMessage") >>>>>>> +======= + + public IMAPFolder getFolder() { + return folder; + } + + public User getUser() { + return user; + } + +@Prefix("message") +>>>>>>> 1. improve the inbox folder place. public static class Tokenizer implements PlaceTokenizer<IMAPMessagePlace> { @Override @@ -52,10 +80,14 @@ public class IMAPMessagePlace extends Pl @Override public String getToken(IMAPMessagePlace place) { <<<<<<< HEAD +<<<<<<< HEAD return String.valueOf(place.getMessage().getUid()); ======= return "IMAPMessage"; >>>>>>> +======= + return String.valueOf(place.getMessage().getUid()); +>>>>>>> 1. improve the inbox folder place. } } @@ -64,7 +96,11 @@ public class IMAPMessagePlace extends Pl } <<<<<<< HEAD +<<<<<<< HEAD public IMAPMessagePlace with(User user, IMAPFolderProxy folder, Message message, MessageDetails messageDetails){ +======= + public IMAPMessagePlace with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails){ +>>>>>>> 1. improve the inbox folder place. this.message = message; this.messageDetails = messageDetails; this.folder = folder; @@ -72,6 +108,9 @@ public class IMAPMessagePlace extends Pl return this; } +<<<<<<< HEAD ======= >>>>>>> +======= +>>>>>>> 1. improve the inbox folder place. } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java Thu Sep 12 02:50:25 2013 @@ -1,7 +1,7 @@ package org.apache.hupa.client.place; +import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.User; -import org.apache.hupa.shared.proxy.IMAPFolderProxy; import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceTokenizer; @@ -66,16 +66,16 @@ public class MailFolderPlace extends Pla return place.getFolderName(); } } - private IMAPFolderProxy folder; + private IMAPFolder folder; private String searchValue; - public IMAPFolderProxy getFolder() { + public IMAPFolder getFolder() { return folder; } public String getSearchValue() { return searchValue; } - public MailFolderPlace with(User user, IMAPFolderProxy folder, String searchValue) { + public MailFolderPlace with(User user, IMAPFolder folder, String searchValue) { this.folder = folder; this.searchValue = searchValue; this.user = user; Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java~HEAD (from r1522147, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java&r1=1522147&r2=1522148&rev=1522148&view=diff ============================================================================== (empty) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java Thu Sep 12 02:50:25 2013 @@ -31,13 +31,17 @@ import org.apache.hupa.shared.domain.Use package org.apache.hupa.client.place; <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> ======= +======= +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.shared.data.IMAPFolder; import org.apache.hupa.shared.data.Message; import org.apache.hupa.shared.data.MessageDetails; import org.apache.hupa.shared.data.User; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; >>>>>>> 1. improve the inbox folder place. @@ -45,6 +49,9 @@ import org.apache.hupa.shared.proxy.IMAP package org.apache.hupa.client.place; >>>>>>> +======= + +>>>>>>> 1. improve the inbox folder place. import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceTokenizer; import com.google.gwt.place.shared.Prefix; @@ -177,23 +184,67 @@ public class MessageSendPlace extends Pl ======= public class MessageSendPlace extends Place { - @Prefix("MessageSend") - public static class Tokenizer implements PlaceTokenizer<MessageSendPlace> { + + private User user ; + private IMAPFolder folder; + private Message message; + private MessageDetails messageDetails; + private Type forward; + + + @Prefix("send") + public static class Tokenizer implements PlaceTokenizer<MessageSendPlace> { + + @Override + public MessageSendPlace getPlace(String token) { + return new MessageSendPlace(); + } + + @Override + public String getToken(MessageSendPlace place) { + return place.getForward().toString(); + } + } + + public String toString() { + return this.getClass().getName() + "->[MessageSend]"; + } + + public Place with(User user, IMAPFolder folder, Message message, MessageDetails messageDetails, Type forward) { + this.forward = forward; + this.user = user; + this.folder = folder; + this.message = message; + this.messageDetails = messageDetails; + return this; + } + + public User getUser() { + return user; + } + + public IMAPFolder getFolder() { + return folder; + } + + public Message getMessage() { + return message; + } + + public MessageDetails getMessageDetails() { + return messageDetails; + } - @Override - public MessageSendPlace getPlace(String token) { - return new MessageSendPlace(); - } - - @Override - public String getToken(MessageSendPlace place) { - return "MessageSend"; - } - } - - public String toString(){ - return this.getClass().getName()+"->[MessageSend]"; - } + public Type getForward() { + return forward; + } + + +<<<<<<< HEAD >>>>>>> +======= + + +>>>>>>> 1. improve the inbox folder place. } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java?rev=1522148&r1=1522147&r2=1522148&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java Thu Sep 12 02:50:25 2013 @@ -20,12 +20,15 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD +<<<<<<< HEAD import eu.maydu.gwt.validation.client.DefaultValidationProcessor; import eu.maydu.gwt.validation.client.ValidationProcessor; import eu.maydu.gwt.validation.client.i18n.ValidationMessages; import gwtupload.client.BaseUploadStatus; import gwtupload.client.IFileInput.FileInputType; ======= +======= +>>>>>>> 1. improve the inbox folder place. import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.Composite; @@ -43,6 +46,9 @@ import eu.maydu.gwt.validation.client.Va import eu.maydu.gwt.validation.client.i18n.ValidationMessages; import gwtupload.client.IFileInput.FileInputType; import gwtupload.client.BaseUploadStatus; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. import gwtupload.client.IUploadStatus; import gwtupload.client.IUploader; @@ -52,9 +58,12 @@ import org.apache.hupa.client.HupaCSS; import org.apache.hupa.client.HupaConstants; import org.apache.hupa.client.HupaMessages; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.activity.MessageSendActivity; ======= >>>>>>> 1. improve the inbox folder place. +======= +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.validation.AddStyleAction; import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.client.validation.NotEmptyValidator; @@ -66,6 +75,7 @@ import org.apache.hupa.shared.SConsts; import org.apache.hupa.shared.rpc.ContactsResult.Contact; import org.apache.hupa.widgets.editor.Editor; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.widgets.ui.HasEnable; import org.apache.hupa.widgets.ui.Loading; import org.apache.hupa.widgets.ui.MultiValueSuggestArea; @@ -83,11 +93,16 @@ import com.google.gwt.user.client.ui.Ver import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; ======= +======= +>>>>>>> 1. improve the inbox folder place. import org.apache.hupa.widgets.ui.EnableHyperlink; import org.apache.hupa.widgets.ui.HasEnable; import org.apache.hupa.widgets.ui.Loading; import org.apache.hupa.widgets.ui.MultiValueSuggestArea; import org.apache.hupa.client.activity.MessageSendActivity; +<<<<<<< HEAD +>>>>>>> 1. improve the inbox folder place. +======= >>>>>>> 1. improve the inbox folder place. /** @@ -116,10 +131,14 @@ public class MessageSendView extends Com private EnableButton sendButton; <<<<<<< HEAD +<<<<<<< HEAD private Anchor backButton; ======= private EnableHyperlink backButton; >>>>>>> 1. improve the inbox folder place. +======= + private EnableHyperlink backButton; +>>>>>>> 1. improve the inbox folder place. private Loading loading; private ValidationProcessor validator; @@ -129,10 +148,14 @@ public class MessageSendView extends Com sendButton = new EnableButton(constants.sendButton()); <<<<<<< HEAD +<<<<<<< HEAD backButton = new Anchor(constants.backButton()); ======= backButton = new EnableHyperlink(constants.backButton(),""); >>>>>>> 1. improve the inbox folder place. +======= + backButton = new EnableHyperlink(constants.backButton(),""); +>>>>>>> 1. improve the inbox folder place. headers = new MessageHeaders(constants); loading = new Loading(constants.loading()); editor = new Editor(constants); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org