svn commit: r1522220 - /james/hupa/trunk/README.txt
Author: dongxu Date: Thu Sep 12 03:34:20 2013 New Revision: 150 URL: http://svn.apache.org/r150 Log: want to make it, never give it up Modified: james/hupa/trunk/README.txt Modified: james/hupa/trunk/README.txt URL: http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=150r1=1522219r2=150view=diff == --- james/hupa/trunk/README.txt (original) +++ james/hupa/trunk/README.txt Thu Sep 12 03:34:20 2013 @@ -3,7 +3,7 @@ Hupa use maven2 as build tool. To build After that change to hupa directory and execute the following cmd: $ mvn clean package -## Configuring server side +## Configuring server side Hupa uses a properties file to know the IMAP and SMTP servers configuration. There is an example configuration file in 'server/src/main/webapp/WEB-INF/conf/config.properties' - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522222 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ioc/AppGinModule.java place/MessageSendPlace.java validation/EmailListValidator.java
Author: dongxu Date: Thu Sep 12 03:36:16 2013 New Revision: 152 URL: http://svn.apache.org/r152 Log: commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop. Modified: 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/place/MessageSendPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java 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=152r1=151r2=152view=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:36:16 2013 @@ -165,7 +165,6 @@ import org.apache.hupa.client.rf.HupaReq import org.apache.hupa.client.ui.AppLayout; import org.apache.hupa.client.ui.AppLayoutImpl; import org.apache.hupa.client.ui.FoldersTreeViewModel; -import org.apache.hupa.client.ui.FoldersCellTree; import org.apache.hupa.client.ui.IMAPMessageListView; HEAD HEAD 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=152r1=151r2=152view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java Thu Sep 12 03:36:16 2013 @@ -26,6 +26,7 @@ package org.apache.hupa.client.place; import org.apache.hupa.client.activity.MessageSendActivity.Type; + HEAD import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageDetails; @@ -72,6 +73,8 @@ import org.apache.hupa.shared.domain.Ima === === try to get message details, problem is: +=== + commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop. import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageDetails; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java?rev=152r1=151r2=152view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/validation/EmailListValidator.java Thu Sep 12 03:36:16 2013 @@ -19,7 +19,6 @@ package org.apache.hupa.client.validation; -import com.google.gwt.regexp.shared.RegExp; import com.google.gwt.user.client.ui.HasText; import eu.maydu.gwt.validation.client.ValidationAction; - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522223 - /james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Author: dongxu Date: Thu Sep 12 03:36:35 2013 New Revision: 153 URL: http://svn.apache.org/r153 Log: commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop. Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java?rev=153r1=152r2=153view=diff == --- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java (original) +++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java Thu Sep 12 03:36:35 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.mock; HEAD HEAD + HEAD import gwtupload.client.IFileInput; import gwtupload.client.IUploadStatus; import gwtupload.client.IUploadStatus.Status; @@ -39,18 +40,26 @@ import com.google.gwt.core.client.JavaSc import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.Widget; +=== + commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop. import gwtupload.client.IFileInput; import gwtupload.client.IUploadStatus; -import gwtupload.client.IUploader; import gwtupload.client.IUploadStatus.Status; -import gwtupload.client.IUploader.UploadedInfo; +import gwtupload.client.IUploader; import java.util.Iterator; HEAD + HEAD first commit === first commit +=== +import com.google.gwt.core.client.JavaScriptObject; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Widget; + + commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop. public class MockUploader implements IUploader { public HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler) { - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522224 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/dnd/ mock/src/main/java/org/apache/hupa/server/mock/ serv
Author: dongxu Date: Thu Sep 12 03:37:27 2013 New Revision: 154 URL: http://svn.apache.org/r154 Log: remove warnings Modified: 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/dnd/PagingScrollTableRowDragController.java james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/integration/StoreBugTest.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SettingsImpl.java 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=154r1=153r2=154view=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:37:27 2013 @@ -921,13 +921,13 @@ System.out.println(111+response); === scrub code public void onExpandMessage(ExpandMessageEvent event) { - final boolean decreaseUnseen; +// final boolean decreaseUnseen; final Message message = event.getMessage(); // check if the message was already seen in the past if (event.getMessage().getFlags().contains(IMAPFlag.SEEN) == false) { - decreaseUnseen = true; +// decreaseUnseen = true;//TODO 1209 } else { - decreaseUnseen = false; +// decreaseUnseen = false; } GetMessageDetailsRequest req = requestFactory.messageDetailsRequest(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java?rev=154r1=153r2=154view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/dnd/PagingScrollTableRowDragController.java Thu Sep 12 03:37:27 2013 @@ -43,7 +43,7 @@ public class PagingScrollTableRowDragCon private HupaMessages messages = GWT.create(HupaMessages.class); private HupaImageBundle bundle =GWT.create(HupaImageBundle.class); private FixedWidthGrid draggableTable; -@SuppressWarnings(unchecked) +@SuppressWarnings(rawtypes) private PagingScrollTable parentTable; private int dragRow; private RowDragProxy proxyWidget; @@ -89,7 +89,7 @@ public class PagingScrollTableRowDragCon } -@SuppressWarnings(unchecked) +@SuppressWarnings(rawtypes) protected Widget newDragProxy(DragContext context) { draggableTable = (FixedWidthGrid) context.draggable.getParent(); Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java?rev=154r1=153r2=154view=diff == --- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java (original) +++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java Thu Sep 12 03:37:27 2013 @@ -90,6 +90,7 @@ public class MockHttpSession implements HEAD HEAD + HEAD @SuppressWarnings(rawtypes) public Enumeration getAttributeNames() { === @@ -100,6 +101,10 @@ public class MockHttpSession implements @SuppressWarnings(unchecked) public Enumeration getAttributeNames() { first commit +=== +@SuppressWarnings(rawtypes) + public Enumeration getAttributeNames() { + remove warnings return new Enumeration() { Iterator it = attributeMap.keySet().iterator(); public boolean hasMoreElements() { Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/guice/GuiceServerTestModule.java?rev
svn commit: r1522225 - /james/hupa/trunk/README.txt
Author: dongxu Date: Thu Sep 12 03:37:38 2013 New Revision: 155 URL: http://svn.apache.org/r155 Log: new spirit should come with 2013, this is the first commit Modified: james/hupa/trunk/README.txt Modified: james/hupa/trunk/README.txt URL: http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=155r1=154r2=155view=diff == --- james/hupa/trunk/README.txt (original) +++ james/hupa/trunk/README.txt Thu Sep 12 03:37:38 2013 @@ -13,7 +13,7 @@ There is an example configuration file i - Or in any other file if you start your application server with the parameter: -Dhupa.config.file=full_path_to_your_properties_file -# Running Hupa ## +# Running Hupa # Hupa comes packaged with a servlet-container, so once you have compiled the app just run: $ java -jar target/hupa-${version}.war - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522228 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LoginView.java LoginView.ui.xml TopView.java TopView.ui.xml
Author: dongxu Date: Thu Sep 12 03:38:32 2013 New Revision: 158 URL: http://svn.apache.org/r158 Log: replace with uibinder Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml 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/TopView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=158r1=157r2=158view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java Thu Sep 12 03:38:32 2013 @@ -44,9 +44,9 @@ import org.apache.hupa.client.HupaCSS; import org.apache.hupa.client.HupaConstants; import org.apache.hupa.client.activity.LoginActivity; import org.apache.hupa.widgets.ui.Loading; -import org.apache.hupa.widgets.ui.RndPanel; HEAD + HEAD Change to new mvp framework - first step === package org.apache.hupa.client.ui; @@ -54,12 +54,16 @@ package org.apache.hupa.client.ui; change the LOGIN progress using native MVP instead of gwt-presenter === Change to new mvp framework - first step +=== +import com.google.gwt.core.client.GWT; + replace with uibinder import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyUpEvent; import com.google.gwt.event.dom.client.KeyUpHandler; HEAD HEAD + HEAD import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.CssResource.NotStrict; @@ -69,6 +73,10 @@ import com.google.gwt.uibinder.client.Ui change the LOGIN progress using native MVP instead of gwt-presenter === change the LOGIN progress using native MVP instead of gwt-presenter +=== +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; + replace with uibinder import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; @@ -212,11 +220,18 @@ public class LoginView extends Composite import com.google.inject.Inject; public class LoginView extends Composite implements KeyUpHandler, LoginActivity.Displayable { + HEAD Change to new mvp framework - first step +=== + @UiField VerticalPanel mainContainer; + replace with uibinder private Button loginButton = new Button(); private SubmitButton submitButton; private Button resetButton; private Loading loading; +// FlowPanel rPanel = new FlowPanel(); + @UiField FlexTable flexTable; + Panel buttonBar = new FlowPanel(); // We wrap login/password boxes with a form which must be in the html // document, // in this way, the browser knows that we are sending a login form and @@ -224,15 +239,12 @@ public class LoginView extends Composite private TextBox usernameTextBox = TextBox.wrap(DOM.getElementById(email)); private PasswordTextBox passwordTextBox = PasswordTextBox.wrap(DOM.getElementById(password)); // wrap the form after inputs so as they are in the dom when are wrapped - final private FormPanel formPanel = FormPanel.wrap(DOM.getElementById(loginForm), true); + @UiField FormPanel formPanel; @Inject public LoginView(HupaConstants constants) { - - VerticalPanel mainContainer = new VerticalPanel(); - RndPanel rPanel = new RndPanel(); - FlexTable flexTable = new FlexTable(); - Panel buttonBar = new FlowPanel(); + initWidget(binder.createAndBindUi(this)); + formPanel = FormPanel.wrap(DOM.getElementById(loginForm), true); submitButton = new SubmitButton(constants.loginButton()); resetButton = new Button(constants.resetButton()); submitButton.getElement().setClassName(HupaCSS.C_button); @@ -241,7 +253,7 @@ public class LoginView extends Composite loading = new Loading(constants.loading()); mainContainer.setStyleName(HupaCSS.C_login_container); - flexTable.addStyleName(HupaCSS.C_login_form); +// flexTable.addStyleName(HupaCSS.C_login_form); usernameTextBox.addStyleName(HupaCSS.C_login_box); passwordTextBox.addStyleName(HupaCSS.C_login_box); @@ -255,7 +267,7 @@ public class LoginView extends Composite flexTable.getFlexCellFormatter().setColSpan(2, 0, 2
svn commit: r1522227 - /james/hupa/trunk/pom.xml
Author: dongxu Date: Thu Sep 12 03:38:10 2013 New Revision: 157 URL: http://svn.apache.org/r157 Log: update to the latest 2.5.0 version of gwt Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=157r1=156r2=157view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Sep 12 03:38:10 2013 @@ -115,8 +115,13 @@ properties HEAD HEAD + HEAD gwtVersion2.5.1/gwtVersion gwtMavenVersion2.5.1/gwtMavenVersion +=== +gwtVersion2.5.0/gwtVersion +gwtMavenVersion2.5.0/gwtMavenVersion + update to the latest 2.5.0 version of gwt gwt.moduleSuffix / gwt.logLevelERROR/gwt.logLevel jettyVersion7.3.0.v20110203/jettyVersion - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522226 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/WestActivity.java server/src/main/webapp/WEB-INF/conf/config.properties
Author: dongxu Date: Thu Sep 12 03:38:00 2013 New Revision: 156 URL: http://svn.apache.org/r156 Log: fix the bug that there will throw a NullPointerException after the first time into the message view page and then click the back link given not click the folders names Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties 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=156r1=155r2=156view=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:38:00 2013 @@ -274,6 +274,7 @@ import org.apache.hupa.client.place.Mess import org.apache.hupa.client.rf.GetMessageDetailsRequest; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.widgets.IMAPTreeItem; +import org.apache.hupa.shared.data.ImapFolderImpl; import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; import org.apache.hupa.shared.domain.GetMessageDetailsAction; import org.apache.hupa.shared.domain.GetMessageDetailsResult; @@ -599,6 +600,7 @@ public class WestActivity extends AppBas public WestActivity with(MailFolderPlace place) { this.currentPlace = place; this.user = place.getUser(); + this.folder = new ImapFolderImpl(user.getSettings().getInboxFolderName()); return this; } Modified: james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties?rev=156r1=155r2=156view=diff == --- james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties (original) +++ james/hupa/trunk/server/src/main/webapp/WEB-INF/conf/config.properties Thu Sep 12 03:38:00 2013 @@ -17,15 +17,21 @@ HEAD HEAD + HEAD +=== + fix the bug that there will throw a NullPointerException after the first time into the message view page and then click the back link given not click the folders names # The demo mode should make two lines different # 1. IMAPServerAddress=hupa.demo # 2. DefaultInboxFolder=Mock-Inbox # and then use the credential: demo/demo to login to the webmail through the browser + HEAD === first commit === first commit +=== + fix the bug that there will throw a NullPointerException after the first time into the message view page and then click the back link given not click the folders names # The IP or domainname of the IMAP server IMAPServerAddress=imap.gmail.com # The port of the IMAP server - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522230 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
Author: dongxu Date: Thu Sep 12 03:39:28 2013 New Revision: 1522230 URL: http://svn.apache.org/r1522230 Log: add background of login box Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1522230r1=159r2=1522230view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Sep 12 03:39:28 2013 @@ -95,8 +95,6 @@ !-- inherits name='com.google.gwt.user.theme.dark.Dark'/ -- !-- inherits name='com.google.gwt.user.theme.clean.Clean'/-- - !-- reduce browser inconsistencies -- - stylesheet src=../reset.css/ !-- CSS loaded asynchronously -- stylesheet src=../styles.css/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522232 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/ java/org/apache/hupa/client/ java/org/apache/hupa/client/evo/ java/org/apache/hupa/client/ioc/ java/org/apache/hupa/c
Author: dongxu Date: Thu Sep 12 03:40:03 2013 New Revision: 1522232 URL: http://svn.apache.org/r1522232 Log: move new theme ui from experiment to hupa evo Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutView.java - copied, changed from r1522230, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/buttons.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/hupa_logo_49_transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/linen_header.jpg james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/roundcube_logo.png Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.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/ioc/AppGinjector.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/webapp/styles.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=1522232r1=1522231r2=1522232view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Thu Sep 12 03:40:03 2013 @@ -114,6 +114,7 @@ HEAD HEAD HEAD + HEAD entry-point class='org.apache.hupa.client.evo.HupaEvo'/ === entry-point class='org.apache.hupa.client.Hupa'/ @@ -124,4 +125,7 @@ === entry-point class='org.apache.hupa.client.evo.HupaEvo'/ Make the evo more clear. +=== + entry-point class='org.apache.hupa.client.Hupa'/ + move new theme ui from experiment to hupa evo /module Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1522232r1=1522231r2=1522232view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Thu Sep 12 03:40:03 2013 @@ -25,6 +25,9 @@ package org.apache.hupa.client; HEAD HEAD HEAD + HEAD +=== + move new theme ui from experiment to hupa evo import org.apache.hupa.client.ioc.AppGinjector; import com.google.gwt.core.client.EntryPoint; @@ -42,7 +45,12 @@ public class Hupa implements EntryPoint private void initApp() { replaceLoading(); + HEAD injector.getHupaController().start(); +=== + HupaController hupaController = injector.getHupaController(); + hupaController.start(); + move new theme ui from experiment to hupa evo } private void handleExceptionsAsync() { @@ -59,6 +67,7 @@ public class Hupa implements EntryPoint } private final AppGinjector injector = GWT.create(AppGinjector.class); + HEAD === === Change to new mvp framework - first step @@ -176,5 +185,7 @@ public class Hupa implements EntryPoint{ === } Change to new mvp framework - first step +=== + move new theme ui from experiment to hupa evo } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522232r1=1522231r2=1522232view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:40:03 2013 @@ -19,6 +19,7 @@ package org.apache.hupa.client; + HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -43,12 +44,24 @@ import org.apache.hupa.shared.events.Log import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +=== +import
svn commit: r1522233 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java ioc/AppGinModule.java ui/HupaLayoutable.java ui/HupaOverallLayout.java ui/HupaOverallLayout
Author: dongxu Date: Thu Sep 12 03:40:31 2013 New Revision: 1522233 URL: http://svn.apache.org/r1522233 Log: refactoring Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaOverallLayout.java - copied, changed from r1522232, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaOverallLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.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/HupaLayoutable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522233r1=1522232r2=1522233view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:40:31 2013 @@ -52,7 +52,7 @@ import org.apache.hupa.client.place.Mail import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.AppLayout; -import org.apache.hupa.client.ui.HupaLayout; +import org.apache.hupa.client.ui.HupaLayoutable; move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; @@ -97,7 +97,7 @@ import com.google.web.bindery.requestfac public class HupaController { @Inject private PlaceHistoryHandler placeHistoryHandler; - @Inject private HupaLayout hupaLayout; + @Inject private HupaLayoutable hupaLayout; @Inject private PlaceController placeController; @Inject private HupaRequestFactory requestFactory; private Place currentPlace; 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=1522233r1=1522232r2=1522233view=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:40:31 2013 @@ -169,8 +169,8 @@ import org.apache.hupa.client.rf.HupaReq import org.apache.hupa.client.ui.AppLayout; import org.apache.hupa.client.ui.AppLayoutImpl; import org.apache.hupa.client.ui.FoldersTreeViewModel; -import org.apache.hupa.client.ui.HupaLayout; -import org.apache.hupa.client.ui.HupaLayoutView; +import org.apache.hupa.client.ui.HupaLayoutable; +import org.apache.hupa.client.ui.HupaOverallLayout; import org.apache.hupa.client.ui.IMAPMessageListView; HEAD HEAD @@ -237,6 +237,7 @@ public class AppGinModule extends Abstra HEAD HEAD HEAD + HEAD bind(HupaLayoutable.class).to(HupaLayout.class).in(Singleton.class); bind(LoginLayoutable.class).to(LoginLayout.class).in(Singleton.class); @@ -399,6 +400,9 @@ public class AppGinModule extends Abstra === bind(HupaLayout.class).to(HupaLayoutView.class).in(Singleton.class); move new theme ui from experiment to hupa evo +=== + bind(HupaLayoutable.class).to(HupaOverallLayout.class).in(Singleton.class); + refactoring // Activities bind(LoginActivity.Displayable.class).to(LoginView.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522233r1=1522232r2=1522233view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java Thu Sep 12 03:40:31 2013 @@ -19,6 +19,7 @@ package org.apache.hupa.client.ui; + HEAD import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -64,4 +65,10 @@ public interface HupaLayoutable extends AcceptsOneWidget getSettingNavView(); void arrangeSettingLayout(SettingPlace sp); +=== +import com.google.gwt.user.client.ui.LayoutPanel; + +public interface HupaLayoutable { + LayoutPanel get(); + refactoring } Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaOverallLayout.java (from r1522232, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui
svn commit: r1522234 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ ioc/ mapper/ ui/ ui/res/
Author: dongxu Date: Thu Sep 12 03:41:09 2013 New Revision: 1522234 URL: http://svn.apache.org/r1522234 Log: make login page as one part of the overall layout splite layout to little one Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java - copied, changed from r1522233, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.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/mapper/LoginActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml Copied: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java (from r1522233, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java) URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.javap1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.javar1=1522233r2=1522234rev=1522234view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LogoView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java Thu Sep 12 03:41:09 2013 @@ -17,24 +17,24 @@ * under the License. * / -package org.apache.hupa.client.ui; +package org.apache.hupa.client; -import org.apache.hupa.client.activity.LogoActivity; +import org.apache.hupa.client.ui.HupaLayoutable; -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.SimplePanel; - -public class LogoView extends Composite implements LogoActivity.Displayable { - - public LogoView() { - initWidget(binder.createAndBindUi(this)); +import com.google.gwt.activity.shared.ActivityManager; +import com.google.inject.Inject; +import com.google.inject.name.Named; + +/** + * This class is responsible for ActivityManager instantiations through GIN, it + * also associate every ActivityManager with the corresponding display region + */ +public class HupaActivityManagerInitializer { + + @Inject + public HupaActivityManagerInitializer(HupaLayoutable layout, + @Named(LoginPage) ActivityManager loginActivityManager) { + loginActivityManager.setDisplay(layout.getLoginView()); } - interface LogoUiBinder extends UiBinderSimplePanel, LogoView { - } - - private
svn commit: r1522235 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/ java/org/apache/hupa/client/bundles/ java/org/apache/hupa/client/ioc/ java/org/apache/hupa/client/ui/ java/org
Author: dongxu Date: Thu Sep 12 03:41:40 2013 New Revision: 1522235 URL: http://svn.apache.org/r1522235 Log: integrate them as a whole one - first: make the default place work Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css 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/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml james/hupa/trunk/client/src/main/webapp/WEB-INF/web.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java?rev=1522235r1=1522234r2=1522235view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/Hupa.java Thu Sep 12 03:41:40 2013 @@ -46,11 +46,15 @@ public class Hupa implements EntryPoint private void initApp() { replaceLoading(); HEAD + HEAD injector.getHupaController().start(); === HupaController hupaController = injector.getHupaController(); hupaController.start(); move new theme ui from experiment to hupa evo +=== + injector.getHupaController().start(); + integrate them as a whole one - first: make the default place work } private void handleExceptionsAsync() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java?rev=1522235r1=1522234r2=1522235view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java Thu Sep 12 03:41:40 2013 @@ -19,7 +19,7 @@ package org.apache.hupa.client; -import org.apache.hupa.client.ui.HupaLayoutable; +import org.apache.hupa.client.ui.LoginLayoutable; import com.google.gwt.activity.shared.ActivityManager; import com.google.inject.Inject; @@ -32,8 +32,9 @@ import com.google.inject.name.Named; public class HupaActivityManagerInitializer { @Inject - public HupaActivityManagerInitializer(HupaLayoutable layout, - @Named(LoginPage) ActivityManager loginActivityManager) { + public HupaActivityManagerInitializer(LoginLayoutable layout + ,@Named(LoginPage) ActivityManager loginActivityManager + ) { loginActivityManager.setDisplay(layout.getLoginView()); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522235r1=1522234r2=1522235view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:41:40 2013 @@ -51,6 +51,7 @@ import org.apache.hupa.client.place.Mail import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.HupaLayoutable; +import org.apache.hupa.client.ui.LoginLayoutable; move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; @@ -91,6 +92,7 @@ public class HupaController { import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; +import com.google.web.bindery.requestfactory.shared.ServerFailure; public class HupaController { @@ -99,6 +101,8 @@ public class HupaController
svn commit: r1522236 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/place/ client/src/main/java/org/apache/hupa/client/ui/ widgets/src
Author: dongxu Date: Thu Sep 12 03:42:12 2013 New Revision: 1522236 URL: http://svn.apache.org/r1522236 Log: remove some warnings and create the AbstractPlace that can give place infomation Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.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/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522236r1=1522235r2=1522236view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:42:12 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client; HEAD + HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -45,6 +46,10 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; === +=== +import java.util.logging.Logger; + + remove some warnings and create the AbstractPlace that can give place infomation import org.apache.hupa.client.bundles.HupaResources; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.place.MailFolderPlace; @@ -101,9 +106,12 @@ public class HupaController { @Inject private PlaceController placeController; @Inject private HupaRequestFactory requestFactory; private Place currentPlace; - + @Inject private LoginLayoutable loginLayout; + private static final Logger log = Logger.getLogger(HupaController.class + .getName()); + @Inject HEAD public HupaController(EventBus eventBus) { @@ -256,7 +264,7 @@ public class HupaController { private final class PlaceChangHandler implements PlaceChangeEvent.Handler { @Override public void onPlaceChange(PlaceChangeEvent event) { - + log.fine(place changed to + event.getNewPlace()); if (placeChange(event)) { checkSession(); } @@ -274,21 +282,22 @@ public class HupaController { currentPlace = newPlace; } } -// -// private void checkSession() { -// CheckSessionRequest checkSession = requestFactory.sessionRequest(); -// checkSession.isValid().fire(new ReceiverBoolean() { -// @Override -// public void onSuccess(Boolean sessionValid) { -// if (!sessionValid) { -// RootLayoutPanel.get().add(loginLayout.get());// -// HupaController.this.placeController -// .goTo(new DefaultPlace()); -// // this? -// } -// } -// }); -// } + + // + // private void checkSession() { + // CheckSessionRequest checkSession = requestFactory.sessionRequest(); + // checkSession.isValid().fire(new ReceiverBoolean() { + // @Override + // public void onSuccess(Boolean sessionValid) { + // if (!sessionValid) { + // RootLayoutPanel.get().add(loginLayout.get());// + // HupaController.this.placeController + // .goTo(new DefaultPlace()); + // // this? + // } + // } + // }); + // } private boolean placeChange(PlaceChangeEvent event) { return currentPlace != null @@ -311,18 +320,18 @@ public class
svn commit: r1522239 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: buttons.png hupa_logo_49_transparent.png linen_header.jpg roundcube_logo.png
Author: dongxu Date: Thu Sep 12 03:43:43 2013 New Revision: 1522239 URL: http://svn.apache.org/r1522239 Log: clear needless images Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/buttons.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/hupa_logo_49_transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/linen_header.jpg james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/roundcube_logo.png - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522238 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayoutView.java HupaLayoutView.ui.xml HupaOverallLayout.java HupaOverallLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:43:24 2013 New Revision: 1522238 URL: http://svn.apache.org/r1522238 Log: remove the needless ones Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaOverallLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaOverallLayout.ui.xml - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522241 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ client/src/main/java/org/apache/hupa/client/evo/ client/src/main/java/org/apache/hupa/client/ioc/ client/src/m
Author: dongxu Date: Thu Sep 12 03:44:35 2013 New Revision: 1522241 URL: http://svn.apache.org/r1522241 Log: track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.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/ioc/AppGinjector.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522241r1=1522240r2=1522241view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:44:35 2013 @@ -331,18 +331,16 @@ public class HupaController { checkSession.isValid().fire(new ReceiverBoolean() { @Override public void onSuccess(Boolean sessionValid) { - // RootLayoutPanel.get().clear(); - // RootLayoutPanel.get().add(hupaLayout.get()); if (!sessionValid) { - RootLayoutPanel.get().clear(); - RootLayoutPanel.get().add(loginLayout.get());// - HupaController.this.placeController - .goTo(new DefaultPlace()); + RootLayoutPanel.get().add(loginLayout.get()); + log.fine(session invalid); +// HupaController.this.placeController +// .goTo(new DefaultPlace()); } else { RootLayoutPanel.get().clear(); - RootLayoutPanel.get().add(hupaLayout.get());// + RootLayoutPanel.get().add(hupaLayout.get()); } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java?rev=1522241r1=1522240r2=1522241view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java Thu Sep 12 03:44:35 2013 @@ -32,13 +32,7 @@ import com.google.inject.name.Named; public class ActivityManagerInitializer { @Inject - public ActivityManagerInitializer(AppLayout appPanelView, - @Named(TopRegion) ActivityManager topActivityManager, - @Named(WestRegion) ActivityManager westActivityManager, - @Named(MainContentRegion) ActivityManager mainContentActivityManager) { - topActivityManager.setDisplay(appPanelView.getNorthContainer()); - westActivityManager.setDisplay(appPanelView.getWestContainer()); - mainContentActivityManager.setDisplay(appPanelView.getCenterContainer()); + public ActivityManagerInitializer(AppLayout appPanelView) { } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java?rev=1522241r1=1522240r2=1522241view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java Thu Sep 12 03:44:35 2013 @@ -32,7 +32,7
svn commit: r1522240 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java FolderListView.ui.xml FoldersCellTree.java FoldersTreeViewModel.java WestView.java
Author: dongxu Date: Thu Sep 12 03:44:03 2013 New Revision: 1522240 URL: http://svn.apache.org/r1522240 Log: make folder list in west panel partly work Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522240r1=1522239r2=1522240view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 03:44:03 2013 @@ -213,14 +213,24 @@ import org.apache.hupa.client.activity.F integrate all of the views to their corresponding activities and mappers import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.cellview.client.CellTree; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.SimplePanel; +import com.google.inject.Inject; -public class FolderListView extends Composite implements - FolderListActivity.Displayable { +public class FolderListView extends Composite implements FolderListActivity.Displayable { - public FolderListView() { + @UiField(provided = true) + FoldersCellTree cellTree; + + @Inject + public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus) { + CellTree.Resources res = GWT.create(CellTree.BasicResources.class); + cellTree = new FoldersCellTree(viewModel, res); + cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); make login page as one part of the overall layout splite layout to little one } @@ -228,7 +238,6 @@ public class FolderListView extends Comp interface FolderListUiBinder extends UiBinderSimplePanel, FolderListView { } - private static FolderListUiBinder binder = GWT - .create(FolderListUiBinder.class); + private static FolderListUiBinder binder = GWT.create(FolderListUiBinder.class); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1522240r1=1522239r2=1522240view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml Thu Sep 12 03:44:03 2013 @@ -10,12 +10,17 @@ language governing permissions and limitations under the License. -- ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + HEAD xmlns:g='urn:import:com.google.gwt.user.client.ui' HEAD g:SimplePanel ui:field=thisView / === +=== + xmlns:g='urn:import:com.google.gwt.user.client.ui' + xmlns:hupa='urn:import:org.apache.hupa.client.ui' + make folder list in west panel partly work g:SimplePanel ui:field=FolderListView - g:HTMLPanel/g:HTMLPanel + hupa:FoldersCellTree ui:field=cellTree/ /g:SimplePanel make login page as one part of the overall layout splite layout to little one /ui:UiBinder \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java?rev=1522240r1=1522239r2=1522240view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java Thu Sep 12 03:44:03 2013 @@ -23,7 +23,6 @@ import com.google.gwt.user.cellview.clie import com.google.inject.Inject; public class FoldersCellTree extends CellTree { - @Inject public FoldersCellTree(final FoldersTreeViewModel viewModel, Resources resources) { super(viewModel, null, resources); Modified: james/hupa
svn commit: r1522243 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ioc/ client/src/main/java/org/apache/hupa/client/mapper/ client/src/main/java/org/apache/hupa/client/ui/ server
Author: dongxu Date: Thu Sep 12 03:45:32 2013 New Revision: 1522243 URL: http://svn.apache.org/r1522243 Log: bind FolderListActivity to Singleton, otherwise it might create its view several times Modified: 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/mapper/MainContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchFoldersServiceImpl.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/ioc/AppGinModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522243r1=1522242r2=1522243view=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:45:32 2013 @@ -473,6 +473,19 @@ public class AppGinModule extends Abstra bind(MessageListFooterActivity.Displayable.class).to(MessageListFooterView.class); bind(MessageContentActivity.Displayable.class).to(MessageContentView.class); bind(StatusActivity.Displayable.class).to(StatusView.class); + + bind(LoginActivity.class).in(Singleton.class); + bind(TopBarActivity.class).in(Singleton.class); + bind(LogoActivity.class).in(Singleton.class); + bind(NavigationActivity.class).in(Singleton.class); + bind(ToolBarActivity.class).in(Singleton.class); + bind(FolderListActivity.class).in(Singleton.class); + bind(MessageListActivity.class).in(Singleton.class); + bind(MessageListFooterActivity.class).in(Singleton.class); + bind(MessageContentActivity.class).in(Singleton.class); + bind(StatusActivity.class).in(Singleton.class); + + integrate all of the views to their corresponding activities and mappers bind(TopActivity.Displayable.class).to(TopView.class); @@ -524,7 +537,7 @@ public class AppGinModule extends Abstra bind(IMAPMessageActivity.class).in(Singleton.class); bind(MessagesCellTable.class).in(Singleton.class); - bind(FoldersTreeViewModel.class); + bind(FoldersTreeViewModel.class).in(Singleton.class); bind(CellTree.Resources.class).to(CellTree.BasicResources.class); // Places bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in( Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java?rev=1522243r1=1522242r2=1522243view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java Thu Sep 12 03:45:32 2013 @@ -52,7 +52,7 @@ public class MainContentActivityMapper i public Activity getActivity(Place place) { if (place instanceof MailFolderPlace) { - return messageListActivityProvider.get().with((MailFolderPlace)place); +// return messageListActivityProvider.get().with((MailFolderPlace)place); } else if (place instanceof DefaultPlace) { return loginActivityProvider.get(); } else if(place instanceof MessageSendPlace){ Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522243r1=1522242r2=1522243view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 03:45:32 2013 @@ -37,34 +37,36 @@ import com.google.gwt.view.client.Single import com.google.gwt.view.client.TreeViewModel; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; +import com.google.web.bindery.requestfactory.shared.ServerFailure; public class
svn commit: r1522244 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ioc/AppGinModule.java ui/FoldersTreeViewModel.java
Author: dongxu Date: Thu Sep 12 03:45:49 2013 New Revision: 1522244 URL: http://svn.apache.org/r1522244 Log: remove the duplicate bind of LoginActivity Modified: 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/FoldersTreeViewModel.java 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=1522244r1=1522243r2=1522244view=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:45:49 2013 @@ -522,6 +522,7 @@ public class AppGinModule extends Abstra === forward and reply message to use RF + HEAD bind(WestActivity.class).in(Singleton.class); === @@ -530,6 +531,8 @@ public class AppGinModule extends Abstra integrate all of the views to their corresponding activities and mappers bind(LoginActivity.class).in(Singleton.class); remove gwt-incubator dependency in Messages List Model; +=== + remove the duplicate bind of LoginActivity bind(TopActivity.class).in(Singleton.class); bind(WestActivity.class).in(Singleton.class); bind(IMAPMessageListActivity.class).in(Singleton.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522244r1=1522243r2=1522244view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 03:45:49 2013 @@ -74,7 +74,6 @@ public class FoldersTreeViewModel implem */ @Override public T NodeInfo? getNodeInfo(T value) { - System.out.println(-=-=-=-=-+value); return new DefaultNodeInfoImapFolder(new ImapFolderListDataProvider( (ImapFolder) value), new AbstractCellImapFolder() { @Override @@ -103,7 +102,6 @@ public class FoldersTreeViewModel implem @Override protected void onRangeChanged(HasDataImapFolder display) { - System.out.println(display -+display); rf.fetchFoldersRequest().fetch(folder) .fire(new ReceiverListImapFolder() { @Override - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522242 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/LoginActivity.java mapper/FolderListActivityMapper.java ui/FoldersCellTree.java ui/FoldersTreeViewMode
Author: dongxu Date: Thu Sep 12 03:45:01 2013 New Revision: 1522242 URL: http://svn.apache.org/r1522242 Log: make folder list panel work as expected Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java 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/mapper/FolderListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.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=1522242r1=1522241r2=1522242view=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:45:01 2013 @@ -487,6 +487,7 @@ public class LoginActivity extends Abstr public void onSuccess(User response) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(hupaLayout.get()); + placeController.goTo(new MailFolderPlace()); // placeController.goTo(new MailFolderPlace().with(response, useDefaultInboxFolder(response), null)); // eventBus.fireEvent(new LoginEvent(response)); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522242r1=1522241r2=1522242view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java Thu Sep 12 03:45:01 2013 @@ -21,12 +21,17 @@ package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.FolderListActivity; HEAD + HEAD import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.activity.shared.Activity; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; === +=== +import org.apache.hupa.client.place.DefaultPlace; +import org.apache.hupa.client.place.MailFolderPlace; + make folder list panel work as expected import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; @@ -66,6 +71,8 @@ public class FolderListActivityMapper im === public Activity getActivity(Place place) { + if(place instanceof DefaultPlace)return null; + else if (place instanceof MailFolderPlace) folderListActivityProvider.get(); return folderListActivityProvider.get(); integrate all of the views to their corresponding activities and mappers } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522242r1=1522241r2=1522242view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 03:45:01 2013 @@ -92,20 +92,15 @@ public class FoldersTreeViewModel implem ImapFolder folder; @Override - public void addDataDisplay(HasDataImapFolder display) { - super.addDataDisplay(display); - } - - @Override - protected void onRangeChanged(HasDataImapFolder display) {//TODO how to deal with init, here folder should be inject from some place rather null + protected void onRangeChanged(HasDataImapFolder display) { + System.out.println(display.getVisibleItemCount() + --- +display.getRowCount()+=+display.getVisibleItems()+=+display.getVisibleRange()); rf.fetchFoldersRequest().fetch(folder).fire(new ReceiverListImapFolder() { @Override public void onSuccess(ListImapFolder response) { if (response == null || response.size() == 0
svn commit: r1522246 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
Author: dongxu Date: Thu Sep 12 03:46:28 2013 New Revision: 1522246 URL: http://svn.apache.org/r1522246 Log: the workaround of r149, all of the folders use the same one icon Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522246r1=1522245r2=1522246view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 03:46:28 2013 @@ -84,25 +84,25 @@ public class FoldersTreeViewModel implem * Get the {@link NodeInfo} that provides the children of the specified * value. */ - // @Override - // public T NodeInfo? getNodeInfo(T value) { - // return new DefaultNodeInfoImapFolder(new ImapFolderListDataProvider( - // (ImapFolder) value), new ImapFolderCell(images.listicons()) { - // @Override - // public void render(Context context, ImapFolder value, - // SafeHtmlBuilder sb) { - // if (value != null) { - // sb.appendEscaped(value.getName()); - // } - // } - // }, selectionModel, null); - // } @Override public T NodeInfo? getNodeInfo(T value) { return new DefaultNodeInfoImapFolder(new ImapFolderListDataProvider( - (ImapFolder) value), new ImapFolderCell(images.listicons()), - selectionModel, null); + (ImapFolder) value), new AbstractCellImapFolder() { + @Override + public void render(Context context, ImapFolder value, + SafeHtmlBuilder sb) { + if (value != null) { + sb.appendEscaped(value.getName()); + } + } + }, selectionModel, null); } +// @Override +// public T NodeInfo? getNodeInfo(T value) { +// return new DefaultNodeInfoImapFolder(new ImapFolderListDataProvider( +// (ImapFolder) value), new ImapFolderCell(images.listicons()), +// selectionModel, null); +// } /** * The cell used to render categories. - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522245 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java FoldersTreeViewModel.java HupaLayout.ui.xml res/CellTree.css res/TreeResources.java
Author: dongxu Date: Thu Sep 12 03:46:10 2013 New Revision: 1522245 URL: http://svn.apache.org/r1522245 Log: adjust folder list's css style, try to dynamically load folder icons Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CellTree.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/TreeResources.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522245r1=1522244r2=1522245view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 03:46:10 2013 @@ -210,6 +210,7 @@ public class FolderListView extends Comp === === import org.apache.hupa.client.activity.FolderListActivity; +import org.apache.hupa.client.ui.res.TreeResources; integrate all of the views to their corresponding activities and mappers import com.google.gwt.core.client.GWT; @@ -228,7 +229,7 @@ public class FolderListView extends Comp @Inject public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus) { - CellTree.Resources res = GWT.create(CellTree.BasicResources.class); + CellTree.Resources res = GWT.create(TreeResources.class); cellTree = new CellTree(viewModel, null, res); cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522245r1=1522244r2=1522245view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 03:46:10 2013 @@ -22,13 +22,21 @@ package org.apache.hupa.client.ui; import java.util.List; import org.apache.hupa.client.rf.HupaRequestFactory; +import org.apache.hupa.client.ui.res.TreeResources; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.LoadMessagesEvent; import com.google.gwt.cell.client.AbstractCell; +import com.google.gwt.core.shared.GWT; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.resources.client.ClientBundle.Source; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.impl.ClippedImagePrototype; import com.google.gwt.view.client.AsyncDataProvider; import com.google.gwt.view.client.HasData; import com.google.gwt.view.client.ProvidesKey; @@ -44,6 +52,7 @@ public class FoldersTreeViewModel implem protected User user; @Inject protected HupaRequestFactory rf; @Inject protected EventBus eventBus; + private static TreeResources images; public FoldersTreeViewModel() { @@ -58,6 +67,9 @@ public class FoldersTreeViewModel implem selectionModel.getSelectedObject())); } }); + if (images == null) { + images = GWT.create(TreeResources.class); + } } private final SingleSelectionModelImapFolder selectionModel = new SingleSelectionModelImapFolder( @@ -72,18 +84,48 @@ public class FoldersTreeViewModel implem * Get the {@link NodeInfo} that provides the children of the specified * value. */ + // @Override + // public T NodeInfo? getNodeInfo(T value) { + // return new DefaultNodeInfoImapFolder(new ImapFolderListDataProvider( + // (ImapFolder) value), new ImapFolderCell(images.listicons()) { + // @Override + // public void render(Context context, ImapFolder value, + // SafeHtmlBuilder sb) { + // if (value != null) { + // sb.appendEscaped(value.getName
svn commit: r1522247 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageListView.java MessageListView.ui.xml
Author: dongxu Date: Thu Sep 12 03:46:45 2013 New Revision: 1522247 URL: http://svn.apache.org/r1522247 Log: try to integrate the messages list's panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522247r1=1522246r2=1522247view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 03:46:45 2013 @@ -59,7 +59,7 @@ import org.apache.hupa.client.activity.M import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.SimplePanel; public class MessageListView extends Composite implements MessageListActivity.Displayable { @@ -68,8 +68,12 @@ public class MessageListView extends Com initWidget(binder.createAndBindUi(this)); } + HEAD interface MessageListUiBinder extends UiBinderHTMLPanel, MessageListView { make login page as one part of the overall layout splite layout to little one +=== + interface MessageListUiBinder extends UiBinderSimplePanel, MessageListView { + try to integrate the messages list's panel } private static MessageListUiBinder binder = GWT Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml?rev=1522247r1=1522246r2=1522247view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml Thu Sep 12 03:46:45 2013 @@ -15,7 +15,14 @@ g:SimpleLayoutPanel ui:field=thisView / === xmlns:g='urn:import:com.google.gwt.user.client.ui' + HEAD g:HTMLPanelMessageList /g:HTMLPanel make login page as one part of the overall layout splite layout to little one +=== + g:SimplePanel + g:HTMLPanelMessageList + /g:HTMLPanel + /g:SimplePanel + try to integrate the messages list's panel /ui:UiBinder \ No newline at end of file - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522249 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:47:31 2013 New Revision: 1522249 URL: http://svn.apache.org/r1522249 Log: DataGrid requires to be put in a LayoutPanel or Panel that implements the ProvidesResize interface to be visible Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522249r1=1522248r2=1522249view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:47:31 2013 @@ -248,9 +248,8 @@ public class HupaLayout implements HupaL @UiField SimplePanel topBarContainer; @UiField SimplePanel logoContainer; - // TODO why can not be SimplePanel here? can not display + // can not be SimplePanel here, sub panel need its parent to implements the ProvidesResize interface, the same with messageListContainer @UiField LayoutPanel navigationContainer; - @UiField SimplePanel toolBarContainer; @UiField SimplePanel folderListContainer; @UiField LayoutPanel messageListContainer; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522249r1=1522248r2=1522249view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:47:31 2013 @@ -158,6 +158,7 @@ === g:layer width=287px right=0 HEAD + HEAD track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN g:LayoutPanel ui:field=navigationContainer/!-- why can not be SimplePanel here -- integrate all of the views to their corresponding activities and mappers @@ -165,6 +166,9 @@ g:LayoutPanel ui:field=navigationContainer /!-- why can not be SimplePanel here -- make message list view panel work as expected partly +=== + g:LayoutPanel ui:field=navigationContainer / + DataGrid requires to be put in a LayoutPanel or Panel that implements the ProvidesResize interface to be visible /g:layer g:layer left=0% width=0% top=0% height=0% hupa:_CenterContactPanel ui:field=contactPanel / - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522248 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/
Author: dongxu Date: Thu Sep 12 03:47:13 2013 New Revision: 1522248 URL: http://svn.apache.org/r1522248 Log: make message list view panel work as expected partly 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/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListFooterView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml 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=1522248r1=1522247r2=1522248view=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:47:13 2013 @@ -489,7 +489,7 @@ public class LoginActivity extends Abstr RootLayoutPanel.get().add(hupaLayout.get()); placeController.goTo(new MailFolderPlace()); // placeController.goTo(new MailFolderPlace().with(response, useDefaultInboxFolder(response), null)); -// eventBus.fireEvent(new LoginEvent(response)); + eventBus.fireEvent(new LoginEvent(response)); } @Override public void onFailure(ServerFailure error) { 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=1522248r1=1522247r2=1522248view=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:47:13 2013 @@ -145,6 +145,7 @@ import org.apache.hupa.client.activity.T import org.apache.hupa.client.activity.TopBarActivity; import org.apache.hupa.client.activity.WestActivity; import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; + HEAD import org.apache.hupa.client.mapper.CachingTopActivityMapper; HEAD HEAD @@ -186,10 +187,11 @@ import org.apache.hupa.client.mapper.Mai Make the evo more clear. === === +=== + make message list view panel work as expected partly import org.apache.hupa.client.mapper.FolderListActivityMapper; import org.apache.hupa.client.mapper.LoginActivityMapper; import org.apache.hupa.client.mapper.LogoActivityMapper; -import org.apache.hupa.client.mapper.MainContentActivityMapper; import org.apache.hupa.client.mapper.MessageContentActivityMapper; import org.apache.hupa.client.mapper.MessageListActivityMapper; import org.apache.hupa.client.mapper.MessageListFooterActivityMapper; @@ -197,9 +199,12 @@ import org.apache.hupa.client.mapper.Nav import org.apache.hupa.client.mapper.StatusActivityMapper; import org.apache.hupa.client.mapper.ToolBarActivityMapper; import org.apache.hupa.client.mapper.TopBarActivityMapper; + HEAD integrate all of the views to their corresponding activities and mappers import org.apache.hupa.client.mapper.WestActivityMapper; delete messages, make WestActivity Singleton +=== + make message list view panel work as expected partly import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.FolderListView; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java?rev=1522248r1=1522247r2=1522248view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper
svn commit: r1522250 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:47:52 2013 New Revision: 1522250 URL: http://svn.apache.org/r1522250 Log: prepare for search box Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522250r1=1522249r2=1522250view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:47:52 2013 @@ -184,7 +184,20 @@ g:layer left='10px' right='10px' top='88px' bottom=20px g:DockLayoutPanel ui:field=MainBox g:north size=40 - g:SimplePanel ui:field=toolBarContainer / + g:DockLayoutPanel unit=PX + g:west size=550 + g:SimplePanel ui:field=toolBarContainer / + /g:west + g:east size=180 + g:HTMLPanel + Search + input style='color: gray;' value='//TODO' / + /g:HTMLPanel + /g:east + g:center + g:HTMLPanel / + /g:center + /g:DockLayoutPanel /g:north g:center g:SplitLayoutPanel ui:field=MessageSpace @@ -210,7 +223,7 @@ g:LayoutPanel addStyleNames={style.box} ui:field=MessageListBox g:layer - g:LayoutPanel ui:field=messageListContainer/ + g:LayoutPanel ui:field=messageListContainer / /g:layer g:layer bottom=0 height=25px g:SimplePanel ui:field=messageListFooterContainer / - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522251 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:48:19 2013 New Revision: 1522251 URL: http://svn.apache.org/r1522251 Log: prepare for message content panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.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/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.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/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522251r1=1522250r2=1522251view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java Thu Sep 12 03:48:19 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.activity; HEAD + HEAD import java.util.Collection; import java.util.List; import java.util.Set; @@ -240,21 +241,107 @@ public class MessageListActivity extends }); } === +=== +import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.rf.GetMessageDetailsRequest; + prepare for message content panel import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; +import org.apache.hupa.shared.domain.GetMessageDetailsAction; +import org.apache.hupa.shared.domain.GetMessageDetailsResult; +import org.apache.hupa.shared.domain.ImapFolder; +import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.User; +import org.apache.hupa.shared.events.ExpandMessageEvent; +import org.apache.hupa.shared.events.ExpandMessageEventHandler; +import org.apache.hupa.shared.events.LoginEvent; +import org.apache.hupa.shared.events.LoginEventHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.web.bindery.requestfactory.shared.Receiver; public class MessageListActivity extends AppBaseActivity { +// @Inject private ProviderIMAPMessagePlace messagePlaceProvider; + private User user; + private String searchValue; + @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); + bindTo(eventBus); + } + + private void bindTo(EventBus eventBus) { + eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { + public void onLogin(LoginEvent event) { + user = event.getUser(); + searchValue = null; + } + }); + eventBus.addHandler(ExpandMessageEvent.TYPE, + new ExpandMessageEventHandler() { + public void onExpandMessage(ExpandMessageEvent event) { + // final boolean decreaseUnseen; + final Message message = event.getMessage(); + // check if the message was already seen in the past + if (event.getMessage().getFlags() + .contains(IMAPFlag.SEEN) == false) { + // decreaseUnseen = true;//TODO 1209 + } else { + // decreaseUnseen = false; + } + + GetMessageDetailsRequest req = requestFactory + .messageDetailsRequest(); + GetMessageDetailsAction action = req + .create(GetMessageDetailsAction.class
svn commit: r1522252 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/
Author: dongxu Date: Thu Sep 12 03:48:47 2013 New Revision: 1522252 URL: http://svn.apache.org/r1522252 Log: make message content work as expected partly Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.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/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522252r1=1522251r2=1522252view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java Thu Sep 12 03:48:47 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.activity; HEAD + HEAD import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -161,21 +162,40 @@ public class MessageContentActivity exte }; }-*/; === +=== +import org.apache.hupa.client.place.IMAPMessagePlace; + make message content work as expected partly import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.domain.MessageDetails; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; public class MessageContentActivity extends AppBaseActivity { + + MessageDetails messageDetails; @Override public void start(AcceptsOneWidget container, EventBus eventBus) { + display.fillMessageContent(messageDetails.getText()); + System.out.println(messageDetails.getText()); container.setWidget(display.asWidget()); } @Inject private Displayable display; + HEAD public interface Displayable extends WidgetDisplayable {} integrate all of the views to their corresponding activities and mappers +=== + public interface Displayable extends WidgetDisplayable { + void fillMessageContent(String messageContent); + } + + public MessageContentActivity with(IMAPMessagePlace messageContentPlace){ + messageDetails = messageContentPlace.getMessageDetails(); + return this; + } + make message content work as expected partly } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522252r1=1522251r2=1522252view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java Thu Sep 12 03:48:47 2013 @@ -265,7 +265,7 @@ import com.google.web.bindery.requestfac public class MessageListActivity extends AppBaseActivity { -// @Inject private ProviderIMAPMessagePlace messagePlaceProvider; + // @Inject private ProviderIMAPMessagePlace messagePlaceProvider; private User user; private String searchValue; @@ -282,46 +282,38 @@ public class MessageListActivity extends searchValue = null; } }); - eventBus.addHandler(ExpandMessageEvent.TYPE, - new ExpandMessageEventHandler() { - public void onExpandMessage(ExpandMessageEvent event) { - // final boolean decreaseUnseen; - final Message message = event.getMessage(); - // check if the message was already seen in the past - if (event.getMessage().getFlags() - .contains(IMAPFlag.SEEN) == false) { - // decreaseUnseen = true;//TODO 1209 - } else
svn commit: r1522255 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:49:51 2013 New Revision: 1522255 URL: http://svn.apache.org/r1522255 Log: set minimum size of message list box Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522255r1=1522254r2=1522255view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:49:51 2013 @@ -248,32 +248,32 @@ import com.google.gwt.user.client.ui.Wid public class HupaLayout implements HupaLayoutable { @UiField SimplePanel topBarContainer; - + @UiField SimplePanel logoContainer; @UiField LayoutPanel navigationContainer; @UiField SimplePanel toolBarContainer; - @UiField SplitLayoutPanel messageSpace; - @UiField LayoutPanel leftArea; - - @UiField SplitLayoutPanel messageBox; + @UiField LayoutPanel folderArea; + + @UiField SplitLayoutPanel messageArea; @UiField SimplePanel folderListContainer; @UiField LayoutPanel messageListBox; @UiField LayoutPanel messageListContainer; @UiField SimplePanel messageListFooterContainer; @UiField SimplePanel messageContentContainer; @UiField SimplePanel statusContainer; - + @UiField HTMLPanel contactBox; private LayoutPanel hupaMainPanel; public HupaLayout() { hupaMainPanel = binder.createAndBindUi(this); - messageSpace.setWidgetMinSize(leftArea, 144); - messageBox.setWidgetHidden(contactBox, true); + messageSpace.setWidgetMinSize(folderArea, 144); + messageArea.setWidgetMinSize(messageListBox, 72); + messageArea.setWidgetHidden(contactBox, true); } @Override Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522255r1=1522254r2=1522255view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:49:51 2013 @@ -202,7 +202,7 @@ g:center g:SplitLayoutPanel ui:field=messageSpace g:west size=373 - g:LayoutPanel ui:field=leftArea + g:LayoutPanel ui:field=folderArea addStyleNames={style.folderList} {style.box} {style.listBox} g:layer top=0 height=100% g:SimplePanel ui:field=folderListContainer / @@ -215,59 +215,37 @@ /g:LayoutPanel /g:west g:center - g:DockLayoutPanel unit=PCT ui:field=rightArea - g:west size=100 - g:SplitLayoutPanel ui:field=messageBox - g:north size=200 - g:LayoutPanel addStyleNames={style.box} - ui:field=messageListBox - g:layer top=0 height=175px - g:LayoutPanel ui:field=messageListContainer / - /g:layer - g:layer bottom=0 height=25px
svn commit: r1522254 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:49:34 2013 New Revision: 1522254 URL: http://svn.apache.org/r1522254 Log: set minimum size of left area Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522254r1=1522253r2=1522254view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:49:34 2013 @@ -247,27 +247,32 @@ import com.google.gwt.user.client.ui.Wid public class HupaLayout implements HupaLayoutable { - @UiField SplitLayoutPanel messageBox; @UiField SimplePanel topBarContainer; - @UiField SimplePanel logoContainer; - // can not be SimplePanel here, sub panel need its parent to implements the ProvidesResize interface, the same with messageListContainer + @UiField SimplePanel logoContainer; @UiField LayoutPanel navigationContainer; + @UiField SimplePanel toolBarContainer; + + + @UiField SplitLayoutPanel messageSpace; + @UiField LayoutPanel leftArea; + + @UiField SplitLayoutPanel messageBox; @UiField SimplePanel folderListContainer; @UiField LayoutPanel messageListBox; @UiField LayoutPanel messageListContainer; @UiField SimplePanel messageListFooterContainer; - - @UiField HTMLPanel contactBox; - @UiField SimplePanel messageContentContainer; @UiField SimplePanel statusContainer; + + @UiField HTMLPanel contactBox; private LayoutPanel hupaMainPanel; public HupaLayout() { hupaMainPanel = binder.createAndBindUi(this); + messageSpace.setWidgetMinSize(leftArea, 144); messageBox.setWidgetHidden(contactBox, true); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522254r1=1522253r2=1522254view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:49:34 2013 @@ -200,9 +200,9 @@ /g:DockLayoutPanel /g:north g:center - g:SplitLayoutPanel ui:field=MessageSpace + g:SplitLayoutPanel ui:field=messageSpace g:west size=373 - g:LayoutPanel ui:field=LeftBox + g:LayoutPanel ui:field=leftArea addStyleNames={style.folderList} {style.box} {style.listBox} g:layer top=0 height=100% g:SimplePanel ui:field=folderListContainer / @@ -215,7 +215,7 @@ /g:LayoutPanel /g:west g:center - g:DockLayoutPanel unit=PCT ui:field=rightBox + g:DockLayoutPanel unit=PCT ui:field=rightArea g:west size=100 g:SplitLayoutPanel ui:field=messageBox g:north size=200 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522253 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ ui/
Author: dongxu Date: Thu Sep 12 03:49:15 2013 New Revision: 1522253 URL: http://svn.apache.org/r1522253 Log: adjust to the ui of folder list panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522253r1=1522252r2=1522253view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java Thu Sep 12 03:49:15 2013 @@ -179,7 +179,6 @@ public class MessageContentActivity exte @Override public void start(AcceptsOneWidget container, EventBus eventBus) { display.fillMessageContent(messageDetails.getText()); - System.out.println(messageDetails.getText()); container.setWidget(display.asWidget()); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java?rev=1522253r1=1522252r2=1522253view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java Thu Sep 12 03:49:15 2013 @@ -88,7 +88,6 @@ public class MessageContentActivityMappe else if (place instanceof MailFolderPlace) return null; else if (place instanceof IMAPMessagePlace) { - System.out.println(+++___+_+_+_+((IMAPMessagePlace) place).getMessageDetails().getText()); return messageContentActivityProvider.get().with((IMAPMessagePlace) place); } return null; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522253r1=1522252r2=1522253view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:49:15 2013 @@ -28,6 +28,7 @@ import com.google.gwt.dom.client.Style.U import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.LayoutPanel; import com.google.gwt.user.client.ui.SimpleLayoutPanel; @@ -241,10 +242,12 @@ import com.google.gwt.user.client.ui.IsW integrate all of the views to their corresponding activities and mappers import com.google.gwt.user.client.ui.LayoutPanel; import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.Widget; public class HupaLayout implements HupaLayoutable { + @UiField SplitLayoutPanel messageBox; @UiField SimplePanel topBarContainer; @UiField SimplePanel logoContainer; @@ -252,8 +255,12 @@ public class HupaLayout implements HupaL @UiField LayoutPanel navigationContainer; @UiField SimplePanel toolBarContainer; @UiField SimplePanel folderListContainer; + @UiField LayoutPanel messageListBox; @UiField LayoutPanel messageListContainer; @UiField SimplePanel messageListFooterContainer; + + @UiField HTMLPanel contactBox; + @UiField SimplePanel messageContentContainer; @UiField SimplePanel statusContainer; @@ -261,6 +268,7 @@ public class HupaLayout implements HupaL public HupaLayout
svn commit: r1522256 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml MessageListView.java MessageListView.ui.xml MessagesCellTable.java
Author: dongxu Date: Thu Sep 12 03:50:13 2013 New Revision: 1522256 URL: http://svn.apache.org/r1522256 Log: deal with onResizeEvent of folder list panel, but found issue #25 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522256r1=1522255r2=1522256view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:50:13 2013 @@ -28,10 +28,12 @@ import com.google.gwt.dom.client.Style.U import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.LayoutPanel; import com.google.gwt.user.client.ui.SimpleLayoutPanel; + HEAD import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; @@ -241,6 +243,8 @@ import com.google.gwt.user.client.ui.Acc import com.google.gwt.user.client.ui.IsWidget; integrate all of the views to their corresponding activities and mappers import com.google.gwt.user.client.ui.LayoutPanel; +=== + deal with onResizeEvent of folder list panel, but found issue #25 import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.Widget; @@ -250,7 +254,7 @@ public class HupaLayout implements HupaL @UiField SimplePanel topBarContainer; @UiField SimplePanel logoContainer; - @UiField LayoutPanel navigationContainer; + @UiField SimpleLayoutPanel navigationContainer; @UiField SimplePanel toolBarContainer; @@ -259,8 +263,8 @@ public class HupaLayout implements HupaL @UiField SplitLayoutPanel messageArea; @UiField SimplePanel folderListContainer; - @UiField LayoutPanel messageListBox; - @UiField LayoutPanel messageListContainer; + @UiField DockLayoutPanel messageListBox; + @UiField SimpleLayoutPanel messageListContainer; @UiField SimplePanel messageListFooterContainer; @UiField SimplePanel messageContentContainer; @UiField SimplePanel statusContainer; @@ -312,11 +316,7 @@ public class HupaLayout implements HupaL return new AcceptsOneWidget() { @Override public void setWidget(IsWidget w) { - Widget widget = Widget.asWidgetOrNull(w); - if (navigationContainer.getWidgetCount() 0) - navigationContainer.remove(0); - if (widget != null) - navigationContainer.add(widget); + navigationContainer.setWidget(Widget.asWidgetOrNull(w)); } }; } @@ -346,11 +346,13 @@ public class HupaLayout implements HupaL return new AcceptsOneWidget() { @Override public void setWidget(IsWidget w) { - Widget widget = Widget.asWidgetOrNull(w); - if (messageListContainer.getWidgetCount() 0) - messageListContainer.remove(0); - if (widget != null) - messageListContainer.add(widget); +// Widget widget = Widget.asWidgetOrNull(w); + messageListContainer.setWidget(Widget.asWidgetOrNull(w)); +// messageListContainer.add(Widget.asWidgetOrNull(w)); +// if (messageListContainer.getWidgetCount() 0) +// messageListContainer.remove(0); +// if (widget != null) +// messageListContainer.add(widget); } }; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org
svn commit: r1522258 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res: DataGrid.css DataGridResources.java
Author: dongxu Date: Thu Sep 12 03:50:51 2013 New Revision: 1522258 URL: http://svn.apache.org/r1522258 Log: add datagrid style resources Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css?rev=1522258view=auto == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css (added) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css Thu Sep 12 03:50:51 2013 @@ -0,0 +1,126 @@ +@def selectionBorderWidth 2px; +.dataGridWidget { + +} + +.dataGridFirstColumn { + +} + +.dataGridLastColumn { + +} + +.dataGridFooter { + border-top: 2px solid #6f7277; + padding: 3px 15px; + text-align: left; + color: #4b4a4a; + text-shadow: #ddf 1px 1px 0; + overflow: hidden; + white-space: nowrap; +} + +.dataGridHeader { +color: #69939e; +font-size: 11px; +font-weight: bold; +background: #d6eaf3; +background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%); +background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3)); +background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%); +background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%); +background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%); +border-left: 1px solid #bbd3da; +overflow: hidden; +text-overflow: ellipsis; +height:23px; +padding: 2px 3px; +} + +.dataGridCell { + cursor:default; +} + +.dataGridFirstColumnFooter { + +} + +.dataGridFirstColumnHeader { + +} + +.dataGridLastColumnFooter { + +} + +.dataGridLastColumnHeader { + +} + +.dataGridSortableHeader { + cursor: pointer; + cursor: hand; +} + +.dataGridSortableHeader:hover { + color: #6c6b6b; +} + +.dataGridSortedHeaderAscending { + +} + +.dataGridSortedHeaderDescending { + +} + +.dataGridEvenRow { + background: #ff; +} + +.dataGridEvenRowCell { + border: selectionBorderWidth solid #ff; +} + +.dataGridOddRow { + background: #f3f7fb; +} + +.dataGridOddRowCell { + border: selectionBorderWidth solid #f3f7fb; +} + +.dataGridHoveredRow { + background: #eee; +} + +.dataGridHoveredRowCell { + border: selectionBorderWidth solid #eee; +} + +.dataGridKeyboardSelectedRow { + background: #ffc; +} + +.dataGridKeyboardSelectedRowCell { + border: selectionBorderWidth solid #ffc; +} + +.dataGridSelectedRow { + background: #628cd5; + color: white; + height: auto; + overflow: auto; +} + +.dataGridSelectedRowCell { + border: selectionBorderWidth solid #628cd5; +} + +/** + * The keyboard selected cell is visible over selection. + */ +.dataGridKeyboardSelectedCell { + border: selectionBorderWidth solid #d7dde8; +} \ No newline at end of file Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java?rev=1522258view=auto == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java (added) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java Thu Sep 12 03:50:51 2013 @@ -0,0 +1,29 @@ +/ + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information* + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the* + * License); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the* + * specific language governing permissions and limitations
svn commit: r1522257 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.ui.xml MessageListView.java MessagesCellTable.java
Author: dongxu Date: Thu Sep 12 03:50:31 2013 New Revision: 1522257 URL: http://svn.apache.org/r1522257 Log: beautify the message list footer Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522257r1=1522256r2=1522257view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:50:31 2013 @@ -78,6 +78,24 @@ white-space: nowrap; overflow: hidden; } + + .messageListFooter { + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 22px; + padding: 4px 8px; + border-top: 1px solid #ddd; + background: #ebebeb; + background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ebebeb), + color-stop(100%, #c6c6c6) ); + background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%); + background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%); + background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%); + border-radius: 0 0 4px 4px; + } /ui:style g:LayoutPanel addStyleNames={style.minWidth} g:layer left='0' right='0' top='0' height='92px' @@ -226,8 +244,8 @@ g:center g:SimpleLayoutPanel ui:field=messageListContainer / /g:center - g:south size=25 - g:SimplePanel ui:field=messageListFooterContainer / + g:south size=31 + g:SimplePanel ui:field=messageListFooterContainer addStyleNames={style.messageListFooter}/ /g:south /g:DockLayoutPanel /g:north Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522257r1=1522256r2=1522257view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 03:50:31 2013 @@ -102,19 +102,19 @@ public class MessageListView extends Com this.eventBus = eventBus; this.table = table; initWidget(binder.createAndBindUi(this)); -// this.table.addCellPreviewHandler(new HandlerMessage() { -// @Override -// public void onCellPreview(CellPreviewEventMessage event) { -// if (hasClickedButFirstCol(event)) { -// eventBus.fireEvent(new ExpandMessageEvent(user, folder, event.getValue())); -// } -// } -// -// private boolean hasClickedButFirstCol(CellPreviewEventMessage event) { -// return click.equals(event.getNativeEvent().getType()) 0 != event.getColumn(); -// } -// -// }); + this.table.addCellPreviewHandler(new HandlerMessage() { + @Override + public void onCellPreview(CellPreviewEventMessage event
svn commit: r1522261 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml MessageContentView.java MessageContentView.ui.xml MessagesCellTable.java T
Author: dongxu Date: Thu Sep 12 03:51:32 2013 New Revision: 1522261 URL: http://svn.apache.org/r1522261 Log: beautify message list and content Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522261r1=1522260r2=1522261view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:51:32 2013 @@ -279,6 +279,7 @@ public class HupaLayout implements HupaL messageSpace.setWidgetMinSize(folderArea, 144); messageArea.setWidgetMinSize(messageListBox, 72); messageArea.setWidgetHidden(contactBox, true); + messageArea.setWidgetMinSize(messageListBox, 130); } @Override Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522261r1=1522260r2=1522261view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:51:32 2013 @@ -2,11 +2,15 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui' ui:image field=buttons src=res/buttons.png / HEAD + HEAD ui:image field=originLogo src=res/hupa-logo-original-transparent.png / ui:style .minWidth { min-width: 700px; === +=== + ui:image field=originLogo src=res/hupa-logo-original-transparent.png / + beautify message list and content ui:style .minWidth { min-width: 1150px; @@ -96,6 +100,20 @@ background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%); border-radius: 0 0 4px 4px; } + + @sprite .messageContent { + width: auto; + height: auto; + gwt-image: 'originLogo'; + background-position: center center; + margin: 8px; + filter: grayscale(100%); + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + opacity: 0.7; + } /ui:style g:LayoutPanel addStyleNames={style.minWidth} g:layer left='0' right='0' top='0' height='92px' @@ -224,7 +242,7 @@ g:center g:SplitLayoutPanel ui:field=messageSpace g:west size=373 - g:DockLayoutPanel ui:field=folderArea + g:DockLayoutPanel unit=PX ui:field=folderArea addStyleNames={style.folderList} {style.box} {style.listBox} g:center g:ScrollPanel ui:field=folderListContainer / @@ -257,9 +275,10 @@ /g:west g:center g:DockLayoutPanel unit=PX addStyleNames={style.box} - ui:field=MessageContentBox + ui:field=messageContentBox
svn commit: r1522260 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java HupaLayout.ui.xml
Author: dongxu Date: Thu Sep 12 03:51:09 2013 New Revision: 1522260 URL: http://svn.apache.org/r1522260 Log: fixed issue #26 and #28, left panel is scrollable currently Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522260r1=1522259r2=1522260view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:51:09 2013 @@ -32,6 +32,7 @@ import com.google.gwt.user.client.ui.Doc import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.LayoutPanel; +import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.SimpleLayoutPanel; HEAD import com.google.gwt.user.client.ui.SimplePanel; @@ -259,14 +260,14 @@ public class HupaLayout implements HupaL @UiField SimplePanel toolBarContainer; @UiField SplitLayoutPanel messageSpace; - @UiField LayoutPanel folderArea; + @UiField DockLayoutPanel folderArea; @UiField SplitLayoutPanel messageArea; - @UiField SimplePanel folderListContainer; + @UiField ScrollPanel folderListContainer; @UiField DockLayoutPanel messageListBox; @UiField SimpleLayoutPanel messageListContainer; @UiField SimplePanel messageListFooterContainer; - @UiField SimplePanel messageContentContainer; + @UiField ScrollPanel messageContentContainer; @UiField SimplePanel statusContainer; @UiField HTMLPanel contactBox; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522260r1=1522259r2=1522260view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:51:09 2013 @@ -224,17 +224,17 @@ g:center g:SplitLayoutPanel ui:field=messageSpace g:west size=373 - g:LayoutPanel ui:field=folderArea + g:DockLayoutPanel ui:field=folderArea addStyleNames={style.folderList} {style.box} {style.listBox} - g:layer top=0 height=100% - g:SimplePanel ui:field=folderListContainer / - /g:layer - g:layer bottom=0 height=41px + g:center + g:ScrollPanel ui:field=folderListContainer / + /g:center + g:south size=41 g:SimplePanel styleName={style.boxFooter} g:HTMLPanel tag=span/g:HTMLPanel /g:SimplePanel - /g:layer - /g:LayoutPanel + /g:south + /g:DockLayoutPanel /g:west g:center g:SplitLayoutPanel ui:field=messageArea @@ -245,7 +245,8 @@ g:SimpleLayoutPanel ui:field=messageListContainer / /g:center g:south size=31
svn commit: r1522262 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.ui.xml ToolBarView.java ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 03:51:49 2013 New Revision: 1522262 URL: http://svn.apache.org/r1522262 Log: dynamical style tool bar Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522262r1=1522261r2=1522262view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:51:49 2013 @@ -102,11 +102,11 @@ } @sprite .messageContent { - width: auto; - height: auto; + margin: 8px; gwt-image: 'originLogo'; background-position: center center; - margin: 8px; + width: auto; + height: auto; filter: grayscale(100%); -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); @@ -114,6 +114,14 @@ -o-filter: grayscale(100%); opacity: 0.7; } + + @sprite .messageContentWorkAround { + margin: 8px; +gwt-image: 'originLogo'; +background-position: center center; +width: auto; +height: auto; + } /ui:style g:LayoutPanel addStyleNames={style.minWidth} g:layer left='0' right='0' top='0' height='92px' @@ -278,7 +286,7 @@ ui:field=messageContentBox g:center g:ScrollPanel ui:field=messageContentContainer - addStyleNames={style.messageContent} / + addStyleNames={style.messageContentWorkAround} / /g:center g:south size=25 g:SimplePanel ui:field=statusContainer / Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522262r1=1522261r2=1522262view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 03:51:49 2013 @@ -30,6 +30,7 @@ import org.apache.hupa.shared.domain.Use import org.apache.hupa.shared.events.DeleteClickEvent; import com.google.gwt.core.client.GWT; + HEAD import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; @@ -322,16 +323,28 @@ import org.apache.hupa.client.activity.T integrate all of the views to their corresponding activities and mappers import com.google.gwt.core.client.GWT; +=== +import com.google.gwt.resources.client.CssResource; + dynamical style tool bar import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; public class ToolBarView extends Composite implements ToolBarActivity.Displayable { + @UiField Anchor reply; + @UiField Style style; + public ToolBarView() { initWidget(binder.createAndBindUi(this)); + HEAD make login page as one part of the overall layout splite layout to little one +=== + reply.addStyleName(style.disabledButton()); + dynamical style tool bar } interface ToolBarUiBinder extends UiBinderFlowPanel, ToolBarView { @@ -340,10 +353,17 @@ public class ToolBarView extends Composi
svn commit: r1522264 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.ui.xml MessageListView.java MessagesCellTable.java
Author: dongxu Date: Thu Sep 12 03:52:25 2013 New Revision: 1522264 URL: http://svn.apache.org/r1522264 Log: add click handler to every message row Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522264r1=1522263r2=1522264view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:52:25 2013 @@ -116,7 +116,8 @@ } @sprite .messageContentWorkAround { - margin: 8px; + margin: 8px 0 8px 8px; + padding-right: 8px; gwt-image: 'originLogo'; background-position: center center; width: auto; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522264r1=1522263r2=1522264view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 03:52:25 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.ui; HEAD HEAD + HEAD import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -53,6 +54,10 @@ public class MessageListView extends Com interface MessageListUiBinder extends UiBinderSimpleLayoutPanel, MessageListView { === === +=== +import java.util.List; + + add click handler to every message row import org.apache.hupa.client.activity.MessageListActivity; import org.apache.hupa.client.rf.FetchMessagesRequest; import org.apache.hupa.client.rf.HupaRequestFactory; @@ -84,10 +89,10 @@ import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; import com.google.web.bindery.requestfactory.shared.ServerFailure; -public class MessageListView extends Composite implements MessageListActivity.Displayable { +public class MessageListView extends Composite implements + MessageListActivity.Displayable { - @UiField(provided = true) - DataGridMessage table; + @UiField(provided = true) DataGridMessage table; private HupaRequestFactory requestFactory; private EventBus eventBus; private ImapFolder folder; @@ -96,7 +101,8 @@ public class MessageListView extends Com private boolean pending; @Inject - public MessageListView(final EventBus eventBus, final HupaRequestFactory requestFactory, + public MessageListView(final EventBus eventBus, + final HupaRequestFactory requestFactory, final MessagesCellTable table) { this.requestFactory = requestFactory; this.eventBus = eventBus; @@ -106,12 +112,21 @@ public class MessageListView extends Com @Override public void onCellPreview(CellPreviewEventMessage event) { if (hasClickedButFirstCol(event)) { - eventBus.fireEvent(new ExpandMessageEvent(user, folder, event.getValue())); + ListMessage displayedItems = table.getVisibleItems(); + for (Message msg : displayedItems) { + table.getSelectionModel().setSelected(msg, false); + } + table.getSelectionModel().setSelected(event.getValue(), + true); + eventBus.fireEvent(new ExpandMessageEvent(user, folder, + event.getValue())); } } - private boolean hasClickedButFirstCol(CellPreviewEventMessage event) { - return click.equals(event.getNativeEvent().getType()) 0 != event.getColumn(); + private boolean hasClickedButFirstCol( + CellPreviewEventMessage event
svn commit: r1522263 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/ToolBarView.java ui/ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 03:52:07 2013 New Revision: 1522263 URL: http://svn.apache.org/r1522263 Log: add enable tool bar buttons toggling event, with being related to issue #31 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522263r1=1522262r2=1522263view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 03:52:07 2013 @@ -149,6 +149,10 @@ public class ToolBarActivity extends App } === import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.events.ExpandMessageEvent; +import org.apache.hupa.shared.events.ExpandMessageEventHandler; +import org.apache.hupa.shared.events.LoadMessagesEvent; +import org.apache.hupa.shared.events.LoadMessagesEventHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -156,13 +160,40 @@ import com.google.inject.Inject; public class ToolBarActivity extends AppBaseActivity { + @Inject private Displayable display; + @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); + bindTo(eventBus); } + HEAD @Inject private Displayable display; public interface Displayable extends WidgetDisplayable {} integrate all of the views to their corresponding activities and mappers +=== + private void bindTo(EventBus eventBus) { + eventBus.addHandler(LoadMessagesEvent.TYPE, + new LoadMessagesEventHandler() { + public void onLoadMessagesEvent( + LoadMessagesEvent loadMessagesEvent) { + display.disableMessageTools(); + } + }); + eventBus.addHandler(ExpandMessageEvent.TYPE, + new ExpandMessageEventHandler() { + public void onExpandMessage(ExpandMessageEvent event) { + display.enableMessageTools(); + } + }); + } + + public interface Displayable extends WidgetDisplayable { + void disableMessageTools(); + + void enableMessageTools(); + } + add enable tool bar buttons toggling event, with being related to issue #31 } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522263r1=1522262r2=1522263view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 03:52:07 2013 @@ -331,20 +331,54 @@ import com.google.gwt.uibinder.client.Ui 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.HTMLPanel; public class ToolBarView extends Composite implements ToolBarActivity.Displayable { - @UiField Anchor reply; @UiField Style style; + @UiField Anchor refresh; + @UiField Anchor compose; + @UiField Anchor reply; + @UiField HTMLPanel replyAllGroup; + @UiField Anchor replyAll; + @UiField HTMLPanel forwardGroup; + @UiField Anchor forward; + @UiField Anchor delete; + @UiField Anchor mark; + @UiField Anchor more; + public ToolBarView() { initWidget(binder.createAndBindUi(this)); HEAD + HEAD make login page as one part of the overall layout splite layout to little one === reply.addStyleName(style.disabledButton()); dynamical style tool bar +=== + } + + interface Style extends CssResource { + String disabledButton(); + } + + @Override + public void
svn commit: r1522265 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:52:48 2013 New Revision: 1522265 URL: http://svn.apache.org/r1522265 Log: prepare for place management and history controller Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.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/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522265r1=1522264r2=1522265view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java Thu Sep 12 03:52:48 2013 @@ -243,6 +243,7 @@ public class MessageListActivity extends === === import org.apache.hupa.client.place.IMAPMessagePlace; +import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.rf.GetMessageDetailsRequest; prepare for message content panel import org.apache.hupa.client.ui.WidgetDisplayable; @@ -260,7 +261,6 @@ import org.apache.hupa.shared.events.Log import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.web.bindery.requestfactory.shared.Receiver; public class MessageListActivity extends AppBaseActivity { @@ -315,6 +315,11 @@ public class MessageListActivity extends } }); } + + public MessageListActivity with(MailFolderPlace place){ + display.setFolder(place.getFolder()); + return this; + } private void cloneFolder(ImapFolder desc, ImapFolder src) { desc.setChildren(src.getChildren()); @@ -339,6 +344,7 @@ public class MessageListActivity extends make message content work as expected partly public interface Displayable extends WidgetDisplayable { + void setFolder(ImapFolder folder); } prepare for message content panel } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java?rev=1522265r1=1522264r2=1522265view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java Thu Sep 12 03:52:48 2013 @@ -80,7 +80,7 @@ public class MessageListActivityMapper i === public Activity getActivity(Place place) { if(place instanceof DefaultPlace)return null; - else if (place instanceof MailFolderPlace) return messageListActivityProvider.get(); + else if (place instanceof MailFolderPlace) return messageListActivityProvider.get().with((MailFolderPlace)place); return messageListActivityProvider.get(); integrate all of the views to their corresponding activities and mappers } 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=1522265r1=1522264r2=1522265view=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 03:52:48 2013 @@ -30,14 +30,15 @@ public class MailFolderPlace extends Abs private static final String PREFIX = folder; private User user; private String folderName = ; - - public String getFolderName(){ + + public String getFolderName() { return folderName; } - public void setFolderName(String folderName){ + public void setFolderName(String folderName
svn commit: r1522266 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place: DefaultPlace.java MailFolderPlace.java
Author: dongxu Date: Thu Sep 12 03:53:07 2013 New Revision: 1522266 URL: http://svn.apache.org/r1522266 Log: prepare to manage the places and histories Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1522266r1=1522265r2=1522266view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java Thu Sep 12 03:53:07 2013 @@ -68,7 +68,7 @@ import com.google.gwt.place.shared.Prefi public class DefaultPlace extends AbstractPlace { - @Prefix() + @Prefix(!) public static class Tokenizer implements PlaceTokenizerDefaultPlace { @Override 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=1522266r1=1522265r2=1522266view=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 03:53:07 2013 @@ -27,7 +27,7 @@ import com.google.gwt.place.shared.Prefi public class MailFolderPlace extends AbstractPlace { - private static final String PREFIX = folder; + private static final String PREFIX = ; private User user; private String folderName = ; @@ -83,6 +83,7 @@ public class MailFolderPlace extends Abs @Override public MailFolderPlace getPlace(String token) { + // TODO create place from token rather than with methods such that we can get place we want. return new MailFolderPlace().with(token); } - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522267 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
Author: dongxu Date: Thu Sep 12 03:53:25 2013 New Revision: 1522267 URL: http://svn.apache.org/r1522267 Log: keep active to make change Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java 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=1522267r1=1522266r2=1522267view=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 03:53:25 2013 @@ -27,6 +27,7 @@ import com.google.gwt.place.shared.Prefi public class MailFolderPlace extends AbstractPlace { + // this can remove the colon : private static final String PREFIX = ; private User user; private String folderName = ; - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522268 - in /james/hupa/trunk/client/src/main/java/com/google/gwt: ./ user/ user/client/ user/client/ui/ user/client/ui/SplitLayoutPanel.java
Author: dongxu Date: Thu Sep 12 03:53:49 2013 New Revision: 1522268 URL: http://svn.apache.org/r1522268 Log: get the fixed version of SplitLayoutPanel to fix the hidden children issue Added: james/hupa/trunk/client/src/main/java/com/google/gwt/ james/hupa/trunk/client/src/main/java/com/google/gwt/user/ james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/ james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java Added: james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java?rev=1522268view=auto == --- james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java (added) +++ james/hupa/trunk/client/src/main/java/com/google/gwt/user/client/ui/SplitLayoutPanel.java Thu Sep 12 03:53:49 2013 @@ -0,0 +1,488 @@ +/* + * Copyright 2009 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the License); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.gwt.user.client.ui; + +import com.google.gwt.core.client.Duration; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Element; +import com.google.gwt.dom.client.Style.Position; +import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.Window; + +/** + * A panel that adds user-positioned splitters between each of its child + * widgets. + * + * p + * This panel is used in the same way as {@link DockLayoutPanel}, except that + * its children's sizes are always specified in {@link Unit#PX} units, and each + * pair of child widgets has a splitter between them that the user can drag. + * /p + * + * p + * This widget will emonly/em work in standards mode, which requires that + * the HTML page in which it is run have an explicit lt;!DOCTYPEgt; + * declaration. + * /p + * + * h3CSS Style Rules/h3 + * ul class='css' + * li.gwt-SplitLayoutPanel { the panel itself }/li + * li.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { horizontal dragger + * }/li + * li.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { vertical dragger } + * /li + * /ul + * + * p + * h3Example/h3 + * {@example com.google.gwt.examples.SplitLayoutPanelExample} + * /p + */ +public class SplitLayoutPanel extends DockLayoutPanel { + + class HSplitter extends Splitter { +public HSplitter(Widget target, boolean reverse) { + super(target, reverse); + getElement().getStyle().setPropertyPx(width, splitterSize); + setStyleName(gwt-SplitLayoutPanel-HDragger); +} + +@Override +protected int getAbsolutePosition() { + return getAbsoluteLeft(); +} + +@Override +protected double getCenterSize() { + return getCenterWidth(); +} + +@Override +protected int getEventPosition(Event event) { + return event.getClientX(); +} + +@Override +protected int getTargetPosition() { + return target.getAbsoluteLeft(); +} + +@Override +protected int getTargetSize() { + return target.getOffsetWidth(); +} + } + + abstract class Splitter extends Widget { +protected final Widget target; + +private int offset; +private boolean mouseDown; +private ScheduledCommand layoutCommand; + +private final boolean reverse; +private int minSize; +private int snapClosedSize = -1; +private double centerSize, syncedCenterSize; + +private boolean toggleDisplayAllowed = false; +private double lastClick = 0; + +public Splitter(Widget target, boolean reverse) { + this.target = target; + this.reverse = reverse; + + setElement(Document.get().createDivElement()); + sinkEvents(Event.ONMOUSEDOWN | Event.ONMOUSEUP | Event.ONMOUSEMOVE + | Event.ONDBLCLICK); +} + +@Override +public void onBrowserEvent(Event event) { + switch (event.getTypeInt()) { +case Event.ONMOUSEDOWN: + mouseDown = true; + + /* + * Resize glassElem to take up the entire scrollable window area, + * which is the greater of the scroll size and the client size
svn commit: r1522270 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:54:37 2013 New Revision: 1522270 URL: http://svn.apache.org/r1522270 Log: add logout support Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.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/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522270r1=1522269r2=1522270view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:54:37 2013 @@ -264,7 +264,7 @@ public class HupaController { private final class PlaceChangHandler implements PlaceChangeEvent.Handler { @Override public void onPlaceChange(PlaceChangeEvent event) { - log.fine(place changed to + event.getNewPlace()); +// log.fine(place changed to + event.getNewPlace()); // if (placeChange(event)) { // checkSession(); // } @@ -279,7 +279,6 @@ public class HupaController { if (!(RootLayoutPanel.get().getLayoutData() instanceof HupaLayoutable)) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(hupaLayout.get()); - RootLayoutPanel.get().setLayoutData(hupaLayout); } } else if (newPlace instanceof DefaultPlace) { @@ -288,7 +287,6 @@ public class HupaController { if (!(RootLayoutPanel.get().getLayoutData() instanceof LoginLayoutable)) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); - RootLayoutPanel.get().setLayoutData(loginLayout); } } currentPlace = newPlace; @@ -334,7 +332,7 @@ public class HupaController { if (!sessionValid) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); - log.fine(session invalid); +// log.fine(session invalid); // HupaController.this.placeController // .goTo(new DefaultPlace()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522270r1=1522269r2=1522270view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java Thu Sep 12 03:54:37 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.activity; HEAD + HEAD import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.LogoutUserRequest; @@ -132,21 +133,80 @@ public class TopBarActivity extends AppB return user; } === +=== +import org.apache.hupa.client.place.DefaultPlace; +import org.apache.hupa.client.rf.LogoutUserRequest; +import org.apache.hupa.client.ui.LoginLayoutable; + add logout support import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.domain.LogoutUserResult; +import org.apache.hupa.shared.domain.User; +import org.apache.hupa.shared.events.LoginEvent; +import org.apache.hupa.shared.events.LoginEventHandler; +import org.apache.hupa.shared.events.LogoutEvent
svn commit: r1522269 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/LoginActivity.java ui/HupaLayout.java ui/LoginView.java ui/LoginView.ui.xml
Author: dongxu Date: Thu Sep 12 03:54:11 2013 New Revision: 1522269 URL: http://svn.apache.org/r1522269 Log: prepare for places and do something for loading related to issue #18 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/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml 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=1522269r1=1522268r2=1522269view=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:54:11 2013 @@ -494,6 +494,7 @@ public class LoginActivity extends Abstr @Override public void onFailure(ServerFailure error) { Window.alert(error.getMessage());// TODO a more gentle way + display.setLoading(false); doReset(); // placeController.goTo(new DefaultPlace()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522269r1=1522268r2=1522269view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:54:11 2013 @@ -277,7 +277,6 @@ public class HupaLayout implements HupaL public HupaLayout() { hupaMainPanel = binder.createAndBindUi(this); messageSpace.setWidgetMinSize(folderArea, 144); - messageArea.setWidgetMinSize(messageListBox, 72); messageArea.setWidgetHidden(contactBox, true); messageArea.setWidgetMinSize(messageListBox, 130); } @@ -348,13 +347,7 @@ public class HupaLayout implements HupaL return new AcceptsOneWidget() { @Override public void setWidget(IsWidget w) { -// Widget widget = Widget.asWidgetOrNull(w); messageListContainer.setWidget(Widget.asWidgetOrNull(w)); -// messageListContainer.add(Widget.asWidgetOrNull(w)); -// if (messageListContainer.getWidgetCount() 0) -// messageListContainer.remove(0); -// if (widget != null) -// messageListContainer.add(widget); } }; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522269r1=1522268r2=1522269view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java Thu Sep 12 03:54:11 2013 @@ -75,9 +75,13 @@ import com.google.gwt.event.dom.client.K HEAD HEAD HEAD + HEAD import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; import com.google.gwt.resources.client.CssResource.NotStrict; +=== +import com.google.gwt.resources.client.CssResource; + prepare for places and do something for loading related to issue #18 import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; === @@ -197,12 +201,16 @@ public class LoginView extends Composite === === import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; + HEAD Change to new mvp framework - first step === change the LOGIN progress using native MVP instead of gwt-presenter === import com.google.gwt.user.client.ui.FormPanel.SubmitEvent; Change to new mvp framework - first step +=== +import com.google.gwt.user.client.ui.HTMLPanel; + prepare for places and do something for loading related to issue #18 import com.google.gwt.user.client.ui.HasValue; import com.google.gwt.user.client.ui.Label; import
svn commit: r1522271 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: LoginView.java LoginView.ui.xml
Author: dongxu Date: Thu Sep 12 03:54:56 2013 New Revision: 1522271 URL: http://svn.apache.org/r1522271 Log: dealing with login panel's loading progress ajax loader Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java?rev=1522271r1=1522270r2=1522271view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java Thu Sep 12 03:54:56 2013 @@ -385,12 +385,16 @@ public class LoginView extends Composite // loginButton must be in the document to handle the click() method innerBox.add(loginButton); loginButton.setVisible(false); + HEAD change the LOGIN progress using native MVP instead of gwt-presenter === initWidget(mainContainer); make login form available === replace with uibinder +=== + setLoading(false); + dealing with login panel's loading progress ajax loader } private void createLoginPrompt() { @@ -475,6 +479,7 @@ public class LoginView extends Composite } else { message.removeStyleName(style.loading()); HEAD + HEAD message.removeStyleName(style.display()); message.addStyleName(style.hidden()); === @@ -497,6 +502,10 @@ public class LoginView extends Composite message.addStyleName(style.loading()); } else { message.removeStyleName(style.loading()); +=== + message.removeStyleName(style.display()); + message.addStyleName(style.hidden()); + dealing with login panel's loading progress ajax loader } prepare for places and do something for loading related to issue #18 } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml?rev=1522271r1=1522270r2=1522271view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml Thu Sep 12 03:54:56 2013 @@ -166,7 +166,6 @@ @sprite .loading { gwt-image: 'loading'; - background-position: 2px 6px; } /ui:style make login page as one part of the overall layout splite layout to little one - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522273 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:55:24 2013 New Revision: 1522273 URL: http://svn.apache.org/r1522273 Log: make reload mail folder place work, fixed issue #7 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.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/TopBarActivity.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/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.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/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java?rev=1522273r1=1522272r2=1522273view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java Thu Sep 12 03:55:24 2013 @@ -37,6 +37,7 @@ import com.google.inject.Inject; public class FolderListActivity extends AppBaseActivity { HEAD + HEAD @Inject private Displayable display; @Override @@ -59,13 +60,22 @@ public class FolderListActivity extends void refresh(); } === +=== + @Inject private Displayable display; + + make reload mail folder place work, fixed issue #7 @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); } + HEAD @Inject private Displayable display; public interface Displayable extends WidgetDisplayable {} integrate all of the views to their corresponding activities and mappers +=== + public interface Displayable extends WidgetDisplayable { + } + make reload mail folder place work, fixed issue #7 } 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=1522273r1=1522272r2=1522273view=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:55:24 2013 @@ -488,7 +488,6 @@ public class LoginActivity extends Abstr RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(hupaLayout.get()); placeController.goTo(new MailFolderPlace()); -// placeController.goTo(new MailFolderPlace().with(response, useDefaultInboxFolder(response), null)); eventBus.fireEvent(new LoginEvent(response)); } @Override Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522273r1=1522272r2=1522273view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java Thu Sep 12 03:55:24 2013 @@ -154,6 +154,7 @@ import com.google.gwt.user.client.ui.HTM import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; +import com.google.web.bindery.requestfactory.shared.ServerFailure; public class TopBarActivity extends AppBaseActivity { @@ -197,7 +198,16 @@ public class TopBarActivity extends AppB eventBus.fireEvent(new LogoutEvent(response.getUser())); RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get
svn commit: r1522275 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:56:23 2013 New Revision: 1522275 URL: http://svn.apache.org/r1522275 Log: scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.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/MessageContentActivity.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/mapper/MessageContentActivityMapper.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/ui/MessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522275r1=1522274r2=1522275view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:56:23 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client; HEAD HEAD + HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -50,9 +51,9 @@ import com.google.gwt.core.client.Schedu import java.util.logging.Logger; remove some warnings and create the AbstractPlace that can give place infomation +=== + scrub code import org.apache.hupa.client.bundles.HupaResources; -import org.apache.hupa.client.place.DefaultPlace; -import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.HupaLayoutable; @@ -61,7 +62,6 @@ import org.apache.hupa.client.ui.LoginLa move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; import com.google.gwt.event.shared.EventBus; -import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceChangeEvent; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.place.shared.PlaceHistoryHandler; @@ -105,13 +105,8 @@ public class HupaController { @Inject private HupaLayoutable hupaLayout; @Inject private PlaceController placeController; @Inject private HupaRequestFactory requestFactory; - private Place currentPlace; - @Inject private LoginLayoutable loginLayout; - private static final Logger log = Logger.getLogger(HupaController.class - .getName()); - @Inject HEAD public HupaController(EventBus eventBus) { @@ -264,60 +259,6 @@ public class HupaController { private final class PlaceChangHandler implements PlaceChangeEvent.Handler { @Override public void onPlaceChange(PlaceChangeEvent event) { -// log.fine(place changed to + event.getNewPlace()); - // if (placeChange(event)) { - // checkSession(); - // } - // refreshActivities(event); - } - - private void refreshActivities(PlaceChangeEvent event) { - Place newPlace = event.getNewPlace(); - if (newPlace != currentPlace) { - if (isAuth(newPlace, currentPlace)) { - // appPanelView.setDefaultLayout(); - if (!(RootLayoutPanel.get().getLayoutData() instanceof HupaLayoutable)) { - RootLayoutPanel.get().clear(); - RootLayoutPanel.get().add(hupaLayout.get()); - - } - } else if (newPlace instanceof DefaultPlace) { - // appPanelView.setLoginLayout(); - - if (!(RootLayoutPanel.get().getLayoutData() instanceof LoginLayoutable)) { - RootLayoutPanel.get().clear(); - RootLayoutPanel.get().add(loginLayout.get()); - } - } - currentPlace = newPlace; - } - } - - // - // private void checkSession
svn commit: r1522274 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:55:54 2013 New Revision: 1522274 URL: http://svn.apache.org/r1522274 Log: make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.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/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.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=1522274r1=1522273r2=1522274view=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:55:54 2013 @@ -869,7 +869,7 @@ public class IMAPMessageListActivity ext } public IMAPMessageListActivity with(MailFolderPlace place) { this.user = place.getUser(); - this.folder = place.getFolder(); +// this.folder = place.getFolder(); this.searchValue = place.getSearchValue(); HEAD HEAD 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=1522274r1=1522273r2=1522274view=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:55:54 2013 @@ -487,7 +487,7 @@ public class LoginActivity extends Abstr public void onSuccess(User response) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(hupaLayout.get()); - placeController.goTo(new MailFolderPlace()); + placeController.goTo(new MailFolderPlace(response.getSettings().getDraftsFolderName())); eventBus.fireEvent(new LoginEvent(response)); } @Override Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522274r1=1522273r2=1522274view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java Thu Sep 12 03:55:54 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.activity; HEAD HEAD + HEAD import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -165,35 +166,65 @@ public class MessageContentActivity exte === import org.apache.hupa.client.place.IMAPMessagePlace; make message content work as expected partly +=== +import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.rf.GetMessageDetailsRequest; + make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's import org.apache.hupa.client.ui.WidgetDisplayable; -import org.apache.hupa.shared.domain.MessageDetails; +import org.apache.hupa.shared.domain.GetMessageDetailsAction; +import org.apache.hupa.shared.domain.GetMessageDetailsResult
svn commit: r1522276 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/
Author: dongxu Date: Thu Sep 12 03:56:50 2013 New Revision: 1522276 URL: http://svn.apache.org/r1522276 Log: support code split Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522276r1=1522275r2=1522276view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper; import org.apache.hupa.client.activity.FolderListActivity; HEAD HEAD + HEAD import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.activity.shared.Activity; @@ -30,12 +31,19 @@ import com.google.gwt.core.client.RunAsy === === import org.apache.hupa.client.place.DefaultPlace; +=== + support code split import org.apache.hupa.client.place.MailFolderPlace; make folder list panel work as expected import com.google.gwt.activity.shared.Activity; import com.google.gwt.activity.shared.ActivityMapper; + HEAD integrate all of the views to their corresponding activities and mappers +=== +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; + support code split import com.google.gwt.place.shared.Place; import com.google.inject.Inject; import com.google.inject.Provider; @@ -48,7 +56,8 @@ public class FolderListActivityMapper im private final ProviderFolderListActivity folderListActivityProvider; @Inject - public FolderListActivityMapper(ProviderFolderListActivity folderListActivityProvider) { + public FolderListActivityMapper( + ProviderFolderListActivity folderListActivityProvider) { this.folderListActivityProvider = folderListActivityProvider; } @@ -71,9 +80,27 @@ public class FolderListActivityMapper im === public Activity getActivity(Place place) { + HEAD if(place instanceof DefaultPlace)return null; else if (place instanceof MailFolderPlace) folderListActivityProvider.get(); return folderListActivityProvider.get(); integrate all of the views to their corresponding activities and mappers +=== + if (place instanceof MailFolderPlace) { + return new ActivityAsyncProxy() { + @Override + protected void doAsync(RunAsyncCallback callback) { + GWT.runAsync(callback); + } + + @Override + protected Activity createInstance() { + return folderListActivityProvider.get(); + } + }; + + } + return null; + support code split } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java?rev=1522276r1=1522275r2=1522276view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LoginActivityMapper.java Thu Sep 12 03:56:50 2013 @@ -24,10 +24,15 @@ import org.apache.hupa.client.activity.L import com.google.gwt.activity.shared.Activity; import
svn commit: r1522277 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ bundles/ evo/ ui/ ui/res/
Author: dongxu Date: Thu Sep 12 03:57:26 2013 New Revision: 1522277 URL: http://svn.apache.org/r1522277 Log: scrub login view code, use css by a unique way Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css~HEAD - copied, changed from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css~HEAD - copied, changed from r1522276, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/HupaResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/hupa-logo-49-transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/hupa-logo-64-transparent.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/login_shadow.png james/hupa/trunk/client/src/main/java/org/apache/hupa/client/bundles/styles.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CellTree.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGrid.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/DataGridResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/TreeResources.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/linen_login.jpg james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/login_shadow.png Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522277r1=1522276r2=1522277view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:57:26 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client; HEAD HEAD HEAD + HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -54,10 +55,13 @@ import java.util.logging.Logger; === scrub code import org.apache.hupa.client.bundles.HupaResources; +=== + scrub login view code, use css by a unique way import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.HupaLayoutable; import org.apache.hupa.client.ui.LoginLayoutable; +import org.apache.hupa.client.ui.LoginView; move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; @@ -253,7 +257,7 @@ public class HupaController { private void bindCss() { // TODO:replace with a more gentle approach - StyleInjector.inject(HupaResources.INSTANCE.stylesheet().getText()); + StyleInjector.inject(LoginView.Resources.INSTANCE.stylesheet().getText()); } private final class PlaceChangHandler implements PlaceChangeEvent.Handler { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522277r1=1522276r2=1522277view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java Thu Sep 12 03:57:26 2013 @@ -19,14 +19,12 @@ package org.apache.hupa.client.evo; -import org.apache.hupa.client.bundles.HupaResources; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.rf.CheckSessionRequest; import
svn commit: r1522278 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: CenterPanel.java CenterPanel.ui.xml FoldersTreeViewModel.java HupaLayout.java HupaLayout.ui.xml ToolPanel.ja
Author: dongxu Date: Thu Sep 12 03:57:53 2013 New Revision: 1522278 URL: http://svn.apache.org/r1522278 Log: split the layout panel to little ones Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java?rev=1522278view=auto == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java (added) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java Thu Sep 12 03:57:53 2013 @@ -0,0 +1,110 @@ +/ + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information* + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the* + * License); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the* + * specific language governing permissions and limitations * + * under the License. * + / + +package org.apache.hupa.client.ui; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.SimpleLayoutPanel; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.Widget; + +public class CenterPanel extends Composite { + + @UiField SplitLayoutPanel centerPanel; + @UiField DockLayoutPanel folderArea; + + @UiField SplitLayoutPanel messageArea; + @UiField ScrollPanel folderListContainer; + @UiField DockLayoutPanel messageListBox; + @UiField SimpleLayoutPanel messageListContainer; + @UiField SimplePanel messageListFooterContainer; + @UiField ScrollPanel messageContentContainer; + @UiField SimplePanel statusContainer; + + @UiField HTMLPanel contactBox; + + public CenterPanel() { + initWidget(binder.createAndBindUi(this)); + centerPanel.setWidgetMinSize(folderArea, 144); + messageArea.setWidgetHidden(contactBox, true); + messageArea.setWidgetMinSize(messageListBox, 130); + } + + public AcceptsOneWidget getFolderListView() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + folderListContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + + public AcceptsOneWidget getMessageListView() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + messageListContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + + public AcceptsOneWidget getMessageListFooterView() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w
svn commit: r1522279 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/
Author: dongxu Date: Thu Sep 12 03:58:28 2013 New Revision: 1522279 URL: http://svn.apache.org/r1522279 Log: split the layout panel to more small ones Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD - copied, changed from r1522278, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD - copied, changed from r1522278, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD - copied, changed from r1522278, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD - copied, changed from r1522278, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/CenterPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522279r1=1522278r2=1522279view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:58:28 2013 @@ -253,9 +253,9 @@ public class HupaLayout implements HupaL @UiField SimplePanel logoContainer; @UiField SimpleLayoutPanel navigationContainer; - @UiField ToolPanel toolPanel; + @UiField _ToolPanel toolPanel; - @UiField CenterPanel centerPanel; + @UiField _CenterPanel centerPanel; private LayoutPanel hupaMainPanel; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522279r1=1522278r2=1522279view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:58:28 2013 @@ -236,10 +236,10 @@ g:layer left='10px' right='10px' top='88px' bottom=20px g:DockLayoutPanel ui:field=mainBox g:north size=40 - hupa:ToolPanel ui:field=toolPanel / + hupa:_ToolPanel ui:field=toolPanel / /g:north g:center - hupa:CenterPanel ui:field=centerPanel / + hupa:_CenterPanel ui:field=centerPanel / /g:center /g:DockLayoutPanel HEAD Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java?rev=1522279r1=1522278r2=1522279view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java Thu Sep 12 03:58:28 2013 @@ -28,9 +28,15 @@ import
svn commit: r1522280 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.ui.xml ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 03:58:57 2013 New Revision: 1522280 URL: http://svn.apache.org/r1522280 Log: make fine tuning with tool buttons in toolbar Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522280r1=1522279r2=1522280view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:58:57 2013 @@ -232,10 +232,14 @@ /g:center /g:DockLayoutPanel /g:layer + HEAD === g:layer left='10px' right='10px' top='88px' bottom=20px +=== + g:layer left='10px' right='10px' top='84px' bottom=20px + make fine tuning with tool buttons in toolbar g:DockLayoutPanel ui:field=mainBox - g:north size=40 + g:north size=44 hupa:_ToolPanel ui:field=toolPanel / /g:north g:center Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522280r1=1522279r2=1522280view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Thu Sep 12 03:58:57 2013 @@ -37,7 +37,7 @@ beautify message list and content right: 390px; left: 0; - height: 36px; + height: 40px; white-space: nowrap; z-index: 10; } - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522283 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java _CenterPanel.java _CenterPanel.ui.xml __ComposePanel.java __ComposePanel.ui.xml
Author: dongxu Date: Thu Sep 12 04:00:11 2013 New Revision: 1522283 URL: http://svn.apache.org/r1522283 Log: preparing for composing panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522283r1=1522282r2=1522283view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:00:11 2013 @@ -235,11 +235,10 @@ public class FolderListView extends Comp final EventBus eventBus, @Assisted Place place) { if (place instanceof MailFolderPlace) { cellTree = new CellTree(viewModel, null, Resources.INSTANCE); - cellTree.setAnimationEnabled(true); - } else { + } else {// TODO this viewModel should be contacts cellTree = new CellTree(viewModel, null); - cellTree.setAnimationEnabled(true); } + cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); make login page as one part of the overall layout splite layout to little one } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java?rev=1522283r1=1522282r2=1522283view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java Thu Sep 12 04:00:11 2013 @@ -36,11 +36,18 @@ public class _CenterPanel extends Compos @UiField SplitLayoutPanel thisPanel; @UiField __OutlinePanel outlinePanel; @UiField __ContentPanel contentPanel; + HEAD split the layout panel to more small ones +=== + @UiField __ComposePanel composePanel; + preparing for composing panel public _CenterPanel() { initWidget(binder.createAndBindUi(this)); thisPanel.setWidgetMinSize(outlinePanel, 144); + thisPanel.setWidgetHidden(composePanel, true); + thisPanel.remove(contentPanel); + thisPanel.add(composePanel); } public AcceptsOneWidget getFolderListView() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml?rev=1522283r1=1522282r2=1522283view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml Thu Sep 12 04:00:11 2013 @@ -25,5 +25,8 @@ g:center hupa:__ContentPanel ui:field=contentPanel / /g:center + g:south size=0 + hupa:__ComposePanel ui:field=composePanel / + /g:south /g:SplitLayoutPanel /ui:UiBinder \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522283r1=1522282r2=1522283view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:00:11 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.ui; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; + HEAD import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; @@ -74,4 +75,84 @@ public
svn commit: r1522282 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java __OutlinePanel.ui.xml
Author: dongxu Date: Thu Sep 12 03:59:50 2013 New Revision: 1522282 URL: http://svn.apache.org/r1522282 Log: fine tuning on folder list footer panel's border Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522282r1=1522281r2=1522282view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 03:59:50 2013 @@ -233,7 +233,6 @@ public class FolderListView extends Comp @AssistedInject public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus, @Assisted Place place) { - System.out.println(place); if (place instanceof MailFolderPlace) { cellTree = new CellTree(viewModel, null, Resources.INSTANCE); cellTree.setAnimationEnabled(true); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml?rev=1522282r1=1522281r2=1522282view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml Thu Sep 12 03:59:50 2013 @@ -13,6 +13,7 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui' ui:style HEAD + HEAD .box { border: 1px solid #A3A3A3; border-radius: 4px; @@ -39,6 +40,8 @@ HEAD === +=== + fine tuning on folder list footer panel's border .box { border: 1px solid #A3A3A3; border-radius: 4px; @@ -50,7 +53,21 @@ background: white; } + HEAD split the layout panel to more small ones +=== + .folderList { + position: absolute; + top: 0; + left: 0; + width: 100%; + min-width: 144px; + bottom: 0; + overflow-x: hidden; + overflow-y: auto; + } + + fine tuning on folder list footer panel's border .listBox { background: #D9ECF4; overflow: hidden; @@ -59,13 +76,19 @@ .box .boxFooter { border-radius: 0 0 4px 4px; HEAD + HEAD +=== + fine tuning on folder list footer panel's border border-top: 1px solid #ccdde4; -webkit-box-shadow: inset 0 1px 0 0 #fff; -moz-box-shadow: inset 0 1px 0 0 #fff; box-shadow: inset 0 1px 0 0 #fff; background: #d9ecf4; + HEAD === split the layout panel to more small ones +=== + fine tuning on folder list footer panel's border } /ui:style g:DockLayoutPanel unit=PX ui:field=thisPanel - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522281 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ ioc/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 03:59:31 2013 New Revision: 1522281 URL: http://svn.apache.org/r1522281 Log: use GinFactoryModuleBuilder to inject multiple displayable instances of some activities Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/FolderListFactory.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java~HEAD - copied, changed from r1522280, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaActivityManagerInitializer.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.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/mapper/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.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/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522281r1=1522280r2=1522281view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:59:31 2013 @@ -23,6 +23,7 @@ package org.apache.hupa.client; HEAD HEAD HEAD + HEAD import org.apache.hupa.client.activity.NotificationActivity; import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopBarActivity; @@ -32,6 +33,9 @@ import org.apache.hupa.client.place.Cont import org.apache.hupa.client.place.FolderPlace; import org.apache.hupa.client.place.HupaPlace; import org.apache.hupa.client.place.SettingPlace; +=== +import org.apache.hupa.client.mapper.ActivityManagerInitializer; + use GinFactoryModuleBuilder to inject multiple displayable instances of some activities import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.rf.IdleRequest; @@ -117,8 +121,12 @@ public class HupaController { move new theme ui from experiment to hupa evo === public HupaController(EventBus eventBus, + HEAD HupaActivityManagerInitializer initializeActivityManagerByGin) { make login page as one part of the overall layout splite layout to little one +=== + ActivityManagerInitializer initializeActivityManagerByGin) { + use GinFactoryModuleBuilder to inject multiple displayable instances of some activities eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceChangHandler()); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java?rev=1522281r1=1522280r2=1522281view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java Thu Sep 12 03:59:31 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.activity; HEAD + HEAD import org.apache.hupa.shared.events.RefreshUnreadEvent; import org.apache.hupa.shared.events.RefreshUnreadEventHandler; @@ -27,9 +28,13 @@ import com.google.gwt.event.shared.Event import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.IsWidget; === +=== +import org.apache.hupa.client.ioc.FolderListFactory; + use GinFactoryModuleBuilder to inject multiple displayable instances of some activities import org.apache.hupa.client.ui.WidgetDisplayable; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.place.shared.Place; import com.google.gwt.user.client.ui.AcceptsOneWidget; integrate all of the views to their corresponding activities and mappers import com.google.inject.Inject; @@ -38,10 +43,19 @@ public class FolderListActivity extends HEAD HEAD + HEAD @Inject private Displayable display; +=== + @Inject private FolderListFactory folderListFactory
svn commit: r1522286 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: __ComposePanel.java __ComposePanel.ui.xml
Author: dongxu Date: Thu Sep 12 04:01:20 2013 New Revision: 1522286 URL: http://svn.apache.org/r1522286 Log: fine tuning the pixel of composing panel, while issue #35 should be fixed later Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522286r1=1522285r2=1522286view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:01:20 2013 @@ -88,8 +88,8 @@ import com.google.gwt.user.client.ui.Com import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; -import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; @@ -99,11 +99,18 @@ public class __ComposePanel extends Comp @UiField FlexTable headerTable; @UiField Style style; + interface Style extends CssResource { String hiddenInput(); + String add(); + String iconlink(); + String formlinks(); + String left(); + String right(); + String operation(); } public interface Resources extends ClientBundle { @@ -117,8 +124,6 @@ public class __ComposePanel extends Comp public interface Css extends CssResource { } } - - public __ComposePanel() { initWidget(binder.createAndBindUi(this)); @@ -126,9 +131,9 @@ public class __ComposePanel extends Comp RowFormatter rowFormatter = headerTable.getRowFormatter(); // Add some text -// cellFormatter.setHorizontalAlignment(0, 1, -// HasHorizontalAlignment.ALIGN_RIGHT); - + // cellFormatter.setHorizontalAlignment(0, 1, + // HasHorizontalAlignment.ALIGN_RIGHT); + headerTable.setWidget(0, 0, new Label(From)); headerTable.setWidget(1, 0, new Label(To)); @@ -142,27 +147,34 @@ public class __ComposePanel extends Comp // Add a button that will add more rows to the table ListBox lb = new ListBox(); - lb.addItem(foo); + lb.addItem(echowdx#googlemail.com); lb.addItem(bar); Button addRowButton = new Button(Send message); Button removeRowButton = new Button(Save as draft); Button cancel = new Button(Cancel); - HorizontalPanel buttonPanel = new HorizontalPanel(); - buttonPanel.add(lb); -// buttonPanel.add(new Anchor(Edit identities)); + FlowPanel operationPanel = new FlowPanel(); + FlowPanel contactPanel = new FlowPanel(); + FlowPanel buttonPanel = new FlowPanel(); + + contactPanel.add(lb); + contactPanel.addStyleName(style.left()); + // buttonPanel.add(new Anchor(Edit identities)); buttonPanel.add(addRowButton); buttonPanel.add(removeRowButton); buttonPanel.add(cancel); - headerTable.setWidget(0, 1, buttonPanel); + buttonPanel.addStyleName(style.right()); + operationPanel.add(contactPanel); + operationPanel.add(buttonPanel); + operationPanel.addStyleName(style.operation()); + headerTable.setWidget(0, 1, operationPanel); headerTable.setWidget(1, 1, create()); - + headerTable.setWidget(2, 1, create()); headerTable.setWidget(3, 1, create()); headerTable.setWidget(4, 1, create()); headerTable.setWidget(5, 1, create()); - - HorizontalPanel linkPanel = new HorizontalPanel(); + FlowPanel linkPanel = new FlowPanel(); Anchor cc = new Anchor(Add Cc); cc.addStyleName(style.iconlink()); cc.addStyleName(style.add()); @@ -182,7 +194,7 @@ public class __ComposePanel extends Comp headerTable.setWidget(6, 1, linkPanel
svn commit: r1522287 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml
Author: dongxu Date: Thu Sep 12 04:01:37 2013 New Revision: 1522287 URL: http://svn.apache.org/r1522287 Log: prepare for the composing content, attachment and status panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml?rev=1522287r1=1522286r2=1522287view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Thu Sep 12 04:01:37 2013 @@ -128,6 +128,65 @@ color: #666; cursor: default; } + + .composeoptionsbox { + padding: 4px 8px 0 8px; + background: #d2d2d2; + border-bottom: 1px solid #e8e8e8; + -webkit-box-shadow: 0 2px 3px 0 #999; + -moz-box-shadow: 0 2px 3px 0 #999; + box-shadow: 0 2px 3px 0 #999; + white-space: nowrap; + } + + .composebodycontainer { + position: absolute; + top: 0; + left: 0; + right: 260px; + bottom: 0; + } + + .composeattachments { + position: absolute; + right: 0; + top: 1px; + bottom: 0; + width: 240px; + background: #f0f0f0; + border-left: 1px solid #ddd; + padding: 8px; + overflow: auto; + } + + .mailviewbottom { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 26px; + } + + .statusbar { + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 27px; + padding-left: 8px; + border-top: 1px solid #ddd; + border-radius: 0 0 4px 4px; + background: #eaeaea; + background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eaeaea), + color-stop(100%, #c8c8c8) ); + background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%); + background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%); + background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } /ui:style g:DockLayoutPanel ui:field=thisPanel unit=PX addStyleNames={style.box} @@ -160,19 +219,21 @@ g:center g:DockLayoutPanel ui:field=composeContent unit=PX g:north size=23 - g:HTMLPanelcomposeOption/g:HTMLPanel + g:HTMLPanel addStyleNames={style.composeoptionsbox}composeOption/g:HTMLPanel /g:north g:east size=257 - g:HTMLPanelcomposeAttachment/g:HTMLPanel + g:HTMLPanel addStyleNames={style.composeattachments}composeAttachment + /g:HTMLPanel /g:east g:center - g:HTMLPanelcomposeBody/g:HTMLPanel + g:HTMLPanel addStyleNames={style.composebodycontainer}composeBody/g:HTMLPanel /g:center /g:DockLayoutPanel /g:center g:south size=28 - g:SimplePanel ui:field=composeStatus - g:HTMLPanelcomposeStatus/g:HTMLPanel + g:SimplePanel ui:field=composeStatus + addStyleNames={style.mailviewbottom}{style.box} + g:HTMLPanel
svn commit: r1522285 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: mapper/ place/ ui/ ui/res/
Author: dongxu Date: Thu Sep 12 04:01:01 2013 New Revision: 1522285 URL: http://svn.apache.org/r1522285 Log: beautify composing panel Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssComposePanel.css (with props) Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522285r1=1522284r2=1522285view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java Thu Sep 12 04:01:01 2013 @@ -19,6 +19,7 @@ package org.apache.hupa.client.mapper; +import org.apache.hupa.client.place.ComposePlace; import org.apache.hupa.client.place.DefaultPlace; import org.apache.hupa.client.place.IMAPMessagePlace; import org.apache.hupa.client.place.MailFolderPlace; @@ -31,7 +32,8 @@ import com.google.gwt.place.shared.WithT DefaultPlace.Tokenizer.class, MailFolderPlace.Tokenizer.class, MessageSendPlace.Tokenizer.class, -IMAPMessagePlace.Tokenizer.class +IMAPMessagePlace.Tokenizer.class, +ComposePlace.Tokenizer.class }) public interface AppPlaceHistoryMapper extends PlaceHistoryMapper { } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java?rev=1522285r1=1522284r2=1522285view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java Thu Sep 12 04:01:01 2013 @@ -31,8 +31,12 @@ import com.google.gwt.place.shared.Prefi public class ComposePlace extends AbstractPlace { HEAD + HEAD private String token; private Parameters parameters; +=== + private String token; + beautify composing panel public ComposePlace(String token) { this.token = token; @@ -55,6 +59,7 @@ public class ComposePlace extends Abstra return place.getToken(); } } + HEAD public Place with(Parameters parameters) { this.parameters = parameters; @@ -79,5 +84,7 @@ public class ComposePlace extends Abstra } } composing composing panel +=== + beautify composing panel } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522285r1=1522284r2=1522285view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:01:01 2013 @@ -210,7 +210,7 @@ public class FolderListView extends Comp === === import org.apache.hupa.client.activity.FolderListActivity; -import org.apache.hupa.client.place.MailFolderPlace; +import org.apache.hupa.client.place.ComposePlace; integrate all of the views to their corresponding activities and mappers import com.google.gwt.core.client.GWT; @@ -233,10 +233,11 @@ public class FolderListView extends Comp @AssistedInject public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus, @Assisted Place place) { - if (place instanceof MailFolderPlace) { - cellTree = new CellTree(viewModel, null, Resources.INSTANCE); - } else {// TODO this viewModel should be contacts + if (place instanceof ComposePlace) { + // TODO this viewModel should be contacts cellTree = new CellTree(viewModel, null); + } else { + cellTree = new CellTree(viewModel, null, Resources.INSTANCE
svn commit: r1522288 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Author: dongxu Date: Thu Sep 12 04:01:58 2013 New Revision: 1522288 URL: http://svn.apache.org/r1522288 Log: add a logger to folder list view for logging the switching activity Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522288r1=1522287r2=1522288view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:01:58 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.ui; HEAD HEAD + HEAD import java.util.ArrayList; import java.util.List; @@ -209,6 +210,10 @@ public class FolderListView extends Comp } === === +=== +import java.util.logging.Logger; + + add a logger to folder list view for logging the switching activity import org.apache.hupa.client.activity.FolderListActivity; import org.apache.hupa.client.place.ComposePlace; @@ -227,7 +232,8 @@ import com.google.inject.assistedinject. public class FolderListView extends Composite implements FolderListActivity.Displayable { - + private static final Logger log = Logger.getLogger(FolderListView.class + .getName()); @UiField(provided = true) CellTree cellTree; @AssistedInject @@ -236,8 +242,10 @@ public class FolderListView extends Comp if (place instanceof ComposePlace) { // TODO this viewModel should be contacts cellTree = new CellTree(viewModel, null); + log.fine(+++swith to compose); } else { cellTree = new CellTree(viewModel, null, Resources.INSTANCE); + log.fine(---swith to other place); } cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522290 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java FolderListView.ui.xml
Author: dongxu Date: Thu Sep 12 04:02:21 2013 New Revision: 1522290 URL: http://svn.apache.org/r1522290 Log: make compose panel left another widget rather than cell tree Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522290r1=1522289r2=1522290view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:02:21 2013 @@ -226,30 +226,45 @@ import com.google.gwt.uibinder.client.Ui import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.cellview.client.CellTree; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; public class FolderListView extends Composite implements FolderListActivity.Displayable { - private static final Logger log = Logger.getLogger(FolderListView.class - .getName()); - @UiField(provided = true) CellTree cellTree; + @UiField SimplePanel thisView; + private CellTree cellTree; + // FIXME here we can not support another cell tree, since both of their style + // would not be cleared. + private HTMLPanel contactPanel; @AssistedInject public FolderListView(final FoldersTreeViewModel viewModel, final EventBus eventBus, @Assisted Place place) { + initWidget(binder.createAndBindUi(this)); if (place instanceof ComposePlace) { - // TODO this viewModel should be contacts - cellTree = new CellTree(viewModel, null); - log.fine(+++swith to compose); + contactPanel = new HTMLPanel(contacts list); + if (thisView.getWidget() != null +thisView.getWidget() instanceof CellTree) { + thisView.remove(cellTree); + } + thisView.add(contactPanel); } else { cellTree = new CellTree(viewModel, null, Resources.INSTANCE); - log.fine(---swith to other place); + cellTree.setAnimationEnabled(true); + if (thisView.getWidget() != null +thisView.getWidget() instanceof HTMLPanel) { + thisView.remove(contactPanel); + } + thisView.add(cellTree); } + HEAD cellTree.setAnimationEnabled(true); initWidget(binder.createAndBindUi(this)); make login page as one part of the overall layout splite layout to little one +=== + make compose panel left another widget rather than cell tree } public interface Resources extends CellTree.Resources { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1522290r1=1522289r2=1522290view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml Thu Sep 12 04:02:21 2013 @@ -27,9 +27,13 @@ track the folder list tree model issue of invalid session, TODO how to retrieve folders data using GIN === xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:c='urn:import:com.google.gwt.user.cellview.client' + HEAD make message list view panel work as expected partly g:SimplePanel ui:field=FolderListView c:CellTree ui:field=cellTree / /g:SimplePanel make login page as one part of the overall layout splite layout to little one +=== + g:SimplePanel ui:field=thisView / + make compose panel left another widget rather than cell tree /ui:UiBinder \ No newline at end of file - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522291 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: HupaController.java ui/HupaLayout.java ui/HupaLayoutable.java ui/_CenterPanel.java
Author: dongxu Date: Thu Sep 12 04:02:45 2013 New Revision: 1522291 URL: http://svn.apache.org/r1522291 Log: could change main panel dynamically currently by clicking the compose button Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522291r1=1522290r2=1522291view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 04:02:45 2013 @@ -29,6 +29,7 @@ import org.apache.hupa.client.activity.T import org.apache.hupa.client.activity.TopBarActivity; import org.apache.hupa.client.mapper.ActivityManagerInitializer; import org.apache.hupa.client.place.ComposePlace; + HEAD import org.apache.hupa.client.place.ContactPlace; import org.apache.hupa.client.place.FolderPlace; import org.apache.hupa.client.place.HupaPlace; @@ -61,6 +62,8 @@ import java.util.logging.Logger; import org.apache.hupa.client.bundles.HupaResources; === scrub login view code, use css by a unique way +=== + could change main panel dynamically currently by clicking the compose button import org.apache.hupa.client.rf.CheckSessionRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.ui.HupaLayoutable; @@ -70,6 +73,7 @@ import org.apache.hupa.client.ui.LoginVi move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceChangeEvent; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.place.shared.PlaceHistoryHandler; @@ -265,12 +269,23 @@ public class HupaController { private void bindCss() { // TODO:replace with a more gentle approach - StyleInjector.inject(LoginView.Resources.INSTANCE.stylesheet().getText()); + StyleInjector.inject(LoginView.Resources.INSTANCE.stylesheet() + .getText()); } private final class PlaceChangHandler implements PlaceChangeEvent.Handler { @Override public void onPlaceChange(PlaceChangeEvent event) { + adjustLayout(event); + } + } + + private void adjustLayout(PlaceChangeEvent event) { + Place place = event.getNewPlace(); + if (place instanceof ComposePlace) { + hupaLayout.switchToCompose(); + } else { + hupaLayout.switchToMessage(); } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522291r1=1522290r2=1522291view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 04:02:45 2013 @@ -335,9 +335,30 @@ public class HupaLayout implements HupaL } HEAD + HEAD public interface HupaLayout { LayoutPanel get(); move new theme ui from experiment to hupa evo === make login page as one part of the overall layout splite layout to little one +=== + @Override + public void switchToCompose() { + if (centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel) = 0) { + centerPanel.thisPanel.remove(centerPanel.contentPanel); + centerPanel.thisPanel.add(centerPanel.composePanel); + } + } + + @Override + public void switchToMessage() { + if (centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel) = 0) + return; + if (centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel) = 0) { + centerPanel.thisPanel.remove(centerPanel.composePanel); + centerPanel.thisPanel.add(centerPanel.contentPanel); + } + } + + could change main panel dynamically currently by clicking the compose button } Modified: james/hupa/trunk/client/src
svn commit: r1522292 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java _ToolPanel.java __ComposePanel.java __ContentPanel.java __OutlinePanel.java
Author: dongxu Date: Thu Sep 12 04:03:07 2013 New Revision: 1522292 URL: http://svn.apache.org/r1522292 Log: scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522292r1=1522291r2=1522292view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:03:07 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.ui; HEAD HEAD HEAD + HEAD import java.util.ArrayList; import java.util.List; @@ -214,6 +215,8 @@ public class FolderListView extends Comp import java.util.logging.Logger; add a logger to folder list view for logging the switching activity +=== + scrub code import org.apache.hupa.client.activity.FolderListActivity; import org.apache.hupa.client.place.ComposePlace; @@ -235,7 +238,8 @@ public class FolderListView extends Comp FolderListActivity.Displayable { @UiField SimplePanel thisView; private CellTree cellTree; - // FIXME here we can not support another cell tree, since both of their style + // FIXME here we can not support another cell tree, since both of their + // style // would not be cleared. private HTMLPanel contactPanel; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java?rev=1522292r1=1522291r2=1522292view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java Thu Sep 12 04:03:07 2013 @@ -19,8 +19,6 @@ package org.apache.hupa.client.ui; -import org.apache.hupa.client.activity.StatusActivity; - import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -31,7 +29,7 @@ import com.google.gwt.user.client.ui.IsW import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -public class _ToolPanel extends Composite implements StatusActivity.Displayable { +public class _ToolPanel extends Composite { @UiField SimplePanel toolBarContainer; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522292r1=1522291r2=1522292view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:03:07 2013 @@ -90,7 +90,6 @@ import com.google.gwt.user.client.ui.Fle import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.TextBox; @@ -217,38 +216,6 @@ public class __ComposePanel extends Comp return t; } - /** -* Add a row to the flex table. -*/ - private void addRow(FlexTable flexTable) { - int numRows = flexTable.getRowCount(); - ListBox lb = new ListBox(); - lb.addItem(foo); - lb.addItem(bar); - Button addRowButton = new Button(cwFlexTableAddRow); - Button removeRowButton = new Button(cwFlexTableRemoveRow); - HorizontalPanel buttonPanel = new HorizontalPanel(); - buttonPanel.add(new Anchor(logo)); - buttonPanel.add(lb); - buttonPanel.add(addRowButton); - buttonPanel.add(removeRowButton); - - flexTable.setWidget(numRows, 0, buttonPanel); - flexTable.setWidget(numRows
svn commit: r1522293 - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/ java/org/apache/hupa/client/activity/ java/org/apache/hupa/client/evo/ java/org/apache/hupa/client/ioc/ java/o
Author: dongxu Date: Thu Sep 12 04:03:34 2013 New Revision: 1522293 URL: http://svn.apache.org/r1522293 Log: cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.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/TopActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.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/place/DefaultPlace.java james/hupa/trunk/client/src/main/webapp/Hupa.html Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522293r1=1522292r2=1522293view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 04:03:34 2013 @@ -262,9 +262,13 @@ public class HupaController { RootLayoutPanel.get().add(hupaLayout.get()); === bindCss(); + HEAD checkSession(); integrate them as a whole one - first: make the default place work +=== + cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token placeHistoryHandler.handleCurrentHistory(); + checkSession(); } private void bindCss() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java?rev=1522293r1=1522292r2=1522293view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java Thu Sep 12 04:03:34 2013 @@ -65,6 +65,7 @@ public abstract class AppBaseActivity ex @Override public void onStop() { + HEAD for (HandlerRegistration registration : registrations) { HEAD if(registration != null){ @@ -88,6 +89,12 @@ public abstract class AppBaseActivity ex registration.removeHandler(); } registrations.clear(); +=== +// for (HandlerRegistration registration : registrations) { +// registration.removeHandler(); +// } +// registrations.clear(); + cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token } HEAD fix issue 10 @@ -97,10 +104,6 @@ public abstract class AppBaseActivity ex registrations.add(handlerRegistration); } - public String mayStop() { - return null; - } - public void onCancel() { } scrub code 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=1522293r1=1522292r2=1522293view=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 04:03:34 2013 @@ -487,11 +487,11 @@ public class LoginActivity extends Abstr RootLayoutPanel.get().add(hupaLayout.get()); placeController.goTo(new MailFolderPlace(response.getSettings().getDraftsFolderName())); eventBus.fireEvent(new LoginEvent(response)); + display.setLoading(false); } @Override public void onFailure(ServerFailure error) { Window.alert(error.getMessage());// TODO a more gentle way
svn commit: r1522294 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/
Author: dongxu Date: Thu Sep 12 04:03:58 2013 New Revision: 1522294 URL: http://svn.apache.org/r1522294 Log: scrub code Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java~HEAD - copied, changed from r1522293, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml~HEAD - copied, changed from r1522293, james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522294r1=1522293r2=1522294view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Thu Sep 12 04:03:58 2013 @@ -19,25 +19,70 @@ package org.apache.hupa.client.ui; -import org.apache.hupa.client.HupaCSS; -import org.apache.hupa.client.HupaConstants; -import org.apache.hupa.client.HupaMessages; -import org.apache.hupa.client.activity.ComposeActivity; -import org.apache.hupa.client.validation.AddStyleAction; -import org.apache.hupa.client.validation.EmailListValidator; -import org.apache.hupa.client.validation.NotEmptyValidator; -import org.apache.hupa.client.validation.SetFocusAction; -import org.apache.hupa.shared.SConsts; -import org.apache.hupa.widgets.editor.Editor; -import org.apache.hupa.widgets.editor.Toolbar; -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.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; +import com.google.gwt.resources.client.CssResource.NotStrict; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; + HEAD + HEAD +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.SimpleLayoutPanel; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.Widget; + +public class __ComposePanel extends Composite { + + @UiField protected SimplePanel composeHeaderContainer; + @UiField protected SimpleLayoutPanel composeContentContainer; + @UiField protected SimplePanel composeStatusContainer; + + public __ComposePanel() { + initWidget(binder.createAndBindUi(this)); + } + + interface __ComposePanelUiBinder extends + UiBinderDockLayoutPanel, __ComposePanel { + } + + private static __ComposePanelUiBinder binder = GWT + .create(__ComposePanelUiBinder.class); + + public AcceptsOneWidget getComposeHeaderContainer() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + composeHeaderContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + + public AcceptsOneWidget getComposeContentContainer() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + composeContentContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + + public AcceptsOneWidget getComposeStatusContainer() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + composeStatusContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + +=== +=== import com.google.gwt.user.client.ui.Anchor; + composing composing panel import com.google.gwt.user.client.ui.Button; import
svn commit: r1522296 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: HupaLayout.java _CenterPanel.java _ToolPanel.ui.xml
Author: dongxu Date: Thu Sep 12 04:05:00 2013 New Revision: 1522296 URL: http://svn.apache.org/r1522296 Log: temporarily hide the left panel under composing, since the contact panel should be realized later Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522296r1=1522295r2=1522296view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 04:05:00 2013 @@ -367,6 +367,7 @@ public interface HupaLayout { private void changeToCompose() { centerPanel.thisPanel.remove(centerPanel.contentPanel); centerPanel.thisPanel.add(centerPanel.composePanel); + centerPanel.temporarilyHiddenTheUnimplementedContactPanel(true); } private boolean isMessageOccupied() { @@ -388,6 +389,7 @@ public interface HupaLayout { private void changeToMessage() { centerPanel.thisPanel.remove(centerPanel.composePanel); centerPanel.thisPanel.add(centerPanel.contentPanel); + centerPanel.temporarilyHiddenTheUnimplementedContactPanel(false); } private boolean isComposeOccupied() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java?rev=1522296r1=1522295r2=1522296view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java Thu Sep 12 04:05:00 2013 @@ -56,13 +56,13 @@ public class _CenterPanel extends Compos public _CenterPanel() { initWidget(binder.createAndBindUi(this)); thisPanel.setWidgetMinSize(outlinePanel, 144); - temporarilyHiddenTheUnimplementedContactPanel(); + temporarilyHiddenTheUnimplementedContactPanel(true); thisPanel.setWidgetHidden(composePanel, true); } - // TODO make it display - private void temporarilyHiddenTheUnimplementedContactPanel() { - thisPanel.setWidgetHidden(outlinePanel, true); + // TODO make it display to remove this method and the corresponding code + public void temporarilyHiddenTheUnimplementedContactPanel(boolean hidden) { + thisPanel.setWidgetHidden(outlinePanel, hidden); } public AcceptsOneWidget getFolderListView() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml?rev=1522296r1=1522295r2=1522296view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml Thu Sep 12 04:05:00 2013 @@ -12,7 +12,7 @@ ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' g:DockLayoutPanel unit=PX - g:west size=550 + g:west size=518 g:SimplePanel ui:field=toolBarContainer / /g:west g:east size=180 @@ -22,7 +22,7 @@ /g:HTMLPanel /g:east g:center - g:HTMLPanel / +g:SimplePanel ui:field=composeToolBarContainer / /g:center /g:DockLayoutPanel /ui:UiBinder \ No newline at end of file - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522297 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/
Author: dongxu Date: Thu Sep 12 04:05:31 2013 New Revision: 1522297 URL: http://svn.apache.org/r1522297 Log: toggle to display/hide the tool bar view to adjust the compose and message panel Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.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/mapper/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java?rev=1522297r1=1522296r2=1522297view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java Thu Sep 12 04:05:31 2013 @@ -19,9 +19,16 @@ package org.apache.hupa.client.activity; + HEAD import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.IsWidget; +=== +import org.apache.hupa.client.ui.WidgetDisplayable; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.AcceptsOneWidget; + toggle to display/hide the tool bar view to adjust the compose and message panel import com.google.inject.Inject; public class ComposeToolBarActivity extends AppBaseActivity { @@ -33,5 +40,9 @@ public class ComposeToolBarActivity exte @Inject private Displayable display; + HEAD public interface Displayable extends IsWidget {} +=== + public interface Displayable extends WidgetDisplayable {} + toggle to display/hide the tool bar view to adjust the compose and message panel } 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=1522297r1=1522296r2=1522297view=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 04:05:31 2013 @@ -55,7 +55,11 @@ import org.apache.hupa.client.activity.C import org.apache.hupa.client.activity.ComposeContentActivity; import org.apache.hupa.client.activity.ComposeHeaderActivity; import org.apache.hupa.client.activity.ComposeStatusActivity; + HEAD make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism +=== +import org.apache.hupa.client.activity.ComposeToolBarActivity; + toggle to display/hide the tool bar view to adjust the compose and message panel import org.apache.hupa.client.activity.FolderListActivity; import org.apache.hupa.client.activity.LabelListActivity; import org.apache.hupa.client.activity.LabelPropertiesActivity; @@ -200,7 +204,11 @@ import org.apache.hupa.client.mapper.Mai import org.apache.hupa.client.mapper.ComposeContentActivityMapper; import org.apache.hupa.client.mapper.ComposeHeaderActivityMapper; import org.apache.hupa.client.mapper.ComposeStatusActivityMapper; + HEAD make compose panel managed by activity manager, there is a problem here that whether the hidden view will be lazy loaded regarding the code split mechnism +=== +import org.apache.hupa.client.mapper.ComposeToolBarActivityMapper; + toggle to display/hide the tool bar view to adjust the compose and message panel import org.apache.hupa.client.mapper.FolderListActivityMapper; import org.apache.hupa.client.mapper.LoginActivityMapper; import org.apache.hupa.client.mapper.LogoActivityMapper; @@ -222,6 +230,7 @@ import org.apache.hupa.client.rf.HupaReq import org.apache.hupa.client.ui.ComposeContentView; import org.apache.hupa.client.ui.ComposeHeaderView; import org.apache.hupa.client.ui.ComposeStatusView; +import
svn commit: r1522298 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ui/ widgets/src/main/java/org/apache/hupa/widgets/editor/
Author: dongxu Date: Thu Sep 12 04:06:02 2013 New Revision: 1522298 URL: http://svn.apache.org/r1522298 Log: dealing with new message editor Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java?rev=1522298r1=1522297r2=1522298view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java Thu Sep 12 04:06:02 2013 @@ -20,17 +20,24 @@ package org.apache.hupa.client.ui; import org.apache.hupa.client.activity.ComposeContentActivity; +import org.apache.hupa.widgets.editor.Editor; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.SimplePanel; public class ComposeContentView extends Composite implements ComposeContentActivity.Displayable { + + @UiField SimplePanel composeEditor; public ComposeContentView() { initWidget(binder.createAndBindUi(this)); + Editor editor = new Editor(); + composeEditor.add(editor); } interface ComposeContentUiBinder extends Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml?rev=1522298r1=1522297r2=1522298view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml Thu Sep 12 04:06:02 2013 @@ -51,7 +51,7 @@ /g:HTMLPanel /g:east g:center - g:HTMLPanel addStyleNames={style.composebodycontainer}composeBody/g:HTMLPanel + g:SimplePanel ui:field=composeEditor addStyleNames={style.composebodycontainer} / /g:center /g:DockLayoutPanel /ui:UiBinder \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java?rev=1522298r1=1522297r2=1522298view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java Thu Sep 12 04:06:02 2013 @@ -212,7 +212,7 @@ public class ComposeHeaderView extends C // addRow(headerTable); // Return the panel - headerTable.ensureDebugId(cwFlexTable); +// headerTable.ensureDebugId(cwFlexTable); } private TextBox create() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522298r1=1522297r2=1522298view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 04:06:02 2013 @@ -277,15 +277,11 @@ public class HupaLayout implements HupaL @Override public void switchToMessage() { - System.out.println(compose=1+(centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel))); - System.out.println(content-1+(centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel))); if (isMessageOccupied()) return; if (isComposeOccupied()) { changeToMessage
svn commit: r1522299 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/ui/ client/src/main/java/org/apache/hupa/client/ui/res/ client/src/main/webapp/ widgets/src/main/java/org/apach
Author: dongxu Date: Thu Sep 12 04:06:39 2013 New Revision: 1522299 URL: http://svn.apache.org/r1522299 Log: temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssComposePanel.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/webapp/Hupa.css james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522299r1=1522298r2=1522299view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:06:39 2013 @@ -20,9 +20,6 @@ package org.apache.hupa.client.ui; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.CssResource.NotStrict; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -39,19 +36,6 @@ public class __ComposePanel extends Comp @UiField protected SimpleLayoutPanel composeContentContainer; @UiField protected SimplePanel composeStatusContainer; - - public interface Resources extends ClientBundle { - - Resources INSTANCE = GWT.create(Resources.class); - - @NotStrict - @Source(res/CssComposePanel.css) - public Css stylesheet(); - - public interface Css extends CssResource { - } - } - public __ComposePanel() { initWidget(binder.createAndBindUi(this)); } Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1522299r1=1522298r2=1522299view=diff == --- james/hupa/trunk/client/src/main/webapp/Hupa.css (original) +++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 04:06:39 2013 @@ -18,6 +18,7 @@ */ HEAD HEAD + HEAD /[ Fonts ]***/ body,table td,select,* { font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; @@ -45,39 +46,45 @@ body.noscroll { /* also avoids bounce ef === first commit +=== + temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /[ Fonts ]***/ -body, table td, select, * { -font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; -font-size: 12px; +body,table td,select,* { + font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; + font-size: 12px; } + body { -font-family: Lucida Grande, Verdana, Arial, Helvetica, sans-serif; -font-size: 11px; -color: #333; -background: url(images/linen.jpg) repeat #d1d5d8; -margin: 0; + font-family: Lucida Grande, Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #333; + background: url(images/linen.jpg) repeat #d1d5d8; + margin: 0; } -body.noscroll { -/* also avoids bounce effect in Chrome and Safari */ -overflow: hidden; +body.noscroll { /* also avoids bounce effect in Chrome and Safari */ + overflow: hidden; } - /[ widget: MyDialogBox ]/ -.hupa-dialog-box td.dialogMiddleCenter { +.hupa-dialog-box td.dialogMiddleCenter { background: #fae5b0; } HEAD + HEAD first commit === first commit +=== + + temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-dialog-box .dialogContent .gwt-Label { font-weight: bold; margin: 15px; } HEAD HEAD + HEAD .hupa-dialog-box .Caption { font-size: 14px; @@ -89,12 +96,18 @@ body.noscroll { .hupa-dialog-box .Caption { font-size: 14px; first commit +=== + +.hupa-dialog-box .Caption { + font-size: 14px; + temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /[ widget: RndPanel ]/ .hupa-rounded { HEAD HEAD + HEAD border: 1px solid #7FAAFF; border-radius: 5px; overflow: hidden; @@ -108,6 +121,11 @@ body.noscroll { border-radius: 5px; overflow: hidden; first commit
svn commit: r1522300 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/MessageSendActivity.java ui/ComposeHeaderView.java ui/__ComposePanel.ui.xml
Author: dongxu Date: Thu Sep 12 04:07:02 2013 New Revision: 1522300 URL: http://svn.apache.org/r1522300 Log: change the text box to text area of input type in compose panel, and set its width and height Modified: 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/ui/ComposeHeaderView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml 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=1522300r1=1522299r2=1522300view=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 04:07:02 2013 @@ -630,7 +630,7 @@ public class MessageSendActivity extends display.fillContactList(event.getContacts()); } }); - this.registrations.add(display.getSendClick().addClickHandler(sendClickHandler)); + registrations.add(display.getSendClick().addClickHandler(sendClickHandler)); registrations.add(display.getBackButtonClick().addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { eventBus.fireEvent(new BackEvent()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java?rev=1522300r1=1522299r2=1522300view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java Thu Sep 12 04:07:02 2013 @@ -86,12 +86,12 @@ import com.google.gwt.user.client.ui.Anc import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; -import com.google.gwt.user.client.ui.TextBox; -import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; -import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; +import com.google.gwt.user.client.ui.TextArea; public class ComposeHeaderView extends Composite implements ComposeHeaderActivity.Displayable { @@ -168,8 +168,7 @@ public class ComposeHeaderView extends C operationPanel.addStyleName(style.operation()); headerTable.setWidget(ROW_FROM, 1, operationPanel); - TextBox to = new TextBox(); - to.setWidth(100%); + TextArea to = new TextArea(); to.setFocus(true); headerTable.setWidget(ROW_TO, 1, to); @@ -212,12 +211,11 @@ public class ComposeHeaderView extends C // addRow(headerTable); // Return the panel -// headerTable.ensureDebugId(cwFlexTable); + // headerTable.ensureDebugId(cwFlexTable); } - private TextBox create() { - TextBox t = new TextBox(); - t.setWidth(100%); + private TextArea create() { + TextArea t = new TextArea(); return t; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml?rev=1522300r1=1522299r2=1522300view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml Thu Sep 12 04:07:02 2013 @@ -10,7 +10,7 @@ language governing permissions and limitations under the License. -- ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' - xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui' + xmlns:g='urn:import:com.google.gwt.user.client.ui' ui:style .box { border: 1px solid #A3A3A3; @@ -45,6 +45,14
svn commit: r1522303 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ComposeActivity.java ui/ComposeContentView.ui.xml ui/ComposeHeaderView.ui.xml ui/ComposeStatusView.ui.
Author: dongxu Date: Thu Sep 12 04:09:09 2013 New Revision: 1522303 URL: http://svn.apache.org/r1522303 Log: make attachments sending work as expected Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeStatusView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522303r1=1522302r2=1522303view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:09:09 2013 @@ -20,12 +20,16 @@ package org.apache.hupa.client.activity; HEAD + HEAD +=== + make attachments sending work as expected import gwtupload.client.IUploadStatus.Status; import gwtupload.client.IUploader; import gwtupload.client.IUploader.OnCancelUploaderHandler; import gwtupload.client.IUploader.OnFinishUploaderHandler; import gwtupload.client.IUploader.OnStatusChangedHandler; + HEAD import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -56,6 +60,8 @@ import org.apache.hupa.shared.events.Mai import com.google.gwt.activity.shared.Activity; === +=== + make attachments sending work as expected import java.util.ArrayList; import java.util.List; @@ -63,6 +69,7 @@ import org.apache.hupa.client.activity.M import org.apache.hupa.client.rf.SendMessageRequest; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.validation.EmailListValidator; +import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.domain.GenericResult; import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.shared.domain.SendMessageAction; @@ -388,9 +395,40 @@ public class ComposeActivity extends App } }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); + display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler); +display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler); +display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler); } + HEAD make send text mail work excellently +=== +private OnFinishUploaderHandler onFinishUploadHandler = new OnFinishUploaderHandler() { +public void onFinish(IUploader uploader) { +if (uploader.getStatus() == Status.SUCCESS) { +String name = uploader.getInputName(); +MessageAttachment attachment = new MessageAttachmentImpl(); +attachment.setName(name); +attachments.add(attachment); +} +} +}; + +private OnStatusChangedHandler onStatusChangedHandler = new OnStatusChangedHandler() { +public void onStatusChanged(IUploader uploader) { +Status stat = display.getUploader().getStatus(); +} +}; + +private OnCancelUploaderHandler onCancelUploadHandler = new OnCancelUploaderHandler() { +public void onCancel(IUploader uploader) { +for (MessageAttachment attachment : attachments) { +if (attachment.getName().equals(uploader.getInputName())) +attachments.remove(attachment); +} +} +}; + make attachments sending work as expected protected ClickHandler sendClickHandler = new ClickHandler() { public void onClick(ClickEvent event) { if (!validate()) @@ -416,6 +454,7 @@ public class ComposeActivity extends App attachMent.setSize(attach.getSize()); attachMent.setContentType(attach.getContentType()); attaches.add(attachMent); + System.out.println(++-); } message.setFrom(display.getFromText()); message.setSubject(display.getSubjectText().getText()); @@ -613,6 +652,11 @@ public class ComposeActivity extends App === ListBox getFromList(); + HEAD add user label, yet issue46 occur +=== + + IUploader getUploader(); + make attachments
svn commit: r1522302 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ComposeActivity.java activity/TopBarActivity.java ui/ComposeView.java
Author: dongxu Date: Thu Sep 12 04:08:47 2013 New Revision: 1522302 URL: http://svn.apache.org/r1522302 Log: add user label, yet issue46 occur Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522302r1=1522301r2=1522302view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:08:47 2013 @@ -67,6 +67,9 @@ import org.apache.hupa.shared.domain.Gen import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.shared.domain.SendMessageAction; import org.apache.hupa.shared.domain.SmtpMessage; +import org.apache.hupa.shared.domain.User; +import org.apache.hupa.shared.events.LoginEvent; +import org.apache.hupa.shared.events.LoginEventHandler; make send text mail work excellently import com.google.gwt.event.dom.client.ClickEvent; @@ -102,6 +105,7 @@ import com.google.gwt.user.client.Window import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.ListBox; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; @@ -111,12 +115,17 @@ public class ComposeActivity extends App private SmtpMessage message; private ListMessageAttachment attachments = new ArrayListMessageAttachment(); private Type type = Type.NEW; + HEAD make send text mail work excellently +=== + private User user; + add user label, yet issue46 occur @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); HEAD + HEAD bindTo(eventBus); fillHeader(); } @@ -365,10 +374,19 @@ public class ComposeActivity extends App === +=== + add user label, yet issue46 occur bindTo(eventBus); + if (user != null) + display.getFromList().addItem(user.getName()); } private void bindTo(EventBus eventBus) { + eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { + public void onLogin(LoginEvent event) { + user = event.getUser(); + } + }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); } @@ -590,6 +608,11 @@ public class ComposeActivity extends App HasText getMessageText(); HasHTML getMessageHTML(); + HEAD make send text mail work excellently +=== + + ListBox getFromList(); + add user label, yet issue46 occur } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522302r1=1522301r2=1522302view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java Thu Sep 12 04:08:47 2013 @@ -149,7 +149,9 @@ import com.google.gwt.event.dom.client.C import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; +import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.inject.Inject; @@ -160,12 +162,17 @@ public class TopBarActivity extends AppB @Inject private Displayable display; @Inject private LoginLayoutable loginLayout; + + @UiField protected HTMLPanel userLabel; private User user; @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); - bindTo(this.eventBus); + bindTo(eventBus); + if (user != null
svn commit: r1522304 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 04:09:36 2013 New Revision: 1522304 URL: http://svn.apache.org/r1522304 Log: coping with reply and forward sending message Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522304r1=1522303r2=1522304view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:09:36 2013 @@ -65,20 +65,28 @@ import com.google.gwt.activity.shared.Ac import java.util.ArrayList; import java.util.List; -import org.apache.hupa.client.activity.MessageSendActivity.Type; +import org.apache.hupa.client.place.ComposePlace; +import org.apache.hupa.client.rf.SendForwardMessageRequest; import org.apache.hupa.client.rf.SendMessageRequest; +import org.apache.hupa.client.rf.SendReplyMessageRequest; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.domain.GenericResult; import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.SendForwardMessageAction; import org.apache.hupa.shared.domain.SendMessageAction; +import org.apache.hupa.shared.domain.SendReplyMessageAction; import org.apache.hupa.shared.domain.SmtpMessage; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.LoginEvent; import org.apache.hupa.shared.events.LoginEventHandler; + HEAD make send text mail work excellently +=== +import com.google.gwt.activity.shared.Activity; + coping with reply and forward sending message import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; @@ -121,12 +129,17 @@ public class ComposeActivity extends App private SendMessageRequest sendReq; private SmtpMessage message; private ListMessageAttachment attachments = new ArrayListMessageAttachment(); + HEAD private Type type = Type.NEW; HEAD make send text mail work excellently === private User user; add user label, yet issue46 occur +=== + private User user; + private ComposePlace place; + coping with reply and forward sending message @Override public void start(AcceptsOneWidget container, EventBus eventBus) { @@ -395,12 +408,13 @@ public class ComposeActivity extends App } }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); - display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler); -display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler); -display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler); + display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler); + display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler); + display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler); } HEAD + HEAD make send text mail work excellently === private OnFinishUploaderHandler onFinishUploadHandler = new OnFinishUploaderHandler() { @@ -429,6 +443,35 @@ public class ComposeActivity extends App } }; make attachments sending work as expected +=== + private OnFinishUploaderHandler onFinishUploadHandler = new OnFinishUploaderHandler() { + public void onFinish(IUploader uploader) { + if (uploader.getStatus() == Status.SUCCESS) { + String name = uploader.getInputName(); + MessageAttachment attachment = new MessageAttachmentImpl(); + attachment.setName(name); + attachments.add(attachment
svn commit: r1522305 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Author: dongxu Date: Thu Sep 12 04:10:06 2013 New Revision: 1522305 URL: http://svn.apache.org/r1522305 Log: coping with java.lang.IllegalArgumentException: uid Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522305r1=1522304r2=1522305view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:10:06 2013 @@ -73,6 +73,7 @@ import org.apache.hupa.client.ui.WidgetD import org.apache.hupa.client.validation.EmailListValidator; import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.domain.GenericResult; +import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.MessageAttachment; import org.apache.hupa.shared.domain.SendForwardMessageAction; import org.apache.hupa.shared.domain.SendMessageAction; @@ -123,11 +124,10 @@ import com.google.gwt.user.client.ui.Has import com.google.gwt.user.client.ui.ListBox; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; +import com.google.web.bindery.requestfactory.shared.RequestContext; public class ComposeActivity extends AppBaseActivity { @Inject private Displayable display; - private SendMessageRequest sendReq; - private SmtpMessage message; private ListMessageAttachment attachments = new ArrayListMessageAttachment(); HEAD private Type type = Type.NEW; @@ -477,6 +477,7 @@ public class ComposeActivity extends App if (!validate()) return; HEAD + HEAD hupaController.showTopLoading(Sending...); if (new.equals(place.getToken())) { @@ -501,10 +502,15 @@ public class ComposeActivity extends App message.setTo(emailTextToArray(display.getToText().getText())); message.setCc(emailTextToArray(display.getCcText().getText())); message.setBcc(emailTextToArray(display.getBccText().getText())); +=== + coping with java.lang.IllegalArgumentException: uid if (new.equals(place.getToken())) { + System.out.println(new: + place.getParameters().getOldmessage().getUid()); + SendMessageRequest sendReq = requestFactory.sendMessageRequest(); SendMessageAction sendAction = sendReq.create(SendMessageAction.class); HEAD + HEAD // SmtpMessage sm = sendReq.edit(message); sendAction.setMessage(message); make send text mail work excellently @@ -512,6 +518,9 @@ public class ComposeActivity extends App SmtpMessage sm = sendReq.edit(message); sendAction.setMessage(sm); coping with reply and forward sending message +=== + sendAction.setMessage(parseMessage(sendReq)); + coping with java.lang.IllegalArgumentException: uid sendReq.send(sendAction).fire(new ReceiverGenericResult() { @Override public void onSuccess(GenericResult response) { @@ -520,6 +529,7 @@ public class ComposeActivity extends App }); HEAD HEAD + HEAD } else if (forward.equals(place.getToken())) { // FIXME will get a NullPointerException given accessing // directly from some URL like #/compose:forward @@ -534,10 +544,16 @@ public class ComposeActivity extends App === System.out.println(new: + place.getParameters().getOldmessage().getUid()); } else if (reply.equals(place.getToken())) { +=== + } else if (forward.equals(place.getToken())) { + System.out.println(reply: + place.getParameters().getOldmessage().getUid()); + coping with java.lang.IllegalArgumentException: uid SendForwardMessageRequest forwardReq = requestFactory.sendForwardMessageRequest(); SendForwardMessageAction forwardAction = forwardReq.create(SendForwardMessageAction.class); - forwardAction.setMessage(message); - forwardAction.setFolder
svn commit: r1522306 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/rf/ server/src/main/java/org/apache/hupa/server/service/
Author: dongxu Date: Thu Sep 12 04:11:10 2013 New Revision: 1522306 URL: http://svn.apache.org/r1522306 Log: fixed the requestfactory's quirk Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendForwardMessageServiceImpl.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/SendReplyMessageServiceImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/SendForwardMessageActionImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/SendForwardMessageAction.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522306r1=1522305r2=1522306view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:11:10 2013 @@ -397,8 +397,11 @@ public class ComposeActivity extends App === add user label, yet issue46 occur bindTo(eventBus); - if (user != null) + + display.getFromList().addItem(demo); + if (user != null) {//FIXME display.getFromList().addItem(user.getName()); + } } private void bindTo(EventBus eventBus) { @@ -506,7 +509,6 @@ public class ComposeActivity extends App coping with java.lang.IllegalArgumentException: uid if (new.equals(place.getToken())) { - System.out.println(new: + place.getParameters().getOldmessage().getUid()); SendMessageRequest sendReq = requestFactory.sendMessageRequest(); SendMessageAction sendAction = sendReq.create(SendMessageAction.class); HEAD @@ -546,6 +548,7 @@ public class ComposeActivity extends App } else if (reply.equals(place.getToken())) { === } else if (forward.equals(place.getToken())) { + HEAD System.out.println(reply: + place.getParameters().getOldmessage().getUid()); coping with java.lang.IllegalArgumentException: uid SendForwardMessageRequest forwardReq = requestFactory.sendForwardMessageRequest(); @@ -557,6 +560,17 @@ public class ComposeActivity extends App forwardAction.setUid(place.getParameters().getOldmessage().getUid()); forwardReq.send(forwardAction).fire(new ReceiverGenericResult() { coping with reply and forward sending message +=== + //FIXME will get a NullPointerException given accessing directly from some URL like #/compose:forward + SendForwardMessageRequest req = requestFactory.sendForwardMessageRequest(); + SendForwardMessageAction action = req.create(SendForwardMessageAction.class); + action.setMessage(parseMessage(req)); + ImapFolder f = req.create(ImapFolder.class); + f.setFullName(place.getParameters().getFolder().getFullName()); + action.setFolder(f); + action.setUid(place.getParameters().getOldmessage().getUid()); + req.send(action).fire(new ReceiverGenericResult() { + fixed the requestfactory's quirk @Override public void onSuccess(GenericResult response) { afterSend(response); 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=1522306r1=1522305r2=1522306view=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 04:11:10 2013 @@ -83,11 +83,15 @@ public interface HupaRequestFactory exte Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. === SubjectRequest subjectRequest(); + ImapFolderRequest
svn commit: r1522307 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa: HupaProd.gwt.xml client/activity/ComposeActivity.java
Author: dongxu Date: Thu Sep 12 04:11:36 2013 New Revision: 1522307 URL: http://svn.apache.org/r1522307 Log: scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1522307r1=1522306r2=1522307view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Thu Sep 12 04:11:36 2013 @@ -27,6 +27,7 @@ !-- Set the languages to compile -- !-- It multiplies the number of permutations -- extend-property name=locale values=es,de/ + extend-property name=locale values=en/ set-configuration-property name=locale.useragent value=Y/ !-- Compile for all browsers -- Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522307r1=1522306r2=1522307view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:11:36 2013 @@ -141,6 +141,11 @@ public class ComposeActivity extends App private ComposePlace place; coping with reply and forward sending message + public Activity with(ComposePlace place) { + this.place = place; + return this; + } + @Override public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); @@ -399,7 +404,7 @@ public class ComposeActivity extends App bindTo(eventBus); display.getFromList().addItem(demo); - if (user != null) {//FIXME + if (user != null) {// FIXME display.getFromList().addItem(user.getName()); } } @@ -535,6 +540,7 @@ public class ComposeActivity extends App } else if (forward.equals(place.getToken())) { // FIXME will get a NullPointerException given accessing // directly from some URL like #/compose:forward + HEAD SendForwardMessageRequest req = rf.sendForwardMessageRequest(); SendForwardMessageAction action = req.create(SendForwardMessageAction.class); action.setMessage(parseMessage(req)); @@ -562,6 +568,8 @@ public class ComposeActivity extends App coping with reply and forward sending message === //FIXME will get a NullPointerException given accessing directly from some URL like #/compose:forward +=== + scrub code SendForwardMessageRequest req = requestFactory.sendForwardMessageRequest(); SendForwardMessageAction action = req.create(SendForwardMessageAction.class); action.setMessage(parseMessage(req)); @@ -630,13 +638,13 @@ public class ComposeActivity extends App coping with java.lang.IllegalArgumentException: uid } else { SendReplyMessageRequest replyReq = requestFactory.sendReplyMessageRequest(); - SendReplyMessageAction replyAction = replyReq.create(SendReplyMessageAction.class); - replyAction.setMessage(parseMessage(replyReq)); + SendReplyMessageAction action = replyReq.create(SendReplyMessageAction.class); + action.setMessage(parseMessage(replyReq)); ImapFolder folder = replyReq.create(ImapFolder.class); folder.setFullName(place.getParameters().getFolder().getFullName()); - replyAction.setFolder(folder); - replyAction.setUid(place.getParameters().getOldmessage().getUid()); - replyReq.send(replyAction).fire(new ReceiverGenericResult() { + action.setFolder(folder); + action.setUid(place.getParameters().getOldmessage().getUid()); + replyReq.send(action).fire(new ReceiverGenericResult() { @Override
svn commit: r1522309 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Author: dongxu Date: Thu Sep 12 04:12:14 2013 New Revision: 1522309 URL: http://svn.apache.org/r1522309 Log: add style for the choose file button Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522309r1=1522308r2=1522309view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Thu Sep 12 04:12:14 2013 @@ -32,7 +32,10 @@ import org.apache.hupa.widgets.editor.Ed import org.apache.hupa.widgets.ui.MultiValueSuggestArea; import com.google.gwt.core.client.GWT; +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.HandlerRegistration; import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -96,10 +99,12 @@ import com.google.gwt.user.client.ui.Anc composing composing panel import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DecoratorPanel; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HTMLTable.RowFormatter; import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.HasText; @@ -246,10 +251,10 @@ public class ComposeView extends Composi .addActionForFailure(fAction), new NotEmptyValidator(getToText()).addActionForFailure(sAction) .addActionForFailure(fAction)); editor = new Editor(); - + BaseUploadStatus uploadStatus = new BaseUploadStatus(); uploadStatus.setCancelConfiguration(IUploadStatus.GMAIL_CANCEL_CFG); - uploader = new MultiUploader(FileInputType.ANCHOR, uploadStatus); + uploader = new MultiUploader(FileInputType.CUSTOM.with(button), uploadStatus); uploader.setServletPath(GWT.getModuleBaseURL() + SConsts.SERVLET_UPLOAD); uploader.avoidRepeatFiles(true); uploader.setI18Constants(constants); @@ -257,6 +262,24 @@ public class ComposeView extends Composi composeEditor.add(editor); } + + class MyFancyLookingButton extends Composite implements HasClickHandlers { + DecoratorPanel widget = new DecoratorPanel(); + + public MyFancyLookingButton() { + DecoratorPanel widget = new DecoratorPanel(); + initWidget(widget); + widget.setWidget(new HTML(Choose ...)); + widget.setSize(100px,50px); + } + + public HandlerRegistration addClickHandler(ClickHandler handler) { + return addDomHandler(handler, ClickEvent.getType()); + } + } + + MyFancyLookingButton button = new MyFancyLookingButton(); + @Override public HasText getToText() { return to; - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522308 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Author: dongxu Date: Thu Sep 12 04:11:55 2013 New Revision: 1522308 URL: http://svn.apache.org/r1522308 Log: event register for compose activity, and try to update the version of gwtuploader but found some exceptions Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522308r1=1522307r2=1522308view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:11:55 2013 @@ -404,7 +404,7 @@ public class ComposeActivity extends App bindTo(eventBus); display.getFromList().addItem(demo); - if (user != null) {// FIXME + if (user != null) {// FIXME why user would be a null display.getFromList().addItem(user.getName()); } } @@ -416,9 +416,9 @@ public class ComposeActivity extends App } }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); - display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler); - display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler); - display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler); + registerHandler(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler)); + registerHandler(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler)); + registerHandler(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler)); } HEAD @@ -465,8 +465,13 @@ public class ComposeActivity extends App private OnStatusChangedHandler onStatusChangedHandler = new OnStatusChangedHandler() { public void onStatusChanged(IUploader uploader) { - // Status stat = display.getUploader().getStatus(); //TODO buttons - // disabled + // TODO buttons disabled + // Status stat = display.getUploader().getStatus(); + + // if (stat == Status.INPROGRESS) + // display.getSendEnable().setEnabled(false); + // else + // display.getSendEnable().setEnabled(true); } }; - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522310 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ComposeActivity.java ui/ComposeView.java ui/ComposeView.ui.xml
Author: dongxu Date: Thu Sep 12 04:12:35 2013 New Revision: 1522310 URL: http://svn.apache.org/r1522310 Log: make add operation buttons work according to the click events Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522310r1=1522309r2=1522310view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:12:35 2013 @@ -416,6 +416,55 @@ public class ComposeActivity extends App } }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); + + registerHandler(display.getCcClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.showCc(); + } + })); + registerHandler(display.get_CcClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.hideCc(); + } + })); + registerHandler(display.getBccClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.showBcc(); + } + })); + registerHandler(display.get_BccClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.hideBcc(); + } + })); + registerHandler(display.getReplyClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.showReply(); + } + })); + registerHandler(display.get_ReplyClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.hideReply(); + } + })); + registerHandler(display.getFollowupClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.showFollowup(); + } + })); + registerHandler(display.get_FollowupClick().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + display.hideFollowup(); + } + })); registerHandler(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler)); registerHandler(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler)); registerHandler(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler)); @@ -667,10 +716,14 @@ public class ComposeActivity extends App private boolean validate() { // Don't trust only in view validation HEAD + HEAD +=== + make add operation buttons work according to the click events return display.validate() display.getTo().getText().trim().length() 0 EmailListValidator.isValidAddressList(display.getTo().getText()) EmailListValidator.isValidAddressList(display.getCc().getText()) EmailListValidator.isValidAddressList(display.getBcc().getText()); + HEAD } private SmtpMessage parseMessage(RequestContext rc) { @@ -697,6 +750,8 @@ public class ComposeActivity extends App EmailListValidator.isValidAddressList(display.getCcText().getText()) EmailListValidator.isValidAddressList(display.getBccText().getText()); make send text mail work excellently +=== + make add operation buttons work according to the click events
svn commit: r1522312 [1/2] - in /james/hupa/trunk/client/src/main: java/org/apache/hupa/client/activity/ java/org/apache/hupa/client/ui/ webapp/
Author: dongxu Date: Thu Sep 12 04:13:20 2013 New Revision: 1522312 URL: http://svn.apache.org/r1522312 Log: beautify the multiuploader Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/webapp/styles.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522312r1=1522311r2=1522312view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:13:20 2013 @@ -63,6 +63,7 @@ import com.google.gwt.activity.shared.Ac === make attachments sending work as expected import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.apache.hupa.client.place.ComposePlace; @@ -130,6 +131,7 @@ public class ComposeActivity extends App @Inject private Displayable display; private ListMessageAttachment attachments = new ArrayListMessageAttachment(); HEAD + HEAD private Type type = Type.NEW; HEAD make send text mail work excellently @@ -138,6 +140,9 @@ public class ComposeActivity extends App add user label, yet issue46 occur === private User user; +=== + static private User user; + beautify the multiuploader private ComposePlace place; coping with reply and forward sending message @@ -402,21 +407,19 @@ public class ComposeActivity extends App === add user label, yet issue46 occur bindTo(eventBus); - - display.getFromList().addItem(demo); - if (user != null) {// FIXME why user would be a null + if (user != null) display.getFromList().addItem(user.getName()); - } } private void bindTo(EventBus eventBus) { eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { + @Override public void onLogin(LoginEvent event) { user = event.getUser(); } }); registerHandler(display.getSendClick().addClickHandler(sendClickHandler)); - + registerHandler(display.getCcClick().addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -526,9 +529,10 @@ public class ComposeActivity extends App private OnCancelUploaderHandler onCancelUploadHandler = new OnCancelUploaderHandler() { public void onCancel(IUploader uploader) { - for (MessageAttachment attachment : attachments) { + for (IteratorMessageAttachment i = attachments.iterator(); i.hasNext();) { + MessageAttachment attachment = i.next(); if (attachment.getName().equals(uploader.getInputName())) - attachments.remove(attachment); + i.remove(); } } }; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522312r1=1522311r2=1522312view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 04:13:20 2013 @@ -157,6 +157,8 @@ import org.apache.hupa.shared.events.Exp import org.apache.hupa.shared.events.ExpandMessageEventHandler; import org.apache.hupa.shared.events.LoadMessagesEvent; import org.apache.hupa.shared.events.LoadMessagesEventHandler; +import org.apache.hupa.shared.events.LoginEvent; +import org.apache.hupa.shared.events.LoginEventHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; @@ -180,15 +182,22 @@ public class
svn commit: r1522311 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/TopBarActivity.java ui/ComposeView.java
Author: dongxu Date: Thu Sep 12 04:12:56 2013 New Revision: 1522311 URL: http://svn.apache.org/r1522311 Log: ignore the cc or bcc addresses when they are hidden elements Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522311r1=1522310r2=1522311view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java Thu Sep 12 04:12:56 2013 @@ -170,7 +170,7 @@ public class TopBarActivity extends AppB public void start(AcceptsOneWidget container, EventBus eventBus) { container.setWidget(display.asWidget()); bindTo(eventBus); - if (user != null) { + if (user != null isOccupied()) { display.getUserLabel().add(new HTML(user.getName())); } } @@ -217,6 +217,10 @@ public class TopBarActivity extends AppB } } + private boolean isOccupied() { + return display.getUserLabel().getWidgetCount() 1; + } + public interface Displayable extends WidgetDisplayable { HasClickHandlers getLogoutClick(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522311r1=1522310r2=1522311view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java Thu Sep 12 04:12:56 2013 @@ -317,6 +317,16 @@ public class ComposeView extends Composi MyFancyLookingButton button = new MyFancyLookingButton(); + HasText emptyText = new HasText() { + @Override + public String getText() { + return ; + } + @Override + public void setText(String text) { + } + }; + @Override public HasText getTo() { return toSuggest; @@ -324,12 +334,18 @@ public class ComposeView extends Composi @Override public HasText getCc() { - return ccSuggest; + if (isShowing(ROW_CC)) + return ccSuggest; + else + return emptyText; } @Override public HasText getBcc() { - return bccSuggest; + if (isShowing(ROW_BCC)) + return bccSuggest; + else + return emptyText; } @Override - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522313 - in /james/hupa/trunk: client/src/main/java/org/apache/hupa/client/activity/ client/src/main/java/org/apache/hupa/client/ui/ shared/src/main/java/org/apache/hupa/shared/events/
Author: dongxu Date: Thu Sep 12 04:13:49 2013 New Revision: 1522313 URL: http://svn.apache.org/r1522313 Log: fill the empty compose view with the old message when the composing type are reply, replyAll, forward and preparing for about deleting operation Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/TopBarView.ui.xml james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522313r1=1522312r2=1522313view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java Thu Sep 12 04:13:49 2013 @@ -72,10 +72,13 @@ import org.apache.hupa.client.rf.SendMes import org.apache.hupa.client.rf.SendReplyMessageRequest; import org.apache.hupa.client.ui.WidgetDisplayable; import org.apache.hupa.client.validation.EmailListValidator; +import org.apache.hupa.shared.Util; import org.apache.hupa.shared.data.MessageAttachmentImpl; import org.apache.hupa.shared.domain.GenericResult; import org.apache.hupa.shared.domain.ImapFolder; +import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageAttachment; +import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.SendForwardMessageAction; import org.apache.hupa.shared.domain.SendMessageAction; import org.apache.hupa.shared.domain.SendReplyMessageAction; @@ -407,10 +410,96 @@ public class ComposeActivity extends App === add user label, yet issue46 occur bindTo(eventBus); + fillHeader(); + } + + private void fillHeader() { + if (place == null) + return; + Message oldMessage = place.getParameters().getOldmessage(); if (user != null) display.getFromList().addItem(user.getName()); + display.getMessageHTML().setHTML( + wrapMessage(oldMessage, place.getParameters().getOldDetails(), place.getToken())); + if (forward.equals(place.getToken())) { + String subject = oldMessage.getSubject() != null ? oldMessage.getSubject().trim() : ; + if (!subject.toLowerCase().startsWith(fwd:)) { + subject = Fwd: + subject; + } + display.getSubject().setText(subject); + } else if (reply.equals(place.getToken()) || replyAll.equals(place.getToken())) { + + String subject = oldMessage.getSubject() != null ? oldMessage.getSubject().trim() : ; + if (!subject.toLowerCase().startsWith(re:)) { + subject = Re: + subject; + } + if (reply.equals(place.getToken())) { + display.getSubject().setText(subject); + if (oldMessage.getReplyto() != null !oldMessage.getFrom().contains(oldMessage.getReplyto())) { + display.getTo().setText(oldMessage.getReplyto()); + } else { + display.getTo().setText(oldMessage.getFrom()); + } + } else if (replyAll.equals(place.getToken())) { + ArrayListString list = new ArrayListString(); + if (oldMessage.getReplyto() != null !oldMessage.getFrom().contains(oldMessage.getReplyto())) + list.add(oldMessage.getReplyto()); + if (oldMessage.getTo() != null) + list.addAll(oldMessage.getTo()); + if (oldMessage.getCc() != null) + list.addAll(oldMessage.getCc()); + list = removeEmailFromList(list, user.getName()); + display.getCc().setText(Util.listToString(list
svn commit: r1522314 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Author: dongxu Date: Thu Sep 12 04:14:08 2013 New Revision: 1522314 URL: http://svn.apache.org/r1522314 Log: scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522314r1=1522313r2=1522314view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 04:14:08 2013 @@ -194,15 +194,15 @@ public class MessageListView extends Com } public void fetch(final int start) { - FetchMessagesRequest messagesRequest = requestFactory.messagesRequest(); - FetchMessagesAction action = messagesRequest.create(FetchMessagesAction.class); - final ImapFolder f = messagesRequest.create(ImapFolder.class); + FetchMessagesRequest req = requestFactory.messagesRequest(); + FetchMessagesAction action = req.create(FetchMessagesAction.class); + final ImapFolder f = req.create(ImapFolder.class); f.setFullName(folder.getFullName()); action.setFolder(f); action.setOffset(grid.getPageSize()); action.setSearchString(searchValue); action.setStart(start); - messagesRequest.fetch(action).fire(new ReceiverFetchMessagesResult() { + req.fetch(action).fire(new ReceiverFetchMessagesResult() { @Override public void onSuccess(final FetchMessagesResult result) { - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522317 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: ComposeToolBarView.ui.xml MessageListView.java ToolBarView.java ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 04:15:25 2013 New Revision: 1522317 URL: http://svn.apache.org/r1522317 Log: 1.do not select the message which is being focused on. 2.create the mark popup menu Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml?rev=1522317r1=1522316r2=1522317view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml Thu Sep 12 04:15:25 2013 @@ -13,10 +13,14 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui' ui:image field=buttons src=res/buttons.png / HEAD + HEAD ui:style === ui:style type=org.apache.hupa.client.ui.ToolBarView.Style toggle to display/hide the tool bar view to adjust the compose and message panel +=== + ui:style + 1.do not select the message which is being focused on. 2.create the mark popup menu .bar { position: absolute; display: block; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522317r1=1522316r2=1522317view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 04:15:25 2013 @@ -127,7 +127,6 @@ public class MessageListView extends Com for (Message msg : displayedItems) { table.getSelectionModel().setSelected(msg, false); } - table.getSelectionModel().setSelected(event.getValue(), true); GetMessageDetailsRequest req = requestFactory.messageDetailsRequest(); GetMessageDetailsAction action = req.create(GetMessageDetailsAction.class); final ImapFolder f = req.create(ImapFolder.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522317r1=1522316r2=1522317view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 04:15:25 2013 @@ -62,8 +62,12 @@ import org.apache.hupa.shared.domain.Use import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; + HEAD composing composing panel === +=== +import com.google.gwt.event.dom.client.ClickHandler; + 1.do not select the message which is being focused on. 2.create the mark popup menu import com.google.gwt.event.dom.client.HasClickHandlers; coping with reply and forward sending message import com.google.gwt.place.shared.PlaceController; @@ -364,8 +368,11 @@ import com.google.gwt.uibinder.client.Ui composing composing panel import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DecoratedPopupPanel; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; @@ -387,6 +394,20 @@ public class ToolBarView extends Composi @UiField Style style; + interface Style extends CssResource { + String disabledButton(); + String popupMenu(); + String activeIcon(); + String toolBarMenu(); + String listicon(); + String read(); + String unread(); + } + + private VerticalPanel popup; + private Anchor
svn commit: r1522315 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/TopActivity.java activity/WestActivity.java evo/ActivityManagerInitializer.java ui/FoldersTreeViewMode
Author: dongxu Date: Thu Sep 12 04:14:41 2013 New Revision: 1522315 URL: http://svn.apache.org/r1522315 Log: scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.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/evo/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522315r1=1522314r2=1522315view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 04:14:41 2013 @@ -26,6 +26,7 @@ package org.apache.hupa.client.activity; import org.apache.hupa.client.HupaConstants; + HEAD import org.apache.hupa.client.rf.IdleRequest; import org.apache.hupa.client.rf.LogoutUserRequest; import org.apache.hupa.client.ui.WidgetDisplayable; @@ -61,6 +62,8 @@ import org.apache.hupa.shared.data.User; introduce the top activity === import org.apache.hupa.client.place.DefaultPlace; +=== + scrub code import org.apache.hupa.client.rf.IdleRequest; import org.apache.hupa.client.rf.LogoutUserRequest; import org.apache.hupa.client.ui.WidgetDisplayable; 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=1522315r1=1522314r2=1522315view=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 04:14:41 2013 @@ -26,6 +26,7 @@ package org.apache.hupa.client.activity; import org.apache.hupa.client.activity.MessageSendActivity.Type; + HEAD import org.apache.hupa.client.place.FolderPlace; import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.GetMessageDetailsRequest; @@ -269,6 +270,8 @@ import java.util.List; refactoring. import org.apache.hupa.client.activity.MessageSendActivity.Type; import org.apache.hupa.client.place.IMAPMessagePlace; +=== + scrub code import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.GetMessageDetailsRequest; Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java?rev=1522315r1=1522314r2=1522315view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java Thu Sep 12 04:14:41 2013 @@ -21,9 +21,7 @@ package org.apache.hupa.client.evo; import org.apache.hupa.client.ui.AppLayout; -import com.google.gwt.activity.shared.ActivityManager; import com.google.inject.Inject; -import com.google.inject.name.Named; /** * This class is responsible for ActivityManager instantiations through GIN, it Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522315r1=1522314r2=1522315view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 04:14:41 2013 @@ -23,7 +23,6 @@ import java.util.List; import org.apache.hupa.client.place.MailFolderPlace; import org.apache.hupa.client.rf.HupaRequestFactory; -import org.apache.hupa.shared.data.ImapFolderImpl; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.User; import org.apache.hupa.shared.events.LoadMessagesEvent; @@ -32,8 +31,6 @@ import org.apache.hupa.shared.events.Log import com.google.gwt.cell.client.AbstractCell; import com.google.gwt.cell.client.ValueUpdater; -import com.google.gwt.core.client.Scheduler; -import
svn commit: r1522316 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessagesCellTable.java res/CssMessagesCellTable.css
Author: dongxu Date: Thu Sep 12 04:15:00 2013 New Revision: 1522316 URL: http://svn.apache.org/r1522316 Log: make the unread message row's font bold and the read ones normal, see issue#33 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522316r1=1522315r2=1522316view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Thu Sep 12 04:15:00 2013 @@ -504,6 +504,7 @@ import java.util.List; import org.apache.hupa.client.HupaConstants; import org.apache.hupa.client.bundles.HupaImageBundle; +import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; import org.apache.hupa.shared.domain.Message; import com.google.gwt.cell.client.CheckboxCell; @@ -519,6 +520,7 @@ import com.google.gwt.resources.client.I import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.DataGrid; import com.google.gwt.user.cellview.client.Header; +import com.google.gwt.user.cellview.client.RowStyles; import com.google.gwt.view.client.DefaultSelectionEventManager; import com.google.gwt.view.client.MultiSelectionModel; import com.google.gwt.view.client.ProvidesKey; @@ -538,10 +540,15 @@ public class MessagesCellTable extends D public interface Resources extends DataGrid.Resources { - DataGrid.Resources INSTANCE = GWT.create(Resources.class); + Resources INSTANCE = GWT.create(Resources.class); @Source(res/CssMessagesCellTable.css) - Style dataGridStyle(); + CustomStyle dataGridStyle(); + } + + public interface CustomStyle extends Style { + String fontBold(); + String fontNormal(); } public CheckboxColumn getCheckboxCol() { @@ -554,12 +561,10 @@ public class MessagesCellTable extends D return item == null ? null : item.getUid(); } }; - private final SelectionModel? super Message selectionModel = new MultiSelectionModelMessage( - KEY_PROVIDER); + private final SelectionModel? super Message selectionModel = new MultiSelectionModelMessage(KEY_PROVIDER); @Inject - public MessagesCellTable(final HupaImageBundle imageBundle, - final HupaConstants constants) { + public MessagesCellTable(final HupaImageBundle imageBundle, final HupaConstants constants) { super(PAGE_SIZE, Resources.INSTANCE); this.imageBundle = imageBundle; @@ -572,8 +577,7 @@ public class MessagesCellTable extends D return false; } }; - HeaderImageResource attachedPin = new HeaderImageResource( - headerAttached) { + HeaderImageResource attachedPin = new HeaderImageResource(headerAttached) { @Override public ImageResource getValue() { return imageBundle.attachmentIcon(); @@ -582,8 +586,7 @@ public class MessagesCellTable extends D header.setUpdater(new ValueUpdaterBoolean() { @Override public void update(Boolean value) { - ListMessage displayedItems = MessagesCellTable.this - .getVisibleItems(); + ListMessage displayedItems = MessagesCellTable.this.getVisibleItems(); for (Message msg : displayedItems) { selectionModel.setSelected(msg, value); } @@ -604,10 +607,27 @@ public class MessagesCellTable extends D addColumn(dateCol, constants.mailTableDate()); setColumnWidth(dateCol, 10, Unit.EM); setRowCount(PAGE_SIZE, false); + setRowStyles(new RowStylesMessage() { + @Override + public String getStyleNames(Message row, int rowIndex) { + return haveRead(row) ? markAsRead() : markAsUnread(); + } + + private String markAsUnread() { + return Resources.INSTANCE.dataGridStyle().fontBold(); + } + + private String markAsRead
svn commit: r1522318 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 04:15:49 2013 New Revision: 1522318 URL: http://svn.apache.org/r1522318 Log: beutify the popup menu Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522318r1=1522317r2=1522318view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Thu Sep 12 04:15:49 2013 @@ -291,16 +291,16 @@ -o-box-shadow: 0 2px 6px 0 #333; } - .popupMenu td { - border-top: 1px solid #5a5a5a; - border-bottom: 1px solid #333; - } - .toolBarMenu { margin: 0; padding: 0; } + .toolBarMenu td { +border-top: 1px solid #5a5a5a; +border-bottom: 1px solid #333; +} + .activeIcon { display: block; white-space: nowrap; - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522320 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/MessageListView.java ui/MessageListView.ui.xml ui/MessagesCellTable.java
Author: dongxu Date: Thu Sep 12 04:16:29 2013 New Revision: 1522320 URL: http://svn.apache.org/r1522320 Log: try to link the mark actions to rf services Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522320r1=1522319r2=1522320view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 04:16:29 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.activity; HEAD HEAD HEAD + HEAD import java.util.ArrayList; import java.util.List; @@ -152,12 +153,22 @@ public class ToolBarActivity extends App === === === +=== +import java.util.ArrayList; +import java.util.List; + +import org.apache.hupa.client.rf.SetFlagRequest; + try to link the mark actions to rf services import org.apache.hupa.client.ui.MessagesCellTable; link the mark action to the message list such that they can change upon the actions import org.apache.hupa.client.ui.ToolBarView.Parameters; coping with reply and forward sending message import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.data.MessageImpl.IMAPFlag; +import org.apache.hupa.shared.domain.GenericResult; +import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; +import org.apache.hupa.shared.domain.SetFlagAction; import org.apache.hupa.shared.events.ExpandMessageEvent; import org.apache.hupa.shared.events.ExpandMessageEventHandler; import org.apache.hupa.shared.events.LoadMessagesEvent; @@ -173,11 +184,13 @@ import com.google.gwt.user.client.ui.Acc import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; +import com.google.web.bindery.requestfactory.shared.Receiver; public class ToolBarActivity extends AppBaseActivity { @Inject private Displayable display; @Inject private MessagesCellTable table; + protected ImapFolder folder; @Override public void start(AcceptsOneWidget container, EventBus eventBus) { @@ -202,6 +215,7 @@ public class ToolBarActivity extends App public void onLoadMessagesEvent(LoadMessagesEvent e) { display.disableMessageTools(); display.setParameters(new Parameters(e.getUser(), e.getFolder(), null, null)); + folder = e.getFolder(); } }); eventBus.addHandler(ExpandMessageEvent.TYPE, new ExpandMessageEventHandler() { @@ -239,11 +253,27 @@ public class ToolBarActivity extends App } protected void toMarkRead(boolean read) { + ListLong uids = new ArrayListLong(); for (Message msg : table.getVisibleItems()) { if (table.getSelectionModel().isSelected(msg)) { - table.markRead(msg, read); + uids.add(msg.getUid()); } } + SetFlagRequest req = this.requestFactory.setFlagRequest(); + SetFlagAction action = req.create(SetFlagAction.class); + ImapFolder f = req.create(ImapFolder.class); + f.setFullName(folder.getFullName()); + action.setFolder(f); + action.setFlag(IMAPFlag.SEEN); + action.setValue(read); + action.setUids(uids); + req.set(action).fire(new ReceiverGenericResult() { + @Override + public void onSuccess(GenericResult response) { + table.redraw(); + table.onResize(); + } + }); } public interface Displayable extends WidgetDisplayable { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522320r1=1522319r2=1522320view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui
svn commit: r1522319 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ToolBarActivity.java ui/MessagesCellTable.java ui/ToolBarView.java ui/ToolBarView.ui.xml
Author: dongxu Date: Thu Sep 12 04:16:09 2013 New Revision: 1522319 URL: http://svn.apache.org/r1522319 Log: link the mark action to the message list such that they can change upon the actions Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522319r1=1522318r2=1522319view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 04:16:09 2013 @@ -21,6 +21,7 @@ package org.apache.hupa.client.activity; HEAD HEAD + HEAD import java.util.ArrayList; import java.util.List; @@ -150,9 +151,13 @@ public class ToolBarActivity extends App } === === +=== +import org.apache.hupa.client.ui.MessagesCellTable; + link the mark action to the message list such that they can change upon the actions import org.apache.hupa.client.ui.ToolBarView.Parameters; coping with reply and forward sending message import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.events.ExpandMessageEvent; import org.apache.hupa.shared.events.ExpandMessageEventHandler; import org.apache.hupa.shared.events.LoadMessagesEvent; @@ -160,14 +165,19 @@ import org.apache.hupa.shared.events.Loa import org.apache.hupa.shared.events.LoginEvent; import org.apache.hupa.shared.events.LoginEventHandler; +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; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; public class ToolBarActivity extends AppBaseActivity { @Inject private Displayable display; + @Inject private MessagesCellTable table; @Override public void start(AcceptsOneWidget container, EventBus eventBus) { @@ -197,9 +207,43 @@ public class ToolBarActivity extends App eventBus.addHandler(ExpandMessageEvent.TYPE, new ExpandMessageEventHandler() { public void onExpandMessage(ExpandMessageEvent event) { display.enableMessageTools(); - display.setParameters(new Parameters(event.getUser(), event.getFolder(), event.getMessage(), event.getMessageDetails())); + display.setParameters(new Parameters(event.getUser(), event.getFolder(), event.getMessage(), event + .getMessageDetails())); } }); + registerHandler(display.getMark().addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + // Reposition the popup relative to the button + Widget source = (Widget) event.getSource(); + int left = source.getAbsoluteLeft(); + int top = source.getAbsoluteTop() + source.getOffsetHeight(); + display.getPopup().setPopupPosition(left, top); + // Show the popup + display.getPopup().show(); + } + })); + registerHandler(display.getMarkRead().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + toMarkRead(true); + display.getPopup().hide(); + } + })); + registerHandler(display.getMarkUnread().addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + toMarkRead(false); + display.getPopup().hide(); + } + })); + } + + protected void toMarkRead(boolean read) { + for (Message msg : table.getVisibleItems
svn commit: r1522323 - /james/hupa/trunk/README.txt
Author: dongxu Date: Thu Sep 12 04:17:18 2013 New Revision: 1522323 URL: http://svn.apache.org/r1522323 Log: switch from svn to git Modified: james/hupa/trunk/README.txt Modified: james/hupa/trunk/README.txt URL: http://svn.apache.org/viewvc/james/hupa/trunk/README.txt?rev=1522323r1=1522322r2=1522323view=diff == --- james/hupa/trunk/README.txt (original) +++ james/hupa/trunk/README.txt Thu Sep 12 04:17:18 2013 @@ -54,5 +54,4 @@ shared, mock, server, widget and client. 'GWT module hupa needs to be (re)compiled, please run a compile or use the Compile/Browse button in hosted mode' Configure the plugin to compile only the 'Hupa' module. - Properties - Google - Web Toolkit - Entry Point Modules - Hupa - org.apache.hupa - + Properties - Google - Web Toolkit - Entry Point Modules - Hupa - org.apache.hupa - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522324 - /james/hupa/trunk/.gitignore
Author: dongxu Date: Thu Sep 12 04:17:29 2013 New Revision: 1522324 URL: http://svn.apache.org/r1522324 Log: add gitignore to ignore files by git Modified: james/hupa/trunk/.gitignore Modified: james/hupa/trunk/.gitignore URL: http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522324r1=1522323r2=1522324view=diff == --- james/hupa/trunk/.gitignore (original) +++ james/hupa/trunk/.gitignore Thu Sep 12 04:17:29 2013 @@ -4,7 +4,10 @@ client/.classpath client/.project client/.settings/ client/target/ + HEAD client/.gwt/ +=== + add gitignore to ignore files by git mock/.classpath mock/.project mock/.settings/ @@ -23,7 +26,10 @@ widgets/.classpath widgets/.project widgets/.settings/ widgets/target/ + HEAD client/src/main/gwt-unitCache/ client/src/main/webapp/WEB-INF/deploy/ client/src/main/webapp/hupa/ +=== + add gitignore to ignore files by git - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522321 - /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Author: dongxu Date: Thu Sep 12 04:16:45 2013 New Revision: 1522321 URL: http://svn.apache.org/r1522321 Log: prepare to add right click event to folders list Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522321r1=1522320r2=1522321view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:16:45 2013 @@ -237,7 +237,7 @@ import com.google.inject.assistedinject. public class FolderListView extends Composite implements FolderListActivity.Displayable { @UiField SimplePanel thisView; - private CellTree cellTree; + private FolderCellTree cellTree; // FIXME here we can not support another cell tree, since both of their // style // would not be cleared. @@ -255,7 +255,7 @@ public class FolderListView extends Comp } thisView.add(contactPanel); } else { - cellTree = new CellTree(viewModel, null, Resources.INSTANCE); + cellTree = new FolderCellTree(viewModel, null, Resources.INSTANCE); cellTree.setAnimationEnabled(true); if (thisView.getWidget() != null thisView.getWidget() instanceof HTMLPanel) { - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522322 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: FolderListView.java RightCellTree.java res/CssFolderListView.css
Author: dongxu Date: Thu Sep 12 04:17:07 2013 New Revision: 1522322 URL: http://svn.apache.org/r1522322 Log: add style to popup menu Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssFolderListView.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522322r1=1522321r2=1522322view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 04:17:07 2013 @@ -224,7 +224,6 @@ import org.apache.hupa.client.place.Comp import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; -import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.cellview.client.CellTree; @@ -237,7 +236,7 @@ import com.google.inject.assistedinject. public class FolderListView extends Composite implements FolderListActivity.Displayable { @UiField SimplePanel thisView; - private FolderCellTree cellTree; + private RightCellTree cellTree; // FIXME here we can not support another cell tree, since both of their // style // would not be cleared. @@ -255,7 +254,7 @@ public class FolderListView extends Comp } thisView.add(contactPanel); } else { - cellTree = new FolderCellTree(viewModel, null, Resources.INSTANCE); + cellTree = new RightCellTree(viewModel); cellTree.setAnimationEnabled(true); if (thisView.getWidget() != null thisView.getWidget() instanceof HTMLPanel) { @@ -271,17 +270,6 @@ public class FolderListView extends Comp make compose panel left another widget rather than cell tree } - public interface Resources extends CellTree.Resources { - - Resources INSTANCE = GWT.create(Resources.class); - - @Source(res/CssFolderListView.css) - public CellTree.Style cellTreeStyle(); - - @Source(res/listicons.png) - public ImageResource listicons(); - } - interface FolderListUiBinder extends UiBinderSimplePanel, FolderListView { } Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java?rev=1522322view=auto == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java (added) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/RightCellTree.java Thu Sep 12 04:17:07 2013 @@ -0,0 +1,104 @@ +package org.apache.hupa.client.ui; + +import com.google.gwt.core.shared.GWT; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.user.cellview.client.CellTree; +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.DecoratedPopupPanel; +import com.google.gwt.user.client.ui.MenuBar; +import com.google.gwt.user.client.ui.MenuItem; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.view.client.TreeViewModel; + +/** + * CellTree with right click event menu drop down + */ +public class RightCellTree extends CellTree { + final DecoratedPopupPanel simplePopup = new DecoratedPopupPanel(true); + + public T RightCellTree(TreeViewModel viewModel, T rootValue, Resources resources) { + super(viewModel, rootValue, resources); + this.sinkEvents(Event.ONMOUSEUP | Event.ONDBLCLICK | Event.ONCONTEXTMENU); + MenuBar popup = new MenuBar(true); + MenuItem newItem = new MenuItem(New subfolder, true, newSubfolderCommand); + MenuItem markItem = new MenuItem(Mark all as read, true, markAllReadCommand); + newItem.addStyleName(Resources.INSTANCE.cellTreeStyle().menuItem()); + markItem.addStyleName(Resources.INSTANCE.cellTreeStyle().menuItem()); + popup.addItem(newItem
svn commit: r1522325 - /james/hupa/trunk/.gitignore
Author: dongxu Date: Thu Sep 12 04:17:41 2013 New Revision: 1522325 URL: http://svn.apache.org/r1522325 Log: update git ignore Modified: james/hupa/trunk/.gitignore Modified: james/hupa/trunk/.gitignore URL: http://svn.apache.org/viewvc/james/hupa/trunk/.gitignore?rev=1522325r1=1522324r2=1522325view=diff == --- james/hupa/trunk/.gitignore (original) +++ james/hupa/trunk/.gitignore Thu Sep 12 04:17:41 2013 @@ -5,9 +5,13 @@ client/.project client/.settings/ client/target/ HEAD + HEAD client/.gwt/ === add gitignore to ignore files by git +=== +client/.gwt/ + update git ignore mock/.classpath mock/.project mock/.settings/ @@ -27,9 +31,13 @@ widgets/.project widgets/.settings/ widgets/target/ HEAD + HEAD client/src/main/gwt-unitCache/ client/src/main/webapp/WEB-INF/deploy/ client/src/main/webapp/hupa/ === add gitignore to ignore files by git +=== + + update git ignore - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522327 - /james/hupa/trunk/client/pom.xml
Author: dongxu Date: Thu Sep 12 04:18:02 2013 New Revision: 1522327 URL: http://svn.apache.org/r1522327 Log: validation-api should be in the final .war Modified: james/hupa/trunk/client/pom.xml Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522327r1=1522326r2=1522327view=diff == --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Thu Sep 12 04:18:02 2013 @@ -149,7 +149,6 @@ dependency groupIdjavax.validation/groupId artifactIdvalidation-api/artifactId -scopeprovided/scope /dependency dependency groupIdjavax.validation/groupId - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522326 - /james/hupa/trunk/pom.xml
Author: dongxu Date: Thu Sep 12 04:17:51 2013 New Revision: 1522326 URL: http://svn.apache.org/r1522326 Log: upgrade gwt to 2.5.1 Modified: james/hupa/trunk/pom.xml Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522326r1=1522325r2=1522326view=diff == --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Sep 12 04:17:51 2013 @@ -116,12 +116,17 @@ HEAD HEAD HEAD + HEAD gwtVersion2.5.1/gwtVersion gwtMavenVersion2.5.1/gwtMavenVersion === gwtVersion2.5.0/gwtVersion gwtMavenVersion2.5.0/gwtMavenVersion update to the latest 2.5.0 version of gwt +=== +gwtVersion2.5.1/gwtVersion +gwtMavenVersion2.5.1/gwtMavenVersion + upgrade gwt to 2.5.1 gwt.moduleSuffix / gwt.logLevelERROR/gwt.logLevel jettyVersion7.3.0.v20110203/jettyVersion - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1522328 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ ioc/ mapper/ ui/
Author: dongxu Date: Thu Sep 12 04:18:31 2013 New Revision: 1522328 URL: http://svn.apache.org/r1522328 Log: try to fix some issues by reorganize the activity mapper and place controller Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AbstractActivityMapper.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.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/mapper/LogoActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/NavigationActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/StatusActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522328r1=1522327r2=1522328view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java Thu Sep 12 04:18:31 2013 @@ -168,9 +168,14 @@ public class TopBarActivity extends AppB @Override public void start(AcceptsOneWidget container, EventBus eventBus) { + eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { + public void onLogin(LoginEvent event) { + user = event.getUser(); + } + }); container.setWidget(display.asWidget()); bindTo(eventBus); - if (user != null isOccupied()) { + if (user != null !isOccupied()) { display.getUserLabel().add(new HTML(user.getName())); } } @@ -183,11 +188,6 @@ public class TopBarActivity extends AppB === private void bindTo(EventBus eventBus) { - eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() { - public void onLogin(LoginEvent event) { - user = event.getUser(); - } - }); registerHandler(display.getLogoutClick().addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { doLogout(); 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=1522328r1=1522327r2=1522328view=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 04:18:31 2013 @@ -524,8 +524,12 @@ public class AppGinModule extends Abstra bind(ComposeToolBarActivity.class).in(Singleton.class); bind(ComposeActivity.class).in(Singleton.class); + HEAD integrate all of the views to their corresponding activities and mappers bind(TopActivity.Displayable.class).to(TopView.class); +=== + bind(TopActivity.Displayable.class).to(TopView.class).in(Singleton.class); + try to fix some issues by reorganize the activity mapper and place controller bind(WestActivity.Displayable.class).to(WestView.class).in(Singleton.class); bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class); bind(MessageSendActivity.Displayable.class).to(MessageSendView.class); Added: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AbstractActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AbstractActivityMapper.java?rev=1522328view=auto == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper
svn commit: r1522329 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: ./ activity/ ioc/ mapper/ place/ ui/
Author: dongxu Date: Thu Sep 12 04:18:58 2013 New Revision: 1522329 URL: http://svn.apache.org/r1522329 Log: fixed issue#46 and issue#32 Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.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/TopBarActivity.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/mapper/TopBarActivityMapper.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/ui/TopBarView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522329r1=1522328r2=1522329view=diff == --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 04:18:58 2013 @@ -69,6 +69,8 @@ import org.apache.hupa.client.rf.HupaReq import org.apache.hupa.client.ui.HupaLayoutable; import org.apache.hupa.client.ui.LoginLayoutable; import org.apache.hupa.client.ui.LoginView; +import org.apache.hupa.shared.domain.User; +import org.apache.hupa.shared.events.LoginEvent; move new theme ui from experiment to hupa evo import com.google.gwt.dom.client.StyleInjector; @@ -113,14 +115,16 @@ import com.google.web.bindery.requestfac public class HupaController { - @Inject private PlaceHistoryHandler placeHistoryHandler; + private PlaceController placeController; + private PlaceHistoryHandler placeHistoryHandler; @Inject private HupaLayoutable hupaLayout; - @Inject private PlaceController placeController; @Inject private HupaRequestFactory requestFactory; @Inject private LoginLayoutable loginLayout; + private EventBus eventBus; @Inject HEAD + HEAD public HupaController(EventBus eventBus) { move new theme ui from experiment to hupa evo === @@ -131,6 +135,15 @@ public class HupaController { === ActivityManagerInitializer initializeActivityManagerByGin) { use GinFactoryModuleBuilder to inject multiple displayable instances of some activities +=== + public HupaController(PlaceController placeController, + PlaceHistoryHandler placeHistoryHandler, + EventBus eventBus, + ActivityManagerInitializer initializeActivityManagerByGin) { + this.placeController = placeController; + this.placeHistoryHandler = placeHistoryHandler; + this.eventBus = eventBus; + fixed issue#46 and issue#32 eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceChangHandler()); } @@ -268,7 +281,6 @@ public class HupaController { === cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token placeHistoryHandler.handleCurrentHistory(); - checkSession(); } private void bindCss() { @@ -281,6 +293,7 @@ public class HupaController { @Override public void onPlaceChange(PlaceChangeEvent event) { adjustLayout(event); + checkSession(); } } @@ -298,15 +311,16 @@ public class HupaController { === private void checkSession() { CheckSessionRequest checkSession = requestFactory.sessionRequest(); - checkSession.isValid().fire(new ReceiverBoolean() { + checkSession.getUser().fire(new ReceiverUser() { @Override - public void onSuccess(Boolean sessionValid) { - if (!sessionValid) { + public void onSuccess(User user) { + if (user == null) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); } else { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(hupaLayout.get()); +eventBus.fireEvent(new LoginEvent(user