Author: dongxu Date: Thu Sep 12 03:25:45 2013 New Revision: 1522201 URL: http://svn.apache.org/r1522201 Log: fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior.
Modified: 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/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/ui/IMAPMessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageSendView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java 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=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 03:25:45 2013 @@ -209,7 +209,6 @@ public class LoginActivity extends Abstr @Inject private Displayable display; @Inject private EventBus eventBus; @Inject private PlaceController placeController; - // @Inject private DispatchAsync dispatcher; @Inject private HupaConstants constants; <<<<<<< HEAD >>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & >>>>>>> Simply injection code @@ -223,6 +222,7 @@ public class LoginActivity extends Abstr container.setWidget(display.asWidget()); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD display.setLoading(false); } @@ -241,6 +241,9 @@ public class LoginActivity extends Abstr ======= ======= >>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter +======= + display.setLoading(false); +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. } 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=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java Thu Sep 12 03:25:45 2013 @@ -270,7 +270,6 @@ import org.apache.hupa.client.place.Mail import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.CreateFolderRequest; import org.apache.hupa.client.rf.DeleteFolderRequest; -import org.apache.hupa.client.rf.FetchMessagesRequest; import org.apache.hupa.client.rf.GetMessageDetailsRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.rf.ImapFolderRequest; @@ -398,6 +397,7 @@ import com.google.gwt.place.shared.Place import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.Tree; import com.google.gwt.user.client.ui.TreeItem; import com.google.inject.Inject; import com.google.inject.Provider; @@ -1351,7 +1351,6 @@ System.out.println("1111111"+response); // FIXME goto? 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)); } 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=1522201&r1=1522200&r2=1522201&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:25:45 2013 @@ -390,7 +390,7 @@ public class AppGinModule extends Abstra <<<<<<< HEAD <<<<<<< HEAD bind(TopActivity.Displayable.class).to(TopView.class); - bind(WestActivity.Displayable.class).to(WestView.class); + bind(WestActivity.Displayable.class).to(WestView.class).in(Singleton.class); bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class); bind(MessageSendActivity.Displayable.class).to(MessageSendView.class); bind(IMAPMessageActivity.Displayable.class).to(IMAPMessageView.class); 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=1522201&r1=1522200&r2=1522201&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:25:45 2013 @@ -1837,7 +1837,7 @@ public class IMAPMessageListView extends markButtonBar.add(markSeenButton); markButtonBar.add(markUnSeenButton); buttonBar.add(markButtonBar); - buttonBar.add(refreshLink); +// buttonBar.add(refreshLink); TODO HorizontalPanel searchPanel = new HorizontalPanel(); searchPanel.addStyleName(HupaCSS.C_buttons); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java?rev=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java Thu Sep 12 03:25:45 2013 @@ -23,6 +23,7 @@ import java.util.List; import org.apache.hupa.client.HupaCSS; import org.apache.hupa.client.HupaConstants; +import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.bundles.HupaImageBundle; import org.apache.hupa.client.widgets.CommandsBar; import org.apache.hupa.client.widgets.MessageHeaders; @@ -40,11 +41,11 @@ import com.google.gwt.event.dom.client.H import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; @@ -52,7 +53,6 @@ import com.google.gwt.user.client.ui.Scr import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -import org.apache.hupa.client.activity.IMAPMessageActivity; public class IMAPMessageView extends Composite implements IMAPMessageActivity.Displayable{ @@ -76,8 +76,8 @@ public class IMAPMessageView extends Com private Button replyMsgButton = new Button(); private Button replyAllMsgButton = new Button(); private Button forwardMsgButton = new Button(); - private Hyperlink showRawButton; - private Hyperlink backButton; + private Anchor showRawButton; + private Anchor backButton; private FlowPanel attachments = new FlowPanel(); private Loading loading; @@ -87,8 +87,8 @@ public class IMAPMessageView extends Com this.imageBundle = imageBundle; loading = new Loading(constants.loading()); - showRawButton = new Hyperlink(constants.rawButton(),""); - backButton = new Hyperlink(constants.backButton(),""); + showRawButton = new Anchor(constants.rawButton()); + backButton = new Anchor(constants.backButton()); headers = new MessageHeaders(constants); deleteMsgButton.setText(constants.deleteMailButton()); replyMsgButton.setText(constants.replyMailButton()); @@ -102,7 +102,7 @@ public class IMAPMessageView extends Com buttonsBar.add(deleteMsgButton); buttonsBar.add(forwardMsgButton); buttonsBar.add(loading); - buttonsBar.add(showRawButton); +// buttonsBar.add(showRawButton); TODO buttonsBar.add(backButton); ScrollPanel scrollPanel = new ScrollPanel(); 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=1522201&r1=1522200&r2=1522201&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 03:25:45 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import eu.maydu.gwt.validation.client.DefaultValidationProcessor; import eu.maydu.gwt.validation.client.ValidationProcessor; import eu.maydu.gwt.validation.client.i18n.ValidationMessages; @@ -41,15 +42,20 @@ import com.google.gwt.user.client.ui.Ver import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; +======= +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. 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.IFileInput.FileInputType; import gwtupload.client.BaseUploadStatus; <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 1. improve the inbox folder place. ======= >>>>>>> 1. improve the inbox folder place. +======= +import gwtupload.client.IFileInput.FileInputType; +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. import gwtupload.client.IUploadStatus; import gwtupload.client.IUploader; import gwtupload.client.MultiUploader; @@ -59,11 +65,15 @@ import org.apache.hupa.client.HupaConsta import org.apache.hupa.client.HupaMessages; <<<<<<< HEAD <<<<<<< 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.activity.MessageSendActivity; +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. import org.apache.hupa.client.validation.AddStyleAction; import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.client.validation.NotEmptyValidator; @@ -76,6 +86,7 @@ import org.apache.hupa.shared.rpc.Contac import org.apache.hupa.widgets.editor.Editor; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.widgets.ui.HasEnable; import org.apache.hupa.widgets.ui.Loading; import org.apache.hupa.widgets.ui.MultiValueSuggestArea; @@ -104,6 +115,24 @@ import org.apache.hupa.client.activity.M >>>>>>> 1. improve the inbox folder place. ======= >>>>>>> 1. improve the inbox folder place. +======= +import org.apache.hupa.widgets.ui.HasEnable; +import org.apache.hupa.widgets.ui.Loading; +import org.apache.hupa.widgets.ui.MultiValueSuggestArea; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.user.client.ui.Anchor; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Focusable; +import com.google.gwt.user.client.ui.HasHTML; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. /** * View which displays a form which handle sending of mails @@ -132,6 +161,7 @@ public class MessageSendView extends Com private EnableButton sendButton; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD private Anchor backButton; ======= private EnableHyperlink backButton; @@ -139,6 +169,9 @@ public class MessageSendView extends Com ======= private EnableHyperlink backButton; >>>>>>> 1. improve the inbox folder place. +======= + private Anchor backButton; +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. private Loading loading; private ValidationProcessor validator; @@ -149,6 +182,7 @@ public class MessageSendView extends Com sendButton = new EnableButton(constants.sendButton()); <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD backButton = new Anchor(constants.backButton()); ======= backButton = new EnableHyperlink(constants.backButton(),""); @@ -156,6 +190,9 @@ public class MessageSendView extends Com ======= backButton = new EnableHyperlink(constants.backButton(),""); >>>>>>> 1. improve the inbox folder place. +======= + backButton = new Anchor(constants.backButton()); +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. headers = new MessageHeaders(constants); loading = new Loading(constants.loading()); editor = new Editor(constants); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java?rev=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopView.java Thu Sep 12 03:25:45 2013 @@ -152,11 +152,11 @@ import com.google.gwt.event.dom.client.H import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiConstructor; import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Hyperlink; import com.google.gwt.user.client.ui.Label; import com.google.inject.Inject; @@ -218,9 +218,9 @@ public class TopView extends Composite i private HorizontalPanel loginInfoPanel = new HorizontalPanel(); private Label loginLabel = new Label(); private Label loginUserLabel = new Label(); - private Hyperlink mainButton = new Hyperlink(); - private Hyperlink contactsButton = new Hyperlink(); - private Hyperlink logoutButton = new Hyperlink(); + private Anchor mainButton; + private Anchor contactsButton; + private Anchor logoutButton; private Label appnameLabel = new Label(); private RndPanel flashContainer = new RndPanel(); @@ -230,31 +230,34 @@ public class TopView extends Composite i @Inject @UiConstructor public TopView(HupaConstants constants) { + mainButton = new Anchor(constants.mailTab()); + contactsButton = new Anchor(constants.contactsTab()); + logoutButton = new Anchor(constants.logoutButton()); // panel.addStyleName(HupaCSS.C_top_container + "-wrap"); buttonContainer.addStyleName(HupaCSS.C_button_container); infoContainer.addStyleName(HupaCSS.C_info_container); - loginInfoPanel.addStyleName(HupaCSS.C_login_info_container); +// loginInfoPanel.addStyleName(HupaCSS.C_login_info_container); loginLabel.addStyleName(HupaCSS.C_login_info_label); - loginUserLabel.addStyleName(HupaCSS.C_login_info_user); - logoutButton.addStyleName(HupaCSS.C_menu_button); - contactsButton.addStyleName(HupaCSS.C_menu_button); - mainButton.addStyleName(HupaCSS.C_menu_button); +// loginUserLabel.addStyleName(HupaCSS.C_login_info_user); +// logoutButton.addStyleName(HupaCSS.C_menu_button); +// contactsButton.addStyleName(HupaCSS.C_menu_button); +// mainButton.addStyleName(HupaCSS.C_menu_button); appnameLabel.addStyleName(HupaCSS.C_header); flashContainer.addStyleName(HupaCSS.C_flash); // internationalize elements - logoutButton.setText(constants.logoutButton()); +// logoutButton.setText(constants.logoutButton()); +// contactsButton.setText(constants.contactsTab()); +// mainButton.setText(constants.mailTab()); loginLabel.setText(constants.loginAs() + ": "); appnameLabel.setText(constants.productName()); - contactsButton.setText(constants.contactsTab()); - mainButton.setText(constants.mailTab()); // Layout containers and panels buttonContainer.add(loginInfoPanel); // loginInfoPanel.add(loginLabel); // loginInfoPanel.add(loginUserLabel); buttonContainer.add(loginUserLabel); - buttonContainer.add(contactsButton); +// buttonContainer.add(contactsButton); buttonContainer.add(mainButton); buttonContainer.add(logoutButton); buttonContainer.setCellWidth(loginInfoPanel, "100%"); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java Thu Sep 12 03:25:45 2013 @@ -238,12 +238,16 @@ public class WestView extends Composite <<<<<<< HEAD <<<<<<< HEAD west = new VerticalPanel(); +<<<<<<< HEAD ======= west = new RndPanel(); >>>>>>> Change to new mvp framework - first step ======= west = new VerticalPanel(); >>>>>>> decorate the theme +======= +// folderTree.clear(); +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. west.add(folderTree); west.addStyleName(HupaCSS.C_tree_container); @@ -354,7 +358,7 @@ public class WestView extends Composite public void setLoadingFolders(boolean load) { if (load) { loader.show(); -// panel.clear(); + westPanel.clear(); westPanel.add(loader); } else { westPanel.clear(); Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java?rev=1522201&r1=1522200&r2=1522201&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/ImapFolderServiceImpl.java Thu Sep 12 03:25:45 2013 @@ -127,8 +127,6 @@ import com.sun.mail.imap.IMAPStore; public class ImapFolderServiceImpl extends AbstractService implements ImapFolderService { - // List of mail 'root' imap folders - List<ImapFolder> imapFolders = new ArrayList<ImapFolder>(); public List<ImapFolder> requestFolders() throws Exception { User user = getUser(); @@ -136,6 +134,8 @@ public class ImapFolderServiceImpl exten IMAPStore store = cache.get(user); com.sun.mail.imap.IMAPFolder folder = (com.sun.mail.imap.IMAPFolder) store.getDefaultFolder(); + // List of mail 'root' imap folders TODO can not make this as a field of the class, or the client will get more and more appended folders. + List<ImapFolder> imapFolders = new ArrayList<ImapFolder>(); // Create IMAPFolder tree list for (Folder f : folder.list()) { ImapFolder imapFolder = createIMAPFolder(f); @@ -244,6 +244,7 @@ public class ImapFolderServiceImpl exten return iFolder; } +<<<<<<< HEAD public String toString() { StringBuffer ret = new StringBuffer(""); @@ -263,4 +264,6 @@ public class ImapFolderServiceImpl exten } } >>>>>>> Make chechsession and login work with RF, with refactoring fetch >>>>>>> folders. +======= +>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior. } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org