You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2013/09/23 09:04:13 UTC
svn commit: r1525515 [2/13] - in /james/hupa/trunk: ./ client/
client/src/main/java/org/apache/hupa/
client/src/main/java/org/apache/hupa/client/
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/ioc/ cli...
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=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,22 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< 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.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class ComposeToolBarActivity extends AppBaseActivity {
@@ -46,13 +33,5 @@ public class ComposeToolBarActivity exte
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< 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
-=======
public interface Displayable extends IsWidget {}
->>>>>>> replace with IsWidget
}
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=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,81 +19,18 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.shared.events.RefreshUnreadEvent;
import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
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.ioc.FolderListFactory;
->>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances of some activities
-=======
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-import org.apache.hupa.client.ui.WidgetDisplayable;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
-import org.apache.hupa.shared.events.RefreshUnreadEvent;
-import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
-
->>>>>>> done issue#72, get back the unread count
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class FolderListActivity extends AppBaseActivity {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-=======
- @Inject private FolderListFactory folderListFactory;
- private Place place;
- private Displayable display;
->>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances of some activities
-=======
- @Inject private Displayable display;
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
-
- @Override
- public void start(AcceptsOneWidget container, EventBus eventBus) {
- container.setWidget(display.asWidget());
- bindTo(eventBus);
- }
-
- private void bindTo(EventBus eventBus) {
-
- eventBus.addHandler(RefreshUnreadEvent.TYPE, new RefreshUnreadEventHandler() {
- @Override
- public void onRefreshEvent(RefreshUnreadEvent event) {
- display.refresh();
- }
- });
- }
-
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {
- 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());
@@ -110,31 +47,7 @@ public class FolderListActivity extends
});
}
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
- public FolderListActivity with(Place place) {
- if (display == null || !place.getClass().equals(this.place.getClass())) {
- display = folderListFactory.create(place);
- this.place = place;
- }
- return this;
- }
-
-<<<<<<< HEAD
->>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances of some activities
-=======
->>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, don't use contact instead of folders list
- public interface Displayable extends WidgetDisplayable {
-=======
public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
void refresh();
}
->>>>>>> make reload mail folder place work, fixed issue #7
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java Mon Sep 23 07:04:08 2013
@@ -19,14 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.rf.DeleteFolderRequest;
import org.apache.hupa.client.ui.LabelNode;
-<<<<<<< HEAD
import org.apache.hupa.shared.domain.DeleteFolderAction;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -115,121 +110,4 @@ public class LabelListActivity extends A
}
});
}
-=======
-=======
-import org.apache.hupa.client.ui.LabelNode;
->>>>>>> add rename RF to label setting feature
-=======
->>>>>>> fixed issue#57 - really disable the tools in toolbar
-=======
-import org.apache.hupa.client.HupaController;
-import org.apache.hupa.client.rf.DeleteFolderRequest;
-import org.apache.hupa.client.ui.LabelNode;
->>>>>>> make delete label in label setting work(backend now)
-import org.apache.hupa.client.ui.WidgetDisplayable;
-=======
->>>>>>> replace with IsWidget
-import org.apache.hupa.shared.domain.DeleteFolderAction;
-import org.apache.hupa.shared.domain.GenericResult;
-import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.events.DeleteFolderEvent;
-import org.apache.hupa.shared.events.DeleteFolderEventHandler;
-import org.apache.hupa.shared.events.RefreshLabelListEvent;
-import org.apache.hupa.shared.events.RefreshLabelListEventHandler;
-
-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.Window;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.view.client.SingleSelectionModel;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class LabelListActivity extends AppBaseActivity {
-
- @Inject private HupaController hupaController;
- @Inject private Displayable display;
- @Inject private LabelPropertiesActivity.Displayable labelProperties;
-
-
- @Override
- public void start(AcceptsOneWidget container, EventBus eventBus) {
- container.setWidget(display.asWidget());
- bindTo(eventBus);
- }
-
- private void bindTo(final EventBus eventBus) {
- this.registerHandler(display.getDelete().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- if (Window.confirm("Are you sure?")) {
- eventBus.fireEvent(new DeleteFolderEvent());
- }
- }
- }));
- eventBus.addHandler(DeleteFolderEvent.TYPE, new DeleteFolderEventHandler() {
- @Override
- public void onDeleteFolderEvent(DeleteFolderEvent event) {
- deleteSelected();
- }
- });
- eventBus.addHandler(RefreshLabelListEvent.TYPE, new RefreshLabelListEventHandler(){
- @Override
- public void onRefreshEvent(RefreshLabelListEvent event) {
- display.refresh();
- }
- });
- }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-<<<<<<< HEAD
-
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> make label settings prototype
-=======
-
-=======
->>>>>>> make add of label setting work in backend
- public interface Displayable extends WidgetDisplayable {
-=======
- public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
- final int CASCADE_TYPE_ADD = 0x01;
- final int CASCADE_TYPE_RENAME = 0x02;
- SingleSelectionModel<LabelNode> getSelectionModel();
- HasClickHandlers getAdd();
- HasClickHandlers getDelete();
- void refresh();
- }
-
- public void deleteSelected() {
- hupaController.showTopLoading("Deleting...");
- SingleSelectionModel<LabelNode> selectionModel = display.getSelectionModel();
- LabelNode labelNode = selectionModel.getSelectedObject();
- DeleteFolderRequest req = rf.deleteFolderRequest();
- DeleteFolderAction action = req.create(DeleteFolderAction.class);
- final ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(labelNode.getFolder().getFullName());
- action.setFolder(f);
- req.delete(action).fire(new Receiver<GenericResult>() {
- @Override
- public void onSuccess(GenericResult response) {
- hupaController.hideTopLoading();
- display.refresh();
- hupaController.showNotice("The label \"" + f.getFullName() + "\" was deleted.", 10000);
- }
- @Override
- public void onFailure(ServerFailure error) {
- hupaController.hideTopLoading();
- hupaController.showNotice(error.getMessage(), 10000);
- }
- });
- }
->>>>>>> add rename RF to label setting feature
}
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=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Mon Sep 23 07:04:08 2013
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -22,138 +17,27 @@
* under the License. *
****************************************************************/
-<<<<<<< HEAD
package org.apache.hupa.client.activity;
import org.apache.hupa.client.HupaConstants;
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.HupaLayoutable;
-<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.SessionExpireEvent;
import org.apache.hupa.shared.events.SessionExpireEventHandler;
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-package org.apache.hupa.client.activity;
-
-<<<<<<< HEAD
-import net.customware.gwt.dispatch.client.DispatchAsync;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-import org.apache.hupa.client.HupaConstants;
-<<<<<<< HEAD
-import org.apache.hupa.client.evo.HupaEvoCallback;
-import org.apache.hupa.client.place.MailFolderPlace;
-import org.apache.hupa.client.ui.WidgetDisplayable;
-import org.apache.hupa.shared.events.FlashEvent;
-import org.apache.hupa.shared.events.SessionExpireEvent;
-import org.apache.hupa.shared.events.SessionExpireEventHandler;
-=======
-import org.apache.hupa.client.HupaEvoCallback;
-import org.apache.hupa.client.place.LoginPlace;
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-import org.apache.hupa.client.HupaEvoCallback;
-import org.apache.hupa.client.mvp.WidgetDisplayable;
-import org.apache.hupa.client.place.MailInboxPlace;
->>>>>>> Change to new mvp framework - first step
-=======
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-import org.apache.hupa.client.HupaConstants;
-import org.apache.hupa.client.place.DefaultPlace;
-=======
->>>>>>> scrub code
-import org.apache.hupa.client.place.MailFolderPlace;
-=======
-import org.apache.hupa.client.place.FolderPlace;
->>>>>>> change place management and make refresh folder and message list more gentle
-import org.apache.hupa.client.rf.LoginUserRequest;
-import org.apache.hupa.client.ui.HupaLayoutable;
-import org.apache.hupa.client.ui.WidgetDisplayable;
-=======
->>>>>>> replace with IsWidget
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.FlashEvent;
-import org.apache.hupa.shared.events.LoginEvent;
-import org.apache.hupa.shared.events.SessionExpireEvent;
-import org.apache.hupa.shared.events.SessionExpireEventHandler;
-<<<<<<< HEAD
->>>>>>> decorate the theme
-import org.apache.hupa.shared.rpc.LoginUser;
-import org.apache.hupa.shared.rpc.LoginUserResult;
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-
-<<<<<<< HEAD
-import com.google.gwt.activity.shared.AbstractActivity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import com.google.gwt.core.client.GWT;
->>>>>>> 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;
->>>>>>> decorate the theme
-=======
-import com.google.gwt.core.client.GWT;
->>>>>>> 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;
->>>>>>> decorate the theme
-=======
->>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
-=======
->>>>>>> scrub code
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import com.google.gwt.place.shared.PlaceController;
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-import com.google.gwt.user.client.Window;
-=======
->>>>>>> introduce the top activity
-=======
-=======
->>>>>>> scrub code
import com.google.gwt.user.client.Window;
->>>>>>> alert people "invilid login" for the wrong username and/or password, which should be improved with a gentle way
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasValue;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
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.IsWidget;
->>>>>>> replace with IsWidget
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -161,102 +45,14 @@ import com.google.web.bindery.requestfac
import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class LoginActivity extends AppBaseActivity {
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-
- @Inject private HupaLayoutable hupaLayout;
-=======
-import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
-
-public class LoginActivity extends AbstractActivity {
-
-<<<<<<< HEAD
- private final Displayable display;
- private final EventBus eventBus;
- private final PlaceController placeController;
- private DispatchAsync dispatcher;
- private HupaConstants constants = GWT.create(HupaConstants.class);
-
- @Inject
- public LoginActivity(Displayable display, EventBus eventBus, PlaceController placeController,
- DispatchAsync dispatcher) {
-=======
-import com.google.gwt.place.shared.PlaceController;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.Focusable;
-import com.google.gwt.user.client.ui.HasValue;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class LoginActivity extends AbstractActivity {
-
- private final Displayable display;
- private final EventBus eventBus;
- private final PlaceController placeController;
- private DispatchAsync dispatcher;
- private HupaConstants constants = GWT.create(HupaConstants.class);
-
- @Inject
-<<<<<<< HEAD
- public LoginActivity(Display display, EventBus eventBus, PlaceController placeController, DispatchAsync dispatcher,
- Provider<LoginPlace> newGoToPlaceProvider) {
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- public LoginActivity(Displayable display, EventBus eventBus, PlaceController placeController,
-<<<<<<< HEAD
- Provider<MailInboxPlace> mailInboxPlaceProvider, DispatchAsync dispatcher) {
->>>>>>> Change to new mvp framework - first step
-=======
- DispatchAsync dispatcher) {
->>>>>>> At first make the inbox work, but only when click the refresh button. The page also be working, the other folder will be like the same.
- this.display = display;
- this.eventBus = eventBus;
- this.placeController = placeController;
- this.dispatcher = dispatcher;
-<<<<<<< HEAD
-<<<<<<< HEAD
- }
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- this.newGoToPlaceProvider = newGoToPlaceProvider;
- // this.loginRpcService = loginRpcService;
- }
-
- public void init(LoginPlace place) {
- this.place = place;
-=======
->>>>>>> Change to new mvp framework - first step
- }
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- @Inject private Displayable display;
- @Inject private EventBus eventBus;
- @Inject private PlaceController placeController;
- @Inject private HupaConstants constants;
-<<<<<<< HEAD
->>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
-=======
- @Inject private HupaRequestFactory requestFactory;
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> scrub code
-=======
@Inject private HupaLayoutable hupaLayout;
->>>>>>> integrate all of the views to their corresponding activities and mappers
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
bind();
container.setWidget(display.asWidget());
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
display.setLoading(false);
}
@@ -272,95 +68,15 @@ public class LoginActivity extends Abstr
eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(), 4000));
}
});
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- display.setLoading(false);
-<<<<<<< HEAD
->>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email folder's been frozen exception; 3)back, logout, ...buttons wired behavior.
-
-=======
->>>>>>> scrub code
- }
-
- public void bind() {
- registerHandler(display.getLoginClick().addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent event) {
- doLogin();// FIXME double run if press "ENTER" key in the login
- // page
- }
-<<<<<<< HEAD
- });
-<<<<<<< HEAD
-<<<<<<< HEAD
- display.getResetClick().addClickHandler(new ClickHandler() {
-
- public void onClick(ClickEvent event) {
- doReset();
- }
-
- });
- eventBus.addHandler(SessionExpireEvent.TYPE, new SessionExpireEventHandler() {
-
- public void onSessionExpireEvent(SessionExpireEvent event) {
- eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(), 4000));
- }
-=======
- display.getResetClick().addClickHandler(new ClickHandler() {
-
-=======
- }));
-<<<<<<< HEAD
- registerHandler(display.getResetClick().addClickHandler(new ClickHandler() {
->>>>>>> scrub code
- public void onClick(ClickEvent event) {
- doReset();
- }
- }));
-=======
->>>>>>> refactoring theme 1 - login page
- eventBus.addHandler(SessionExpireEvent.TYPE, new SessionExpireEventHandler() {
-<<<<<<< HEAD
-
-<<<<<<< HEAD
- public void onSessionExpireEvent(SessionExpireEvent event) {
- eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(), 4000));
- }
-
- });
->>>>>>> decorate the theme
-=======
- public void onSessionExpireEvent(SessionExpireEvent event) {
- eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(), 4000));
- }
->>>>>>> introduce the top activity
-
- });
-
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- public void onSessionExpireEvent(SessionExpireEvent event) {
- eventBus.fireEvent(new FlashEvent(constants.sessionTimedOut(), 4000));
- }
- });
->>>>>>> scrub code
}
private void doLogin() {
String user = display.getUserNameValue().getValue().trim();
String pass = display.getPasswordValue().getValue().trim();
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
if (user.isEmpty() || pass.isEmpty())
return;
display.setLoading(true);
LoginUserRequest loginRequest = rf.loginRequest();
-<<<<<<< HEAD
loginRequest.login(user, pass).fire(new Receiver<User>() {
@Override
public void onSuccess(User response) {
@@ -374,147 +90,9 @@ public class LoginActivity extends Abstr
public void onFailure(ServerFailure error) {
Window.alert(error.getMessage());// TODO a more gentle way
display.setLoading(false);
-=======
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-
-=======
->>>>>>> scrub code
- if (user.isEmpty() || pass.isEmpty())
- return;
- display.setLoading(true);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-// HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
-// rf.initialize(eventBus);
-// UserRequest userRequest = rf.userRequest();
-// UserProxy user1 = userRequest.create(UserProxy.class);
-// user1.setName(user);
-// user1.setPassword(pass);
-// userRequest.save(user1).fire(new Receiver<UserProxy>(){
-//
-// @Override
-// public void onSuccess(UserProxy user) {
-// display.setLoading(false);
-// LoginActivity.this.placeController.goTo(new MailFolderPlace().with(null));
-// doReset();
-// }
-//
-// });
-
-
-
-<<<<<<< HEAD
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
- dispatcher.execute(new LoginUser(user, pass), new HupaEvoCallback<LoginUserResult>(dispatcher, eventBus,
- display) {
- public void callback(LoginUserResult result) {
- display.setLoading(false);
-<<<<<<< HEAD
-<<<<<<< HEAD
- // eventBus.fireEvent(new LoginEvent(result.getUser()));
-// LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get().with(result.getUser()));
- LoginActivity.this.placeController.goTo(new MailFolderPlace().with(result.getUser()));
-<<<<<<< HEAD
-=======
- Window.alert("success");
- // eventBus.fireEvent(new LoginEvent(result.getUser()));
-// LoginActivity.this.placeController.goTo(newGoToPlaceProvider.get());
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- // eventBus.fireEvent(new LoginEvent(result.getUser()));
-<<<<<<< HEAD
- LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get().with(result.getUser()));
->>>>>>> Change to new mvp framework - first step
-=======
-// LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get().with(result.getUser()));
- LoginActivity.this.placeController.goTo(new MailInboxPlace("!").with(result.getUser()));
->>>>>>> At first make the inbox work, but only when click the refresh button. The page also be working, the other folder will be like the same.
-=======
->>>>>>> 1. improve the inbox folder place.
- doReset();
- }
-
- public void callbackError(Throwable caught) {
- display.setLoading(false);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- Window.alert("error");
-<<<<<<< HEAD
-<<<<<<< HEAD
- LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get());
- // eventBus.fireEvent(new FlashEvent(constants.loginInvalid(),
- // 4000));
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
- // eventBus.fireEvent(new FlashEvent(constants.loginInvalid(),4000));
->>>>>>> decorate the theme
-=======
- eventBus.fireEvent(new FlashEvent(constants.loginInvalid(), 4000));
->>>>>>> introduce the top activity
-=======
- // eventBus.fireEvent(new FlashEvent(constants.loginInvalid(),4000));
->>>>>>> decorate the theme
-=======
- eventBus.fireEvent(new FlashEvent(constants.loginInvalid(), 4000));
->>>>>>> introduce the top activity
doReset();
}
});
-
-<<<<<<< HEAD
-=======
- Window.alert("failure");
-// LoginActivity.this.placeController.goTo(newGoToPlaceProvider.get());
-=======
- Window.alert("error");
- LoginActivity.this.placeController.goTo(mailInboxPlaceProvider.get());
->>>>>>> Change to new mvp framework - first step
- // eventBus.fireEvent(new FlashEvent(constants.loginInvalid(),
- // 4000));
- doReset();
- }
- });
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
-=======
-
-=======
->>>>>>> scrub code
- LoginUserRequest loginRequest = requestFactory.loginRequest();
-=======
->>>>>>> change message list view to make it not refresh the whole list when click one of the messages
- loginRequest.login(user, pass).fire(new Receiver<User>() {
- @Override
- public void onSuccess(User response) {
- RootLayoutPanel.get().clear();
- RootLayoutPanel.get().add(hupaLayout.get());
- pc.goTo(new FolderPlace(response.getSettings().getInboxFolderName()));
- eventBus.fireEvent(new LoginEvent(response));
- display.setLoading(false);
- }
- @Override
- public void onFailure(ServerFailure error) {
- Window.alert(error.getMessage());// TODO a more gentle way
- display.setLoading(false);
- doReset();
- }
- });
-<<<<<<< HEAD
-
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-=======
->>>>>>> scrub code
}
/**
@@ -526,52 +104,15 @@ public class LoginActivity extends Abstr
display.getUserNameFocus().setFocus(true);
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
@Inject private Displayable display;
@Inject private HupaConstants constants;
public interface Displayable extends IsWidget {
-<<<<<<< HEAD
- public HasClickHandlers getLoginClick();
- public HasValue<String> getUserNameValue();
- public HasValue<String> getPasswordValue();
- public Focusable getUserNameFocus();
- public void setLoading(boolean loading);
-=======
- public interface Display {
-=======
- public interface Displayable extends WidgetDisplayable {
->>>>>>> Change to new mvp framework - first step
-=======
- public interface Display {
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
-=======
- @Inject private Displayable display;
- @Inject private HupaConstants constants;
-
->>>>>>> scrub code
- public interface Displayable extends WidgetDisplayable {
->>>>>>> Change to new mvp framework - first step
-=======
->>>>>>> replace with IsWidget
public HasClickHandlers getLoginClick();
public HasValue<String> getUserNameValue();
public HasValue<String> getPasswordValue();
public Focusable getUserNameFocus();
public void setLoading(boolean loading);
-<<<<<<< HEAD
-
-<<<<<<< HEAD
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
-=======
->>>>>>> scrub code
public Widget asWidget();
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java Mon Sep 23 07:04:08 2013
@@ -19,22 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< 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;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class LogoActivity extends AppBaseActivity {
@@ -46,13 +33,5 @@ public class LogoActivity extends AppBas
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {}
-=======
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
public interface Displayable extends IsWidget {}
->>>>>>> replace with IsWidget
}
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=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,23 +19,13 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#64, add attachments region in message content view
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.client.place.ComposePlace;
import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-<<<<<<< HEAD
import org.apache.hupa.client.ui.ToolBarView.Parameters;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
@@ -124,7 +114,6 @@ public class MessageContentActivity exte
}
}));
-<<<<<<< HEAD
}
private boolean isUidSet() {
@@ -170,168 +159,4 @@ public class MessageContentActivity exte
return false;
};
}-*/;
-=======
-=======
-import org.apache.hupa.client.place.IMAPMessagePlace;
->>>>>>> make message content work as expected partly
-=======
-=======
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
->>>>>>> scrub code
-import org.apache.hupa.client.place.MailFolderPlace;
-=======
-import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
->>>>>>> change place management and make refresh folder and message list more gentle
-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;
-=======
->>>>>>> replace with IsWidget
-=======
-import org.apache.hupa.client.place.ComposePlace;
-import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
-import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-import org.apache.hupa.client.ui.ToolBarView.Parameters;
->>>>>>> fixed issue#84, actually, in evo, there has been several deprecated classed, include WestActivity, which is replaced by FolderListActivity
-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.MessageAttachment;
-import org.apache.hupa.shared.events.DeleteClickEvent;
-import org.apache.hupa.shared.events.DeleteClickEventHandler;
-import org.apache.hupa.shared.events.MailToEvent;
-
-import com.google.gwt.activity.shared.Activity;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class MessageContentActivity extends AppBaseActivity {
-
- private static final Logger log = Logger.getLogger(MessageContentActivity.class.getName());
-
- @Inject private Displayable display;
- private String fullName;
- private String uid;
-
- @Override
- public void start(AcceptsOneWidget container, EventBus eventBus) {
- bindTo(eventBus);
- if (isUidSet()) {
- GetMessageDetailsRequest req = rf.messageDetailsRequest();
- GetMessageDetailsAction action = req.create(GetMessageDetailsAction.class);
- final ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(fullName);
- action.setFolder(f);
- action.setUid(Long.parseLong(uid));
- req.get(action).fire(new Receiver<GetMessageDetailsResult>() {
- @Override
- public void onSuccess(GetMessageDetailsResult response) {
- display.fillMessageContent(response.getMessageDetails().getText());
- List<MessageAttachment> attaches = response.getMessageDetails().getMessageAttachments();
- if (attaches == null || attaches.isEmpty()) {
- display.showAttachmentPanel(false);
- } else {
- display.showAttachmentPanel(true);
- display.setAttachments(response.getMessageDetails().getMessageAttachments(), fullName,
- Long.parseLong(uid));
- }
- }
-
- @Override
- public void onFailure(ServerFailure error) {
- if (error.isFatal()) {
- log.log(Level.SEVERE, error.getMessage());
- // TODO write the error message to status bar.
- throw new RuntimeException(error.getMessage());
- }
- }
- });
- }
- container.setWidget(display.asWidget());
- exportJSMethods(this);
- }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-<<<<<<< HEAD
-
-<<<<<<< HEAD
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
-=======
-=======
- private void bindTo(EventBus eventBus) {
- eventBus.addHandler(DeleteClickEvent.TYPE, new DeleteClickEventHandler() {
- @Override
- public void onDeleteClickEvent(DeleteClickEvent event) {
- display.clearContent();
- }
- });
-=======
->>>>>>> fixed issue#86, use opening a new window button to show the raw message in a new window
- }
-
->>>>>>> fixed issue#76 with adding delete handler event
- private boolean isUidSet() {
- return uid != null && uid.matches("\\d+");
- }
->>>>>>> scrub code
-
-<<<<<<< HEAD
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
- public interface Displayable extends WidgetDisplayable {
-=======
- public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
- void fillMessageContent(String messageContent);
- void clearContent();
- void setAttachments(List<MessageAttachment> attachements, String folder, long uid);
- void showAttachmentPanel(boolean is);
- HasClickHandlers getRaw();
- }
-
- public Activity with(TokenWrapper tokenWrapper) {
- fullName = tokenWrapper.getFolder();
- uid = tokenWrapper.getUid();
- return this;
- }
-<<<<<<< HEAD
->>>>>>> make message content work as expected partly
-=======
-
- public void openLink(String url) {
- Window.open(url, "_blank", "");
- }
-
- public void mailTo(String mailto) {
- pc.goTo(new ComposePlace("new").with(new Parameters(null, null, null, null)));
- eventBus.fireEvent(new MailToEvent(mailto));
- }
-
- private native void exportJSMethods(MessageContentActivity activity)
- /*-{
- $wnd.openLink = function(url) {
- try {
- activity.@org.apache.hupa.client.activity.MessageContentActivity::openLink(Ljava/lang/String;) (url);
- } catch(e) {}
- return false;
- };
- $wnd.mailTo = function(mail) {
- try {
- activity.@org.apache.hupa.client.activity.MessageContentActivity::mailTo(Ljava/lang/String;) (mail);
- } catch(e) {}
- return false;
- };
- }-*/;
->>>>>>> fixed issue#84, actually, in evo, there has been several deprecated classed, include WestActivity, which is replaced by FolderListActivity
}
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=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,27 +19,18 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import java.util.Collection;
import java.util.List;
import java.util.Set;
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.client.place.AbstractPlace;
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.place.MessagePlace;
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
-<<<<<<< HEAD
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
import org.apache.hupa.client.rf.MoveMessageRequest;
import org.apache.hupa.client.ui.MessagesCellTable;
import org.apache.hupa.client.ui.ToolBarView;
-<<<<<<< HEAD
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
import org.apache.hupa.shared.domain.GenericResult;
@@ -111,12 +102,9 @@ public class MessageListActivity extends
@Override
public void onFailure(ServerFailure error) {
if (error.isFatal()) {
- // log.log(Level.SEVERE, error.getMessage());
- // TODO write the error message to
- // status bar.
toolBar.enableAllTools(false);
hc.hideTopLoading();
- throw new RuntimeException(error.getMessage());
+ hc.showNotice(error.getMessage(), 10000);
}
}
});
@@ -247,276 +235,4 @@ 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.place.MailFolderPlace;
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
-=======
-=======
-import java.util.Collection;
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
-import java.util.List;
-import java.util.Set;
-
-=======
-import org.apache.hupa.client.HupaController;
->>>>>>> try to rearrange the places and history managment.
-import org.apache.hupa.client.place.DefaultPlace;
-import org.apache.hupa.client.place.IMAPMessagePlace;
-import org.apache.hupa.client.place.MailFolderPlace;
-=======
-import org.apache.hupa.client.place.AbstractPlace;
-import org.apache.hupa.client.place.FolderPlace;
-import org.apache.hupa.client.place.MessagePlace;
->>>>>>> change place management and make refresh folder and message list more gentle
-import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
-import org.apache.hupa.client.rf.FetchMessagesRequest;
-=======
->>>>>>> replace with IsWidget
-import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-import org.apache.hupa.client.ui.MessagesCellTable;
-<<<<<<< HEAD
->>>>>>> let messages list activity make use of mvp
-=======
-import org.apache.hupa.client.ui.ToolBarView;
-<<<<<<< HEAD
->>>>>>> fixed issue#61; add loading to mark, unmark.
-import org.apache.hupa.client.ui.WidgetDisplayable;
-=======
->>>>>>> replace with IsWidget
-import org.apache.hupa.shared.data.ImapFolderImpl;
-=======
->>>>>>> fixed issue#82, make display message first and then mark etc.
-import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
-import org.apache.hupa.shared.domain.DeleteMessageResult;
-import org.apache.hupa.shared.domain.GenericResult;
-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.MoveMessageAction;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.DeleteClickEvent;
-import org.apache.hupa.shared.events.DeleteClickEventHandler;
-import org.apache.hupa.shared.events.MoveMessageEvent;
-import org.apache.hupa.shared.events.MoveMessageEventHandler;
-import org.apache.hupa.shared.events.RefreshMessagesEvent;
-import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
-import org.apache.hupa.shared.events.RefreshUnreadEvent;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.view.client.CellPreviewEvent;
-import com.google.gwt.view.client.CellPreviewEvent.Handler;
-import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
-
-public class MessageListActivity extends AppBaseActivity {
-
- @Inject private Displayable display;
- @Inject private ToolBarActivity.Displayable toolBar;
- @Inject private TopBarActivity.Displayable topBar;
- private String folderName;
- // private String searchValue;
- private User user;
-
- @Override
- public void start(AcceptsOneWidget container, final EventBus eventBus) {
- container.setWidget(display.asWidget());
- bindTo(eventBus);
- display.refresh();
- this.registerHandler(display.getGrid().addCellPreviewHandler(new Handler<Message>() {
- @Override
- public void onCellPreview(final CellPreviewEvent<Message> event) {
- if (hasClickedButFirstCol(event)) {
- hc.showTopLoading("Loading...");
- antiSelectMessages(display.getGrid().getVisibleItems());
- GetMessageDetailsRequest req = rf.messageDetailsRequest();
- GetMessageDetailsAction action = req.create(GetMessageDetailsAction.class);
- final ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(folderName);
- action.setFolder(f);
- action.setUid(event.getValue().getUid());
- req.get(action).fire(new Receiver<GetMessageDetailsResult>() {
- @Override
- public void onSuccess(GetMessageDetailsResult response) {
- MessagePlace place = new MessagePlace(folderName + AbstractPlace.SPLITTER
- + event.getValue().getUid());
- pc.goTo(place);
- display.getGrid().getSelectionModel().setSelected(event.getValue(), true);
- toolBar.enableAllTools(true);
- ToolBarView.Parameters p = new ToolBarView.Parameters(user, folderName, event.getValue(),
- response.getMessageDetails());
- toolBar.setParameters(p);
- display.refresh();
- hc.hideTopLoading();
- eventBus.fireEvent(new RefreshUnreadEvent());
- }
-
- @Override
- public void onFailure(ServerFailure error) {
- if (error.isFatal()) {
- // log.log(Level.SEVERE, error.getMessage());
- // TODO write the error message to
- // status bar.
- toolBar.enableAllTools(false);
- hc.hideTopLoading();
- throw new RuntimeException(error.getMessage());
- }
- }
- });
- }
- }
-
- }));
- }
- private boolean hasClickedButFirstCol(CellPreviewEvent<Message> event) {
- return "click".equals(event.getNativeEvent().getType()) && 0 != event.getColumn();
- }
-
- private void bindTo(final EventBus eventBus) {
- eventBus.addHandler(DeleteClickEvent.TYPE, new DeleteClickEventHandler() {
- @Override
- public void onDeleteClickEvent(DeleteClickEvent event) {
- deleteSelectedMessages();
- }
- });
-
- eventBus.addHandler(RefreshMessagesEvent.TYPE, new RefreshMessagesEventHandler() {
- @Override
- public void onRefresh(RefreshMessagesEvent event) {
- display.setSearchValue(event.getSearchValue());
- display.refresh();
- }
- });
-
- eventBus.addHandler(MoveMessageEvent.TYPE, new MoveMessageEventHandler() {
-
- @Override
- public void onMoveMessageHandler(final MoveMessageEvent event) {
- hc.showTopLoading("Moving...");
- MoveMessageRequest req = rf.moveMessageRequest();
- ImapFolder f = req.create(ImapFolder.class);
- ImapFolder newF = req.create(ImapFolder.class);
-
- String fullName = null;
- if (pc.getWhere() instanceof FolderPlace) {
- fullName = ((FolderPlace) pc.getWhere()).getToken();
- } else {
- fullName = ((MessagePlace) pc.getWhere()).getTokenWrapper().getFolder();
- }
- f.setFullName(fullName);
- newF.setFullName(event.getNewFolder().getFullName());
- MoveMessageAction action = req.create(MoveMessageAction.class);
-
- final List<Long> uids = display.getSelectedMessagesIds();
- if(uids.isEmpty() || uids.size() > 1){//TODO can move more than one message once.
- hc.hideTopLoading();
- hc.showNotice("Please select one and only one message", 10000);
- return;
- }
- action.setMessageUid(uids.get(0));
- action.setNewFolder(newF);
- action.setOldFolder(f);
- req.move(action).fire(new Receiver<GenericResult>() {
-
- @Override
- public void onSuccess(GenericResult response) {
- display.refresh();
- eventBus.fireEvent(new RefreshUnreadEvent());
- hc.hideTopLoading();
- hc.showNotice("The conversation has been moved to \"" + event.getNewFolder() + "\"", 10000);
- }
-
- @Override
- public void onFailure(ServerFailure error) {
- super.onFailure(error);
- hc.hideTopLoading();
- hc.showNotice(error.getMessage(), 10000);
- }
-
- });
- }
-
- });
-
- }
-
- public MessageListActivity with(String folderName) {
- this.folderName = folderName;
- return this;
- }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-<<<<<<< HEAD
-
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
- @Inject
- private Displayable display;
->>>>>>> make message content work as expected partly
-
-=======
->>>>>>> make reload message content work, use the same place with folder list, while separated with slash, that looks like Gmail's
- public interface Displayable extends WidgetDisplayable {
-=======
- public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
- MessagesCellTable getGrid();
-
- void refresh();
-
- List<Long> getSelectedMessagesIds();
-
- Set<Message> getSelectedMessages();
-
- void setSearchValue(String searchValue);
- }
-
- private void antiSelectMessages(Collection<Message> c) {
- toolBar.enableAllTools(false);
- for (Message msg : c) {
- if (!display.getGrid().getSelectionModel().isSelected(msg))
- continue;
- display.getGrid().getSelectionModel().setSelected(msg, false);
- }
- }
- private void deleteSelectedMessages() {
- hc.showTopLoading("Deleting...");
- String fullName = null;
- if (pc.getWhere() instanceof FolderPlace) {
- fullName = ((FolderPlace) pc.getWhere()).getToken();
- } else {
- fullName = ((MessagePlace) pc.getWhere()).getTokenWrapper().getFolder();
- }
- final List<Long> uids = display.getSelectedMessagesIds();
- DeleteMessageByUidRequest req = rf.deleteMessageByUidRequest();
- DeleteMessageByUidAction action = req.create(DeleteMessageByUidAction.class);
- ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(fullName);
- action.setMessageUids(uids);
- action.setFolder(f);
- req.delete(action).fire(new Receiver<DeleteMessageResult>() {
- @Override
- public void onSuccess(DeleteMessageResult response) {
- antiSelectMessages(display.getSelectedMessages());
- display.refresh();
- hc.hideTopLoading();
- eventBus.fireEvent(new RefreshUnreadEvent());
- }
- });
- }
->>>>>>> prepare for message content panel
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java Mon Sep 23 07:04:08 2013
@@ -19,43 +19,17 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.events.MoveMessageEvent;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
-<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.cellview.client.SimplePager;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasVisibility;
import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.ListBox;
-=======
-import org.apache.hupa.client.ui.WidgetDisplayable;
-
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.cellview.client.SimplePager;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.cellview.client.SimplePager;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.HasVisibility;
-import com.google.gwt.user.client.ui.IsWidget;
-<<<<<<< HEAD
->>>>>>> replace with IsWidget
-=======
-import com.google.gwt.user.client.ui.ListBox;
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
import com.google.inject.Inject;
public class MessageListFooterActivity extends AppBaseActivity {
@@ -63,10 +37,6 @@ public class MessageListFooterActivity e
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
bindTo(eventBus);
}
@@ -81,34 +51,13 @@ public class MessageListFooterActivity e
}
}
});
-<<<<<<< HEAD
-=======
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
->>>>>>> fixed issue#85, can move one message now in DEMO mode, while not test in Gmail mode
}
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {
- SimplePager getPager();
- HasVisibility getLabelsPanel();
- ListBox getLabels();
- }
-=======
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
- public interface Displayable extends WidgetDisplayable {
-=======
public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
SimplePager getPager();
HasVisibility getLabelsPanel();
ListBox getLabels();
}
->>>>>>> try to rearrange the places and history managment.
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java Mon Sep 23 07:04:08 2013
@@ -19,22 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< 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;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class NavigationActivity extends AppBaseActivity {
@@ -46,13 +33,5 @@ public class NavigationActivity extends
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {}
-=======
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
public interface Displayable extends IsWidget {}
->>>>>>> replace with IsWidget
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java Mon Sep 23 07:04:08 2013
@@ -19,22 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< 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;
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
-=======
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class NotificationActivity extends AppBaseActivity {
@@ -46,22 +33,8 @@ public class NotificationActivity extend
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {
- void hideNotification();
- void notice(String html);
-=======
- public interface Displayable extends WidgetDisplayable {
-=======
public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
void hideNotification();
-<<<<<<< HEAD
- void notice(SafeHtml html);
->>>>>>> add loading and notification bar(finishing the folder list click event), related to the issue#18
-=======
void notice(String html);
->>>>>>> make the notification be able to cope with link
}
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java Mon Sep 23 07:04:08 2013
@@ -22,22 +22,12 @@ package org.apache.hupa.client.activity;
import java.util.List;
import org.apache.hupa.shared.domain.Message;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fixed issue#74, finished to add search feature
import org.apache.hupa.shared.events.MessagesReceivedEvent;
import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
import org.apache.hupa.shared.events.RefreshMessagesEvent;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-<<<<<<< HEAD
-=======
-
->>>>>>> prepare to add search feature
-=======
->>>>>>> fixed issue#74, finished to add search feature
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -49,8 +39,6 @@ public class SearchBoxActivity extends A
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
-<<<<<<< HEAD
-<<<<<<< HEAD
bindTo(eventBus);
container.setWidget(display.asWidget());
@@ -80,51 +68,6 @@ public class SearchBoxActivity extends A
// }
//
// }));
-=======
- container.setWidget(display.asWidget());
->>>>>>> prepare to add search feature
-=======
- bindTo(eventBus);
- container.setWidget(display.asWidget());
-
- }
-
- private void bindTo(final EventBus eventBus) {
-
- registerHandler(display.getSearchClick().addClickHandler(new ClickHandler() {
-
- public void onClick(ClickEvent event) {
- String searchValue = null;
- if (display.getSearchValue().getValue().trim().length() > 0) {
- searchValue = display.getSearchValue().getValue().trim();
- }
- eventBus.fireEvent(new RefreshMessagesEvent(searchValue));
- }
-
- }));
-
-<<<<<<< HEAD
- registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() {
-
- public void onMessagesReceived(MessagesReceivedEvent event) {
-
- // fill the oracle
- display.fillSearchOracle(event.getMessages());
- }
-
- }));
->>>>>>> fixed issue#74, finished to add search feature
-=======
-// registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new MessagesReceivedEventHandler() {
-//
-// public void onMessagesReceived(MessagesReceivedEvent event) {
-//
-// // fill the oracle
-// display.fillSearchOracle(event.getMessages());
-// }
-//
-// }));
->>>>>>> quick fix something - use textbox for search and make contacts TODO
}
@Inject private Displayable display;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SettingNavActivity.java Mon Sep 23 07:04:08 2013
@@ -45,27 +45,11 @@ public class SettingNavActivity extends
pc.goTo(new SettingPlace("labels"));
}
}));
-<<<<<<< HEAD
- registerHandler(display.getEcsAchor().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- display.singleSelect(2);
- pc.goTo(new SettingPlace("ecs"));
- }
- }));
-
-=======
->>>>>>> make a skeleton in the setting place, for more setting items
}
@Inject private Displayable display;
public interface Displayable extends IsWidget {
-<<<<<<< HEAD
- HasClickHandlers getEcsAchor();
-
-=======
->>>>>>> make a skeleton in the setting place, for more setting items
HasClickHandlers getLabelsAchor();
void singleSelect(int i);
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java Mon Sep 23 07:04:08 2013
@@ -19,22 +19,9 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< 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;
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.IsWidget;
->>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class StatusActivity extends AppBaseActivity {
@@ -46,13 +33,5 @@ public class StatusActivity extends AppB
@Inject private Displayable display;
-<<<<<<< HEAD
-<<<<<<< HEAD
- public interface Displayable extends IsWidget {}
-=======
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
public interface Displayable extends IsWidget {}
->>>>>>> replace with IsWidget
}
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=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,40 +19,13 @@
package org.apache.hupa.client.activity;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.client.place.FolderPlace;
-=======
-=======
-import org.apache.hupa.client.HupaController;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> fixed issue#61; add loading to mark, unmark.
-=======
-import org.apache.hupa.client.place.ComposePlace;
->>>>>>> scrub code
-import org.apache.hupa.client.place.MailFolderPlace;
->>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in toolsbar
-=======
->>>>>>> fixed issue#57 - really disable the tools in toolbar
-=======
-=======
->>>>>>> fixed issue#81, add refresh event handler
-import org.apache.hupa.client.place.FolderPlace;
->>>>>>> try to make messages list better for user experience
import org.apache.hupa.client.rf.SetFlagRequest;
import org.apache.hupa.client.ui.MessagesCellTable;
import org.apache.hupa.client.ui.ToolBarView.Parameters;
-<<<<<<< HEAD
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -75,7 +48,6 @@ public class ToolBarActivity extends App
@Inject private Displayable display;
@Inject private MessagesCellTable table;
@Inject private MessageListActivity.Displayable messagesDisplay;
-<<<<<<< HEAD
private String folderName;
@Override
@@ -174,161 +146,4 @@ public class ToolBarActivity extends App
PopupPanel getPopup();
HasClickHandlers getCompose();
}
-=======
-=======
-=======
-=======
-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;
-<<<<<<< HEAD
->>>>>>> coping with reply and forward sending message
-import org.apache.hupa.client.ui.WidgetDisplayable;
-=======
->>>>>>> replace with IsWidget
-=======
->>>>>>> fixed issue#68, make pager work as expected
-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.RefreshUnreadEvent;
-
-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.IsWidget;
-import com.google.gwt.user.client.ui.PopupPanel;
-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;
- @Inject private MessageListActivity.Displayable messagesDisplay;
- @Inject private HupaController hupaController;
-=======
->>>>>>> fixed issue#81, add refresh event handler
- private String folderName;
-
- @Override
- public void start(AcceptsOneWidget container, EventBus eventBus) {
- container.setWidget(display.asWidget());
- bindTo(eventBus);
- if(pc.getWhere() instanceof FolderPlace){
- display.enableAllTools(false);
- }
- }
-
- public ToolBarActivity with(String folder) {
- this.folderName = folder;
- return this;
- }
-
- public Displayable getDisplay() {
- return display;
- }
-
-<<<<<<< HEAD
-<<<<<<< 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) {
-=======
- private void bindTo(final EventBus eventBus) {
->>>>>>> fixed issue#81, add refresh event handler
- registerHandler(display.getMarkRead().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- hc.showTopLoading("Loading");
- toMarkRead(true);
- display.getPopup().hide();
- }
- }));
- registerHandler(display.getMarkUnread().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- hc.showTopLoading("Loading");
- toMarkRead(false);
- display.getPopup().hide();
- }
- }));
-
- registerHandler(display.getRefresh().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- hc.showTopLoading("Loading");
- eventBus.fireEvent(new RefreshMessagesEvent());
- eventBus.fireEvent(new RefreshUnreadEvent());
- }
- }));
- }
-
- protected void toMarkRead(boolean read) {
- List<Long> uids = new ArrayList<Long>();
- for (Message msg : table.getVisibleItems()) {
- if (table.getSelectionModel().isSelected(msg)) {
- uids.add(msg.getUid());
- table.markRead(msg, read);
- }
- }
- SetFlagRequest req = this.rf.setFlagRequest();
- SetFlagAction action = req.create(SetFlagAction.class);
- ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(folderName);
- action.setFolder(f);
- action.setFlag(IMAPFlag.SEEN);
- action.setValue(read);
- action.setUids(uids);
- req.set(action).fire(new Receiver<GenericResult>() {
- @Override
- public void onSuccess(GenericResult response) {
- eventBus.fireEvent(new RefreshUnreadEvent());
- messagesDisplay.refresh();
- hc.hideTopLoading();
- }
- });
- }
-
-<<<<<<< HEAD
-
- // FIXME: for some reason if we extend WidgetDisplayable we get the error
- // ToolBarActivity.java:[124,38] error: cannot find symbol
- public interface Displayable /*extends WidgetDisplayable*/ {
- // FIXME: added this method until we fix the problem with inheritance
- com.google.gwt.user.client.ui.Widget asWidget();
-
-=======
- public interface Displayable extends IsWidget {
->>>>>>> replace with IsWidget
- void enableSendingTools(boolean is);
- void enableDealingTools(boolean is);
- void enableAllTools(boolean is);
-
- HasClickHandlers getRefresh();
- HasClickHandlers getReply();
- HasClickHandlers getReplyAll();
- HasClickHandlers getForward();
- void setParameters(Parameters parameters);
- Parameters getParameters();
- HasClickHandlers getMarkUnread();
- HasClickHandlers getMarkRead();
- HasClickHandlers getMark();
- HasClickHandlers getDelete();
- PopupPanel getPopup();
- HasClickHandlers getCompose();
- }
->>>>>>> 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/TopBarActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1525515&r1=1525514&r2=1525515&view=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 Mon Sep 23 07:04:08 2013
@@ -19,13 +19,10 @@
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;
import org.apache.hupa.client.ui.LoginLayoutable;
-<<<<<<< HEAD
import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.LoginEvent;
@@ -105,7 +102,6 @@ public class TopBarActivity extends AppB
RootLayoutPanel.get().add(loginLayout.get());
pc.goTo(new DefaultPlace(""));
Window.Location.reload();
-<<<<<<< HEAD
}
@Override
@@ -134,133 +130,4 @@ public class TopBarActivity extends AppB
public User getUser(){
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;
-=======
->>>>>>> replace with IsWidget
-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;
-
-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.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.IsWidget;
-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 {
-
- @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(eventBus);
- if (isNotOccupied()) {
- try {
- checkSessionUser();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
- @Inject private Displayable display;
-
- public interface Displayable extends WidgetDisplayable {}
->>>>>>> integrate all of the views to their corresponding activities and mappers
-=======
-=======
- private void checkSessionUser() {
- CheckSessionRequest checkSession = rf.sessionRequest();
- checkSession.getUser().fire(new Receiver<User>() {
- @Override
- public void onSuccess(User user) {
- if (user != null) {
- display.getUserLabel().add(new HTML(user.getName()));
- eventBus.fireEvent(new LoginEvent(user));
- }
- }
- });
- }
->>>>>>> fixed issue#46 and issue#32
- 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();
- }
- }));
- }
-
- private void doLogout() {
- if (user != null) {
- LogoutUserRequest req = rf.logoutRequest();
- req.logout().fire(new Receiver<LogoutUserResult>() {
- @Override
- public void onSuccess(LogoutUserResult response) {
- eventBus.fireEvent(new LogoutEvent(response.getUser()));
- RootLayoutPanel.get().clear();
- RootLayoutPanel.get().add(loginLayout.get());
- TopBarActivity.this.pc.goTo(new DefaultPlace("@"));
-=======
->>>>>>> fixed issue#87, and remove deprecated west view related codes
- }
-
- @Override
- public void onFailure(ServerFailure error) {
- RootLayoutPanel.get().clear();
- RootLayoutPanel.get().add(loginLayout.get());
- pc.goTo(new DefaultPlace(""));
- Window.Location.reload();
- }
- });
- }
- }
-
- private boolean isNotOccupied() {
- return display.getUserLabel().getWidgetCount() < 1;
- }
-
- public interface Displayable extends IsWidget {
- HasClickHandlers getLogoutClick();
- void showUserName(String userName);
- HTMLPanel getUserLabel();
- void showLoading(String message);
- void hideLoading();
- }
-<<<<<<< HEAD
->>>>>>> add logout support
-=======
-
- public User getUser(){
- return user;
- }
->>>>>>> fixed issue#62
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org